myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1772184 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js
Date Thu, 01 Dec 2016 12:28:22 GMT
Author: lofwyr
Date: Thu Dec  1 12:28:22 2016
New Revision: 1772184

URL: http://svn.apache.org/viewvc?rev=1772184&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-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js?rev=1772184&r1=1772183&r2=1772184&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js
Thu Dec  1 12:28:22 2016
@@ -189,8 +189,8 @@ function layoutFlex(container, orientati
           //container.children().eq(i).css(Modernizr.prefixed("flex"), tokens[i] + " 0 0px");
 // todo: modernizr
 
           var child = container.children().eq(i);
-          if (typeof child != 'undefined' && child.hasClass('tobago-box')) {
-            // XXX Is needed for IE11, otherwise tc:box doesn't displayed properly.
+          if (typeof child != 'undefined' && child.hasClass('tobago-box')
+              && orientation == Tobago.Layout.Orientation.VERTICAL) {
             container.children().eq(i).css(flex, tokens[i] + " 0 auto");
           } else {
             container.children().eq(i).css(flex, tokens[i] + " 0 0px");



Mime
View raw message