From fdd1daeae113fde24391ca4c58d46c29b3871fd9 Mon Sep 17 00:00:00 2001 From: Yohn Date: Sun, 13 Jan 2013 15:21:31 -0500 Subject: [PATCH 01/12] added container options to docs for popover --- docs/javascript.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/javascript.html b/docs/javascript.html index 80500b18e5..a17ccd4ef7 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1023,6 +1023,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Object structure is: delay: { show: 500, hide: 100 }

+ + container + string | false + false + +

Appends the tooltip to a specific element container: 'body'

+ +
From 98aeb0acf1bac40236eafc1342e88e3d7fc18e94 Mon Sep 17 00:00:00 2001 From: Yohn Date: Sun, 13 Jan 2013 15:23:22 -0500 Subject: [PATCH 02/12] added container options to docs for popover --- docs/templates/pages/javascript.mustache | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 6e361fa60c..1ef8bceaf3 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -953,6 +953,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

+ + {{_i}}container{{/i}} + {{_i}}string | false{{/i}} + {{_i}}false{{/i}} + +

{{_i}}Appends the tooltip to a specific element container: 'body'{{/i}}

+ +
From ecc24953a50e4b0a5d91b9a72e91b3c038fc1e48 Mon Sep 17 00:00:00 2001 From: Yohn Date: Sun, 13 Jan 2013 15:32:03 -0500 Subject: [PATCH 03/12] fix typo --- docs/templates/pages/javascript.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 1ef8bceaf3..9a08a50b3a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -958,7 +958,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}string | false{{/i}} {{_i}}false{{/i}} -

{{_i}}Appends the tooltip to a specific element container: 'body'{{/i}}

+

{{_i}}Appends the popover to a specific element container: 'body'{{/i}}

From a23eb065365e1c5d9d89f20506565d78db78d961 Mon Sep 17 00:00:00 2001 From: Yohn Date: Sun, 13 Jan 2013 15:32:51 -0500 Subject: [PATCH 04/12] fix typo --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/javascript.html b/docs/javascript.html index a17ccd4ef7..a2897fa3cf 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1028,7 +1028,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { string | false false -

Appends the tooltip to a specific element container: 'body'

+

Appends the popover to a specific element container: 'body'

From f9ee99cf6febd0b59ee95aa1866a3c1eb5c61320 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 14 Jan 2013 00:11:55 -0800 Subject: [PATCH 05/12] Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing --- docs/assets/js/html5shiv.js | 8 ++++++++ docs/base-css.html | 2 +- docs/components.html | 2 +- docs/customize.html | 2 +- docs/examples/carousel.html | 2 +- docs/examples/fluid.html | 2 +- docs/examples/hero.html | 2 +- docs/examples/justified-nav.html | 2 +- docs/examples/marketing-narrow.html | 2 +- docs/examples/signin.html | 2 +- docs/examples/starter-template.html | 2 +- docs/examples/sticky-footer-navbar.html | 2 +- docs/examples/sticky-footer.html | 2 +- docs/extend.html | 2 +- docs/getting-started.html | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- docs/scaffolding.html | 2 +- docs/templates/layout.mustache | 2 +- 19 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 docs/assets/js/html5shiv.js diff --git a/docs/assets/js/html5shiv.js b/docs/assets/js/html5shiv.js new file mode 100644 index 0000000000..784f221caf --- /dev/null +++ b/docs/assets/js/html5shiv.js @@ -0,0 +1,8 @@ +/* + HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed +*/ +(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag(); +a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x"; +c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode|| +"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment(); +for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d diff --git a/docs/components.html b/docs/components.html index bbb0dc39d4..7a670998d3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -15,7 +15,7 @@ diff --git a/docs/customize.html b/docs/customize.html index d743246573..c714f56943 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -15,7 +15,7 @@ diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 328fe5a1e1..50f34e648d 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -255,7 +255,7 @@ diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 242050ab88..b004ffad69 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -31,7 +31,7 @@ diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 6c585eac25..c28b757b96 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -19,7 +19,7 @@ diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html index 9071a8d81b..ef8f8d4286 100644 --- a/docs/examples/justified-nav.html +++ b/docs/examples/justified-nav.html @@ -84,7 +84,7 @@ diff --git a/docs/examples/marketing-narrow.html b/docs/examples/marketing-narrow.html index 996f8a1da1..f6f5d16851 100644 --- a/docs/examples/marketing-narrow.html +++ b/docs/examples/marketing-narrow.html @@ -50,7 +50,7 @@ diff --git a/docs/examples/signin.html b/docs/examples/signin.html index 17578483a3..031052789d 100644 --- a/docs/examples/signin.html +++ b/docs/examples/signin.html @@ -46,7 +46,7 @@ diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index 93ba809e38..b81f21d174 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -18,7 +18,7 @@ diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index ad4f87a04f..cb5de6de2a 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -70,7 +70,7 @@ diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 80490ffd0c..d307d79387 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/sticky-footer.html @@ -67,7 +67,7 @@ diff --git a/docs/extend.html b/docs/extend.html index e8d34f9a89..4de7b9c4b3 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -15,7 +15,7 @@ diff --git a/docs/getting-started.html b/docs/getting-started.html index c798670f88..ad83385906 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -15,7 +15,7 @@ diff --git a/docs/index.html b/docs/index.html index eff90ae044..cd96ed0cda 100644 --- a/docs/index.html +++ b/docs/index.html @@ -15,7 +15,7 @@ diff --git a/docs/javascript.html b/docs/javascript.html index 80500b18e5..98a17ab1fd 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -15,7 +15,7 @@ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index c934165fc6..6adc11711c 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -15,7 +15,7 @@ diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index b3f36e99d5..01cf319c25 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -15,7 +15,7 @@ From c34ef691001626728cf5263421899227aa4d3b5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 15 Jan 2013 10:15:02 -0800 Subject: [PATCH 06/12] add text alignment classes from 3.0 --- less/type.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/less/type.less b/less/type.less index 9b7e7eec20..9afff93ac5 100644 --- a/less/type.less +++ b/less/type.less @@ -43,6 +43,10 @@ a.text-info:hover { color: darken(@infoText, 10%); } .text-success { color: @successText; } a.text-success:hover { color: darken(@successText, 10%); } +.text-left { text-align: left; } +.text-right { text-align: right; } +.text-center { text-align: center; } + // Headings // ------------------------- From a67c86e40f0b79e8abf5c6c266166db80d8edb72 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 15 Jan 2013 10:27:30 -0800 Subject: [PATCH 07/12] Fixes #6586: remove top 5px margin from navbar input group button groups --- docs/assets/css/bootstrap.css | 16 +++++++++++++++- less/navbar.less | 4 +++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57325606f2..71c42f3196 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -714,6 +714,18 @@ a.text-success:hover { color: #356635; } +.text-left { + text-align: left; +} + +.text-right { + text-align: right; +} + +.text-center { + text-align: center; +} + h1, h2, h3, @@ -4387,7 +4399,9 @@ input[type="submit"].btn.btn-mini { .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; } diff --git a/less/navbar.less b/less/navbar.less index 1e488d8983..cfbc30a6e6 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -95,7 +95,9 @@ } .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; // then undo the margin here so we don't accidentally double it } From 1da1994ba4fa40ed868ab289e910ec9a0d177458 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Tue, 15 Jan 2013 18:16:44 -0800 Subject: [PATCH 08/12] Add text alignment classes info to docs --- docs/base-css.html | 13 +++++++++++++ docs/templates/pages/base-css.mustache | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/docs/base-css.html b/docs/base-css.html index f283f962e1..3294336b6e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -170,6 +170,19 @@

Heads up! Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

+

Alignment classes

+

Easily realign text to components with text alignment classes.

+
+

Left aligned text.

+

Center aligned text.

+

Right aligned text.

+
+
+<p class="text-left">Left aligned text.</p>
+<p class="text-center">Center aligned text.</p>
+<p class="text-right">Right aligned text.</p>
+
+

Emphasis classes

Convey meaning through color with a handful of emphasis utility classes.

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 71d8d464d5..4ec1eee296 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -104,6 +104,19 @@

{{_i}}Heads up!{{/i}} {{_i}}Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.{{/i}}

+

{{_i}}Alignment classes{{/i}}

+

{{_i}}Easily realign text to components with text alignment classes.{{/i}}

+
+

Left aligned text.

+

Center aligned text.

+

Right aligned text.

+
+
+<p class="text-left">Left aligned text.</p>
+<p class="text-center">Center aligned text.</p>
+<p class="text-right">Right aligned text.</p>
+
+

{{_i}}Emphasis classes{{/i}}

{{_i}}Convey meaning through color with a handful of emphasis utility classes.{{/i}}

From 60bb95e611b6a096e5d50263e278b4be92e7468f Mon Sep 17 00:00:00 2001 From: Yohn Date: Wed, 16 Jan 2013 07:45:31 -0500 Subject: [PATCH 09/12] adding class to example code --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components.html b/docs/components.html index 7a670998d3..e8b74cf825 100644 --- a/docs/components.html +++ b/docs/components.html @@ -177,7 +177,7 @@ 
 <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
   <li><a tabindex="-1" href="#">Regular link</a></li>
-  <li><a tabindex="-1" href="#">Disabled link</a></li>
+  <li class="disabled"><a tabindex="-1" href="#">Disabled link</a></li>
   <li><a tabindex="-1" href="#">Another link</a></li>
 </ul>
From 598e9e6f13f52249e5158c427f70d20b7c4622f4 Mon Sep 17 00:00:00 2001 From: Yohn Date: Wed, 16 Jan 2013 07:46:42 -0500 Subject: [PATCH 10/12] Update docs/templates/pages/components.mustache --- docs/templates/pages/components.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index bdd918da9b..53ab3d2a62 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -106,7 +106,7 @@ 
 <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
   <li><a tabindex="-1" href="#">{{_i}}Regular link{{/i}}</a></li>
-  <li><a tabindex="-1" href="#">{{_i}}Disabled link{{/i}}</a></li>
+  <li class="disabled"><a tabindex="-1" href="#">{{_i}}Disabled link{{/i}}</a></li>
   <li><a tabindex="-1" href="#">{{_i}}Another link{{/i}}</a></li>
 </ul>
From 650c77ddb9df25f2ef4bad7feaba2be9ce15c827 Mon Sep 17 00:00:00 2001 From: ravage84 Date: Thu, 17 Jan 2013 11:34:00 +0100 Subject: [PATCH 11/12] Update less/tests/css-tests.html Extended css-tests with alerts (alerts and alert-blocks) --- less/tests/css-tests.html | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 035ba8bd44..e1b93c9ce6 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -1291,10 +1291,69 @@

Striped

+
+

Alerts

+
+

Alert default

+
+ + Alert! Best check yourself, you're not looking too good. +
+

Success

+
+ + Success! Best check yourself, you're not looking too good. +
+

Info

+
+ + Info! Best check yourself, you're not looking too good. +
+

Warning

+
+ + Warning! Best check yourself, you're not looking too good. +
+ +

Error

+
+ + Error! Best check yourself, you're not looking too good. +
+ +

Alert block default

+
+ +

Alert! Best check yourself, you're not looking too good.

+
+ +

Success block

+
+ +

Success! Best check yourself, you're not looking too good.

+
+ +

Info block

+
+ +

Info! Best check yourself, you're not looking too good.

+
+ +

Warning block

+
+ +

Warning! Best check yourself, you're not looking too good.

+
+ +

Error block

+
+ +

Error! Best check yourself, you're not looking too good.

+
From 01b465928ec47d460ea1fd705e49aa2e0e9a4d28 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 12:24:16 -0800 Subject: [PATCH 12/12] overhaul alerts section of tests --- less/tests/css-tests.html | 68 +++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index e1b93c9ce6..cdb6c7bcaa 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -1291,68 +1291,60 @@

Striped

+ +

Alerts

Alert default

- - Alert! Best check yourself, you're not looking too good. + + Alert! Best check yourself, you're not looking too good. +
+
+ +

Alert! Best check yourself, you're not looking too good.

Success

- - Success! Best check yourself, you're not looking too good. + + Success! Best check yourself, you're not looking too good. +
+
+ +

Success! Best check yourself, you're not looking too good.

Info

- - Info! Best check yourself, you're not looking too good. + + Info! Best check yourself, you're not looking too good. +
+
+ +

Info! Best check yourself, you're not looking too good.

Warning

- - Warning! Best check yourself, you're not looking too good. + + Warning! Best check yourself, you're not looking too good. +
+
+ +

Warning! Best check yourself, you're not looking too good.

Error

- - Error! Best check yourself, you're not looking too good. + + Error! Best check yourself, you're not looking too good.
- -

Alert block default

-
- -

Alert! Best check yourself, you're not looking too good.

-
- -

Success block

-
- -

Success! Best check yourself, you're not looking too good.

-
- -

Info block

-
- -

Info! Best check yourself, you're not looking too good.

-
- -

Warning block

-
- -

Warning! Best check yourself, you're not looking too good.

-
- -

Error block

- -

Error! Best check yourself, you're not looking too good.

+ +

Error! Best check yourself, you're not looking too good.