You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/04 22:29:38 UTC

[7/8] git commit: Update to Bootstrap 3.0.1

Update to Bootstrap 3.0.1


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/55fe56a7
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/55fe56a7
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/55fe56a7

Branch: refs/heads/master
Commit: 55fe56a7b15fefe63f6aeafc0e023fc3b12b1629
Parents: 33cc7f2
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 4 13:24:55 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 4 13:24:55 2013 -0800

----------------------------------------------------------------------
 54_RELEASE_NOTES.md                             |    6 +-
 .../tapestry5/modules/TapestryModule.java       |    2 +-
 .../tapestry5/bootstrap-3.0.1/css/bootstrap.css | 7059 ++++++++++++++++++
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 0 -> 20290 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 +
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 0 -> 41236 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 0 -> 23292 bytes
 .../tapestry5/bootstrap-3.0.1/js/affix.js       |  126 +
 .../tapestry5/bootstrap-3.0.1/js/alert.js       |   98 +
 .../tapestry5/bootstrap-3.0.1/js/button.js      |  109 +
 .../tapestry5/bootstrap-3.0.1/js/carousel.js    |  217 +
 .../tapestry5/bootstrap-3.0.1/js/collapse.js    |  179 +
 .../tapestry5/bootstrap-3.0.1/js/dropdown.js    |  154 +
 .../tapestry5/bootstrap-3.0.1/js/modal.js       |  246 +
 .../tapestry5/bootstrap-3.0.1/js/popover.js     |  117 +
 .../tapestry5/bootstrap-3.0.1/js/scrollspy.js   |  158 +
 .../assets/tapestry5/bootstrap-3.0.1/js/tab.js  |  135 +
 .../tapestry5/bootstrap-3.0.1/js/tooltip.js     |  386 +
 .../tapestry5/bootstrap-3.0.1/js/transition.js  |   56 +
 .../bootstrap_3_0_0/css/bootstrap-theme.css     |  384 -
 .../tapestry5/bootstrap_3_0_0/css/bootstrap.css | 6805 -----------------
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 14079 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  228 -
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 29512 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 16448 -> 0 bytes
 .../tapestry5/bootstrap_3_0_0/js/affix.js       |  126 -
 .../tapestry5/bootstrap_3_0_0/js/alert.js       |   98 -
 .../tapestry5/bootstrap_3_0_0/js/button.js      |  109 -
 .../tapestry5/bootstrap_3_0_0/js/carousel.js    |  217 -
 .../tapestry5/bootstrap_3_0_0/js/collapse.js    |  179 -
 .../tapestry5/bootstrap_3_0_0/js/dropdown.js    |  154 -
 .../tapestry5/bootstrap_3_0_0/js/modal.js       |  246 -
 .../tapestry5/bootstrap_3_0_0/js/popover.js     |  117 -
 .../tapestry5/bootstrap_3_0_0/js/scrollspy.js   |  158 -
 .../assets/tapestry5/bootstrap_3_0_0/js/tab.js  |  135 -
 .../tapestry5/bootstrap_3_0_0/js/tooltip.js     |  386 -
 .../tapestry5/bootstrap_3_0_0/js/transition.js  |   56 -
 37 files changed, 9273 insertions(+), 9402 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/55fe56a7/54_RELEASE_NOTES.md
----------------------------------------------------------------------
diff --git a/54_RELEASE_NOTES.md b/54_RELEASE_NOTES.md
index d4cd3e7..eb761eb 100644
--- a/54_RELEASE_NOTES.md
+++ b/54_RELEASE_NOTES.md
@@ -204,12 +204,12 @@ a new page.
 
 ## Bootstrap 3
 
-Tapestry now includes a default copy of Bootstrap 3, in addition to its own default set of CSS rules.
+Tapestry now includes a default copy of Bootstrap 3.0.1, in addition to its own default set of CSS rules.
 The Tapestry CSS from prior releases has been largely eliminated; instead
 components now refer to standard Bootstrap CSS classes.
 
 Tapestry now automatically imports the "core" stack for all pages (in previously releases, the "core" stack
-was only imported if the page made use of JavaScript). Because of this, the Boostrap CSS will always be available.
+was only imported if the page made use of JavaScript). Because of this, the Bootstrap CSS will always be available.
 
 ValidationDecorator and ValidationDecoratorFactory are deprecated in 5.4 and will be removed in 5.5. The default
 implementation of ValidationDecorator now does nothing. All the logic related to presentation of errors has moved
@@ -256,7 +256,7 @@ div.form-group, which is provided around the editor for each property.
 This service, primarily used by built-in components in Tapestry 5.3, is no longer useful in 5.4. The service
 still exists, but the methods do nothing, and the service and interface will be removed in 5.5.
 
-## JavaScriptSupport    Extended
+## JavaScriptSupport Extended
 
 New methods have been added to allow JavaScript modules to be "required" into the page; it is possible to invoke
 the exported function of a module with JSON-compatible parameters; a module may also export multiple names functions that

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/55fe56a7/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index e5b7dd9..775dd50 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -2116,7 +2116,7 @@ public final class TapestryModule
         // you are expected to override this symbol.
         configuration.add(SymbolConstants.HMAC_PASSPHRASE, "");
 
-        configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap_3_0_0");
+        configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap-3.0.1");
 
         configuration.add(SymbolConstants.SESSION_LOCKING_ENABLED, true);