myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1720315 - /myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Date Wed, 16 Dec 2015 10:23:28 GMT
Author: lofwyr
Date: Wed Dec 16 10:23:27 2015
New Revision: 1720315

URL: http://svn.apache.org/viewvc?rev=1720315&view=rev
Log:
TOBAGO-1519: Upgrade to Bootstrap 4

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1720315&r1=1720314&r2=1720315&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Wed Dec 16 10:23:27 2015
@@ -396,12 +396,15 @@
         <script name="script/contrib/jquery-ui-1.10.4.custom.js"/>
         <script name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
         <script name="bootstrap/3.3.5/js/bootstrap.js"/>
+        <!--<script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>-->
         <script name="script/tobago.js"/>
         <script name="typeahead/0.11.1/typeahead.js"/>
         <style name="style/contrib/ui-lightness/jquery-ui-1.10.4.custom.css"/>
         <style name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap-theme.css"/>
+        <!--<style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>-->
+        <!--<style name="bootstrap/4.0.0-alpha.2/css/bootstrap-theme.css"/>-->
         <style name="font-awesome/4.5.0/css/font-awesome.css"/>
         <style name="style/tobago.css"/>
       </resources>
@@ -410,6 +413,7 @@
         <script name="script/contrib/jquery-ui-1.10.4.custom.js"/>
         <script name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
         <script name="bootstrap/3.3.5/js/bootstrap.js"/>
+        <!--<script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>-->
         <script name="script/tobago.js"/>
         <script name="script/tobago-calendar.js"/>
         <script name="script/tobago-console.js"/>
@@ -429,6 +433,8 @@
         <style name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap-theme.css"/>
+        <!--<style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>-->
+        <!--<style name="bootstrap/4.0.0-alpha.2/css/bootstrap-theme.css"/>-->
         <style name="font-awesome/4.5.0/css/font-awesome.css"/>
         <style name="style/tobago.css"/>
       </resources>



Mime
View raw message