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 2012/11/11 21:11:19 UTC
[2/9] git commit: Slight changes to make the "Today" and "None"
buttons use the Twitter Bootstrap "btn" CSS class
Slight changes to make the "Today" and "None" buttons use the Twitter Bootstrap "btn" CSS class
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/05705665
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/05705665
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/05705665
Branch: refs/heads/5.4-js-rewrite
Commit: 057056657d989de851544f48c8d4c96afa48b6ab
Parents: 96043af
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sun Nov 11 11:55:45 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sun Nov 11 11:55:45 2012 -0800
----------------------------------------------------------------------
.../tapestry5/datepicker_106/css/datepicker.css | 5 -----
.../tapestry5/datepicker_106/js/datepicker.js | 5 +++--
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/05705665/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
index 77d9c02..4d2c2c3 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
+++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
@@ -111,11 +111,6 @@
height: 14px;
}
-.datePicker .todayButton,
-.datePicker .noneButton {
- width: 50px;
-}
-
.datePicker .labelPopup {
position: absolute;
min-width: 130px;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/05705665/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/js/datepicker.js
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/js/datepicker.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/js/datepicker.js
index 0d31f79..89dc129 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/js/datepicker.js
+++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/js/datepicker.js
@@ -47,6 +47,7 @@
| | value. Separating them simplifies a lot of logic and resolves |
| | TAP5-1409. Also somewhat smarter for whether to trigger |
| | onselect when clicking "today" (and/or "none") |
+| 2012-11-11 | Minor changes to integrate into a page with Twitter Bootstrap |
|-----------------------------------------------------------------------------|
| Created 2001-10-?? | All changes are in the log above. | Updated 2006-05-28 |
\----------------------------------------------------------------------------*/
@@ -185,7 +186,7 @@ DatePicker.prototype.create = function (doc)
td = doc.createElement("td");
this._todayButton = doc.createElement("button");
- this._todayButton.className = "todayButton";
+ this._todayButton.className = "btn";
this._todayButton.setAttribute("type", "button");
this._todayButton.appendChild(doc.createTextNode("Today"));
td.appendChild(this._todayButton);
@@ -198,7 +199,7 @@ DatePicker.prototype.create = function (doc)
td = doc.createElement("td");
this._noneButton = doc.createElement("button");
- this._noneButton.className = "noneButton";
+ this._noneButton.className = "btn";
this._noneButton.setAttribute("type", "button");
this._noneButton.appendChild(doc.createTextNode("None"));
td.appendChild(this._noneButton);