You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/11/18 15:27:45 UTC
svn commit: r1770399 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/ tobago-theme/tobago-theme-standard/src/main/resources/o...

Author: lofwyr
Date: Fri Nov 18 15:27:45 2016
New Revision: 1770399

URL: http://svn.apache.org/viewvc?rev=1770399&view=rev
Log:
TOBAGO-1368: The standard theme will use Bootstrap
* CSS class names of Tobago should all start with "tobago-"

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java?rev=1770399&r1=1770398&r2=1770399&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java Fri Nov 18 15:27:45 2016
@@ -197,7 +197,6 @@ public abstract class CommandRendererBas
           final CssItem disabled;
           if (child instanceof AbstractUICommand) {
             final AbstractUICommand c = (AbstractUICommand) child;
-            // fixme: this name comes not from bootstrap, using prefix? tobago-command-dropdown-submenu
             submenu = c.isParentOfCommands() ? TobagoClass.DROPDOWN_SUBMENU : null;
             disabled = c.isDisabled() ? BootstrapClass.DISABLED : null;
           } else {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java?rev=1770399&r1=1770398&r2=1770399&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java Fri Nov 18 15:27:45 2016
@@ -31,19 +31,19 @@ import org.slf4j.LoggerFactory;
  */
 public enum TobagoClass implements CssItem {
 
-  ALIGN_ITEMS__BASELINE("alignItems-baseline"),
-  ALIGN_ITEMS__CENTER("alignItems-center"),
-  ALIGN_ITEMS__FLEX_END("alignItems-flexEnd"),
-  ALIGN_ITEMS__FLEX_START("alignItems-flexStart"),
-  ALIGN_ITEMS__STRETCH("alignItems-stretch"),
+  ALIGN_ITEMS__BASELINE("tobago-alignItems-baseline"),
+  ALIGN_ITEMS__CENTER("tobago-alignItems-center"),
+  ALIGN_ITEMS__FLEX_END("tobago-alignItems-flexEnd"),
+  ALIGN_ITEMS__FLEX_START("tobago-alignItems-flexStart"),
+  ALIGN_ITEMS__STRETCH("tobago-alignItems-stretch"),
 
-  JUSTIFY_CONTENT__CENTER("justifyContent-center"),
-  JUSTIFY_CONTENT__FLEX_START("justifyContent-flexStart"),
-  JUSTIFY_CONTENT__FLEX_END("justifyContent-flexEnd"),
-  JUSTIFY_CONTENT__SPACE_BETWEEN("justifyContent-spaceBetween"),
-  JUSTIFY_CONTENT__SPACE_AROUND("justifyContent-spaceAround"),
+  JUSTIFY_CONTENT__CENTER("tobago-justifyContent-center"),
+  JUSTIFY_CONTENT__FLEX_START("tobago-justifyContent-flexStart"),
+  JUSTIFY_CONTENT__FLEX_END("tobago-justifyContent-flexEnd"),
+  JUSTIFY_CONTENT__SPACE_BETWEEN("tobago-justifyContent-spaceBetween"),
+  JUSTIFY_CONTENT__SPACE_AROUND("tobago-justifyContent-spaceAround"),
 
-  DROPDOWN_SUBMENU("dropdown-submenu"),
+  DROPDOWN_SUBMENU("tobago-dropdown-submenu"),
   TABLE_LAYOUT__FIXED("tableLayout-fixed"),
 
   HAS_INFO("has-info"),

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1770399&r1=1770398&r2=1770399&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Fri Nov 18 15:27:45 2016
@@ -132,43 +132,43 @@ body {
     margin-left: 5px;
 }
 
-.alignItems-baseline {
+.tobago-alignItems-baseline {
   align-items: baseline;
 }
 
-.alignItems-center {
+.tobago-alignItems-center {
   align-items: center;
 }
 
-.alignItems-flexEnd {
+.tobago-alignItems-flexEnd {
   align-items: flex-end;
 }
 
-.alignItems-flexStart {
+.tobago-alignItems-flexStart {
   align-items: flex-start;
 }
 
-.alignItems-stretch {
+.tobago-alignItems-stretch {
   align-items: stretch;
 }
 
-.justifyContent-center {
+.tobago-justifyContent-center {
   justify-content: center;
 }
 
-.justifyContent-flexStart {
+.tobago-justifyContent-flexStart {
   justify-content: flex-start;
 }
 
-.justifyContent-flexEnd{
+.tobago-justifyContent-flexEnd{
   justify-content: flex-end;
 }
 
-.justifyContent-spaceBetween{
+.tobago-justifyContent-spaceBetween{
   justify-content: space-between;
 }
 
-.justifyContent-spaceAround{
+.tobago-justifyContent-spaceAround{
   justify-content: space-around;
 }
 
@@ -297,7 +297,7 @@ button.tobago-link-markup-disabled:hover
 }
 
 /* styles for drop down menu with deeper level */
-.dropdown-submenu {
+.tobago-dropdown-submenu {
   position: relative;
 }
 
@@ -316,12 +316,12 @@ button.tobago-link-markup-disabled:hover
   border-bottom: #dddddd;
 }
 
-.dropdown-submenu > span {
+.tobago-dropdown-submenu > span {
   display: inline-block;
   width: 100%;
 }
 
-.dropdown-submenu > span > .dropdown-menu {
+.tobago-dropdown-submenu > span > .dropdown-menu {
   top: 0;
   left: 100%;
   margin-top: -6px;
@@ -331,11 +331,11 @@ button.tobago-link-markup-disabled:hover
   border-radius: 6px 6px 6px 6px;
 }
 
-.dropdown-submenu:hover > span > .dropdown-menu {
+.tobago-dropdown-submenu:hover > span > .dropdown-menu {
   display: block;
 }
 
-.dropdown-submenu:after {
+.tobago-dropdown-submenu:after {
   content: " ";
   float: right;
   border-color: transparent;
@@ -346,19 +346,19 @@ button.tobago-link-markup-disabled:hover
   margin-right: -10px;
 }
 
-.dropdown-submenu > span > button:after {
+.tobago-dropdown-submenu > span > button:after {
   display: none;
 }
 
-.dropdown-submenu:hover > span > a:after {
+.tobago-dropdown-submenu:hover > span > a:after {
   border-left-color: #ffffff;
 }
 
-.dropdown-submenu.pull-left {
+.tobago-dropdown-submenu.pull-left {
   float: none;
 }
 
-.dropdown-submenu.pull-left > .dropdown-menu {
+.tobago-dropdown-submenu.pull-left > .dropdown-menu {
   left: -100%;
   margin-left: 10px;
   -webkit-border-radius: 6px 0 6px 6px;