From ab178060be19a60f52dc548d4cfd505c1e30ace5 Mon Sep 17 00:00:00 2001
From: Allen Bargi <allen.bargi@gmail.com>
Date: Thu, 26 Apr 2012 17:38:47 +0300
Subject: [PATCH 01/42] let's reuse color variables, instead of hardcoding
colors.
---
less/type.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/less/type.less b/less/type.less
index 0d56219340..61aa624a74 100644
--- a/less/type.less
+++ b/less/type.less
@@ -171,7 +171,7 @@ em {
// Abbreviations and acronyms
abbr[title] {
cursor: help;
- border-bottom: 1px dotted #ddd;
+ border-bottom: 1px dotted @grayLight;
}
abbr.initialism {
font-size: 90%;
--
GitLab
From ec56940c511df165784a2a203be8e05644661c46 Mon Sep 17 00:00:00 2001
From: Anirvan Chatterjee <x.github@chatterjee.net>
Date: Fri, 27 Apr 2012 10:48:59 -0700
Subject: [PATCH 02/42] several spelling corrections
---
js/README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/README.md b/js/README.md
index c7b71e70f2..b7927ba6b2 100644
--- a/js/README.md
+++ b/js/README.md
@@ -5,9 +5,9 @@ These are the high-level design rules which guide the development of Bootstrap's
### DATA-ATTRIBUTE API
-We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript. This is bootstraps first class api.
+We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API.
-We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
+We acknowledge that this isn't always the most performant and it may sometimes be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
$('body').off('.data-api')
@@ -19,7 +19,7 @@ To target a specific plugin, just include the plugins name as a namespace along
### PROGRAMATIC API
-We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
+We also believe you should be able to use all plugins provided by Bootstrap purely through the JavaScript API.
All public APIs should be single, chainable methods, and return the collection acted upon.
@@ -45,7 +45,7 @@ An options definition should take the following form:
*noun*: *adjective* - describes or modifies a quality of an instance
-examples:
+Examples:
backdrop: true
keyboard: false
@@ -93,7 +93,7 @@ Data attributes should take the following form:
- data-target || href^=# - defined on "control" element (if element controls an element other than self)
- data-{{noun}} - defines class instance options
-examples:
+Examples:
// control other targets
data-toggle="modal" data-target="#foo"
--
GitLab
From ad46b0980caf9a943ca213ce240083f7a65ac993 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Apr 2012 15:06:26 -0700
Subject: [PATCH 03/42] expand input css tests to fixed width grid
---
less/tests/css-tests.css | 1 +
less/tests/css-tests.html | 67 +++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/less/tests/css-tests.css b/less/tests/css-tests.css
index ac764270aa..e0870be449 100644
--- a/less/tests/css-tests.css
+++ b/less/tests/css-tests.css
@@ -30,6 +30,7 @@ h4 {
/* Fluid row inputs */
+#rowInputs .row > [class*=span],
#fluidRowInputs .row-fluid > [class*=span] {
background-color: rgba(255,0,0,.1);
}
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index b290186211..0e964e27f4 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -500,6 +500,73 @@
</div><!--/span-->
</div><!--/row-->
+<h4>Fixed row with inputs</h4>
+<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
+
+<div class="rowInputs">
+ <div class="row">
+ <div class="span12">
+ <input class="span1" placeholder="span1">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span2" placeholder="span2">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span3" placeholder="span3">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span4" placeholder="span4">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span5" placeholder="span5">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span6" placeholder="span6">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span7" placeholder="span7">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span8" placeholder="span8">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span9" placeholder="span9">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span10" placeholder="span10">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span11" placeholder="span11">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span12" placeholder="span12">
+ </div><!--/span-->
+ </div><!--/row-->
+</div>
+<br>
+
<h4>Fluid row with inputs</h4>
<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
<div id="fluidRowInputs">
--
GitLab
From 6e9756ebb682dbb1ea9c9a75653838bd130a9cb6 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Apr 2012 15:30:56 -0700
Subject: [PATCH 04/42] #3228: update docs to list dependencies from 2.0.3 for
compiling via make
---
docs/assets/css/bootstrap.css | 8 ++++----
docs/less.html | 4 ++--
docs/templates/pages/less.mustache | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 09e2833dcd..f13cad826d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4651,15 +4651,15 @@ a.badge:hover {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
-webkit-transition: width 0.6s ease;
-moz-transition: width 0.6s ease;
-ms-transition: width 0.6s ease;
-o-transition: width 0.6s ease;
transition: width 0.6s ease;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
.progress-striped .bar {
diff --git a/docs/less.html b/docs/less.html
index 3fecd1ade2..781bd2fb72 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -975,8 +975,8 @@
<div class="row">
<div class="span4">
<h3>Node with makefile</h3>
- <p>Install the LESS command line compiler and uglify-js globally with npm by running the following command:</p>
- <pre>$ npm install -g less uglify-js</pre>
+ <p>Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:</p>
+ <pre>$ npm install -g less jshint recess uglify-js</pre>
<p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
<p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
</div><!-- /span4 -->
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 7698dd2900..0532b2f9cc 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -898,8 +898,8 @@
<div class="row">
<div class="span4">
<h3>{{_i}}Node with makefile{{/i}}</h3>
- <p>{{_i}}Install the LESS command line compiler and uglify-js globally with npm by running the following command:{{/i}}</p>
- <pre>$ npm install -g less uglify-js</pre>
+ <p>{{_i}}Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:{{/i}}</p>
+ <pre>$ npm install -g less jshint recess uglify-js</pre>
<p>{{_i}}Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.{{/i}}</p>
<p>{{_i}}Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}</p>
</div><!-- /span4 -->
--
GitLab
From c204bc66d693b1dece2d69384431ae7a4e88b80f Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Apr 2012 15:33:35 -0700
Subject: [PATCH 05/42] #3237: change to CSS comments in responsive docs
---
docs/scaffolding.html | 8 ++++----
docs/templates/pages/scaffolding.mustache | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index caffa6af66..e88656dbb0 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -529,16 +529,16 @@
</div><!-- /.span -->
<div class="span8">
<pre class="prettyprint linenums">
- // Landscape phones and down
+ /* Landscape phones and down */
@media (max-width: 480px) { ... }
- // Landscape phone to portrait tablet
+ /* Landscape phone to portrait tablet */
@media (max-width: 767px) { ... }
- // Portrait tablet to landscape and desktop
+ /* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) { ... }
- // Large desktop
+ /* Large desktop */
@media (min-width: 1200px) { ... }
</pre>
</div><!-- /.span -->
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 13c777a260..2db9e9d3de 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -452,16 +452,16 @@
</div><!-- /.span -->
<div class="span8">
<pre class="prettyprint linenums">
- // {{_i}}Landscape phones and down{{/i}}
+ /* {{_i}}Landscape phones and down{{/i}} */
@media (max-width: 480px) { ... }
- // {{_i}}Landscape phone to portrait tablet{{/i}}
+ /* {{_i}}Landscape phone to portrait tablet{{/i}} */
@media (max-width: 767px) { ... }
- // {{_i}}Portrait tablet to landscape and desktop{{/i}}
+ /* {{_i}}Portrait tablet to landscape and desktop{{/i}} */
@media (min-width: 768px) and (max-width: 979px) { ... }
- // {{_i}}Large desktop{{/i}}
+ /* {{_i}}Large desktop{{/i}} */
@media (min-width: 1200px) { ... }
</pre>
</div><!-- /.span -->
--
GitLab
From 59ec4c7154984bd2847ff434fae7874f0b8e5265 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Apr 2012 15:40:49 -0700
Subject: [PATCH 06/42] make responsive input fields not wrap for fluid input
prepend/append by setting block back to inline-block (oversight of 2.0.3)
---
docs/assets/css/bootstrap-responsive.css | 2 +-
less/responsive-767px-max.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 7f669d573f..4791a686f9 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -169,7 +169,7 @@
}
[class*="span"],
.row-fluid [class*="span"] {
- display: block;
+ display: inline-block;
float: none;
width: auto;
margin-left: 0;
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 614c6905c2..e35e45d892 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -120,7 +120,7 @@
[class*="span"],
.row-fluid [class*="span"] {
float: none;
- display: block;
+ display: inline-block;
width: auto;
margin-left: 0;
}
--
GitLab
From b6b354ceaa1b29650b2b131bf436d64b70f5f344 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Apr 2012 15:42:55 -0700
Subject: [PATCH 07/42] #3255: typo in components for tabbable tabs
---
docs/components.html | 2 +-
docs/templates/pages/components.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/components.html b/docs/components.html
index 1678e58aa5..4ce4abdb19 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -813,7 +813,7 @@
<h3>Straightforward markup</h3>
<p>Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.</p>
<pre class="prettyprint linenums">
-<div class="tabbable"> <-- Only required for left/right tabs -->
+<div class="tabbable"> <!-- Only required for left/right tabs -->
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li>
<li><a href="#tab2" data-toggle="tab">Section 2</a></li>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 8e81a95df0..c6a78d2cc8 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -736,7 +736,7 @@
<h3>{{_i}}Straightforward markup{{/i}}</h3>
<p>{{_i}}Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.{{/i}}</p>
<pre class="prettyprint linenums">
-<div class="tabbable"> <-- Only required for left/right tabs -->
+<div class="tabbable"> <!-- Only required for left/right tabs -->
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
<li><a href="#tab2" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
--
GitLab
From ef368f0076523a8d0cd6b411549d7e9af9d1cf98 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 30 Apr 2012 15:43:47 -0700
Subject: [PATCH 08/42] #3263: typo in forms docs
---
docs/base-css.html | 2 +-
docs/templates/pages/base-css.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/base-css.html b/docs/base-css.html
index 5c55e04323..d1197820e0 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1272,7 +1272,7 @@ For example, <code>section</code> should be wrapped as inline.
</label>
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- Option two can is something else and selecting it will deselect option one
+ Option two can be something else and selecting it will deselect option one
</label>
</div>
</div>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 3524ac9852..b91b7d349d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1195,7 +1195,7 @@
</label>
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- {{_i}}Option two can is something else and selecting it will deselect option one{{/i}}
+ {{_i}}Option two can be something else and selecting it will deselect option one{{/i}}
</label>
</div>
</div>
--
GitLab
From 5ffb6d670683a32ec2a31c8550ea2669bfac7559 Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Tue, 1 May 2012 17:01:26 +0200
Subject: [PATCH 09/42] Add .hyphens mixin
---
less/mixins.less | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/less/mixins.less b/less/mixins.less
index b107955f57..5f3343e4ea 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -312,6 +312,15 @@
column-gap: @columnGap;
}
+// Optional hyphenation
+.hyphens(@mode: auto) {
+ -webkit-hyphens: @mode;
+ -moz-hyphens: @mode;
+ -ms-hyphens: @mode;
+ hyphens: @mode;
+ word-wrap:break-word;
+}
+
// Opacity
.opacity(@opacity) {
opacity: @opacity / 100;
--
GitLab
From dcc89e7400ae9e7575ea2671d27b514db9beaf3f Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Tue, 1 May 2012 17:06:19 +0200
Subject: [PATCH 10/42] Coding style
---
less/mixins.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/less/mixins.less b/less/mixins.less
index 5f3343e4ea..bd909123ef 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -318,7 +318,7 @@
-moz-hyphens: @mode;
-ms-hyphens: @mode;
hyphens: @mode;
- word-wrap:break-word;
+ word-wrap: break-word;
}
// Opacity
--
GitLab
From ca369c4b2af2a94acea00cd228d87a30fe5d2886 Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Tue, 1 May 2012 17:54:53 +0200
Subject: [PATCH 11/42] Add Opera prefix
---
less/mixins.less | 1 +
1 file changed, 1 insertion(+)
diff --git a/less/mixins.less b/less/mixins.less
index bd909123ef..44e5698eb0 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -317,6 +317,7 @@
-webkit-hyphens: @mode;
-moz-hyphens: @mode;
-ms-hyphens: @mode;
+ -o-hyphens: @mode;
hyphens: @mode;
word-wrap: break-word;
}
--
GitLab
From 20eae67147da15a75250a09f0932c0f3f2198b2b Mon Sep 17 00:00:00 2001
From: Milos Gavrilovic <gavra@arvag.net>
Date: Thu, 10 May 2012 12:25:22 +0300
Subject: [PATCH 12/42] Update .placeholder() mixin call
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:
.placeholder(@grayLight);
---
less/forms.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/less/forms.less b/less/forms.less
index 7d967c6b3d..61e29b6977 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -344,7 +344,7 @@ select:focus:required:invalid {
}
// Placeholder text gets special styles; can't be bundled together though for some reason
-.placeholder(@grayLight);
+.placeholder();
--
GitLab
From 526d77af6188427e1ed6cc3ec280e08e986379ac Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 11:10:08 -0700
Subject: [PATCH 13/42] remove wrapping <label> from all js docs
---
docs/javascript.html | 76 ++++++++----------------
docs/templates/pages/javascript.mustache | 76 ++++++++----------------
2 files changed, 52 insertions(+), 100 deletions(-)
diff --git a/docs/javascript.html b/docs/javascript.html
index 7ad42ae81f..1b659c6bfe 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -107,82 +107,58 @@
</div>
<div class="row">
<div class="span3">
- <label>
- <h3><a href="./javascript.html#modals">Modals</a></h3>
- <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
- </label>
+ <h3><a href="./javascript.html#modals">Modals</a></h3>
+ <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#dropdowns">Dropdowns</a></h3>
- <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
- </label>
+ <h3><a href="./javascript.html#dropdowns">Dropdowns</a></h3>
+ <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3>
- <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
- </label>
+ <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3>
+ <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#tabs">Togglable tabs</a></h3>
- <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
- </label>
+ <h3><a href="./javascript.html#tabs">Togglable tabs</a></h3>
+ <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span3">
- <label>
- <h3><a href="./javascript.html#tooltips">Tooltips</a></h3>
- <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.</p>
- </label>
+ <h3><a href="./javascript.html#tooltips">Tooltips</a></h3>
+ <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></h3>
- <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
- <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
- </label>
+ <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></h3>
+ <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
+ <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#alerts">Alert messages</a></h3>
- <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
- </label>
+ <h3><a href="./javascript.html#alerts">Alert messages</a></h3>
+ <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#buttons">Buttons</a></h3>
- <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
- </label>
+ <h3><a href="./javascript.html#buttons">Buttons</a></h3>
+ <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
</div>
</div> <!-- /row -->
<div class="row" style="margin-bottom: 9px;">
<div class="span3">
- <label>
- <h3><a href="./javascript.html#collapse">Collapse</a></h3>
- <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
- </label>
+ <h3><a href="./javascript.html#collapse">Collapse</a></h3>
+ <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#carousel">Carousel</a></h3>
- <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
- </label>
+ <h3><a href="./javascript.html#carousel">Carousel</a></h3>
+ <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
- <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
- </label>
+ <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
+ <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
</div>
<div class="span3">
- <label>
- <h3>Transitions <small class="muted">*</small></h3>
- <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
- <p class="muted"><strong>*</strong> Required for animation in plugins</p>
- </label>
+ <h3>Transitions <small class="muted">*</small></h3>
+ <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
+ <p class="muted"><strong>*</strong> Required for animation in plugins</p>
</div>
</div> <!-- /row -->
<div class="alert alert-info"><strong>Heads up!</strong> All javascript plugins require the latest version of jQuery.</div>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 1ae3ffa5a8..9fd84a43e9 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -30,82 +30,58 @@
</div>
<div class="row">
<div class="span3">
- <label>
- <h3><a href="./javascript.html#modals">{{_i}}Modals{{/i}}</a></h3>
- <p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#modals">{{_i}}Modals{{/i}}</a></h3>
+ <p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#dropdowns">{{_i}}Dropdowns{{/i}}</a></h3>
- <p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#dropdowns">{{_i}}Dropdowns{{/i}}</a></h3>
+ <p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></h3>
- <p>{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></h3>
+ <p>{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#tabs">{{_i}}Togglable tabs{{/i}}</a></h3>
- <p>{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#tabs">{{_i}}Togglable tabs{{/i}}</a></h3>
+ <p>{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}</p>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span3">
- <label>
- <h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3>
- <p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3>
+ <p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#popovers">{{_i}}Popovers{{/i}}</a> <small class="muted">*</small></h3>
- <p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p>
- <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltips</a> to be included{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#popovers">{{_i}}Popovers{{/i}}</a> <small class="muted">*</small></h3>
+ <p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p>
+ <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltips</a> to be included{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#alerts">{{_i}}Alert messages{{/i}}</a></h3>
- <p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#alerts">{{_i}}Alert messages{{/i}}</a></h3>
+ <p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#buttons">{{_i}}Buttons{{/i}}</a></h3>
- <p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#buttons">{{_i}}Buttons{{/i}}</a></h3>
+ <p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p>
</div>
</div> <!-- /row -->
<div class="row" style="margin-bottom: 9px;">
<div class="span3">
- <label>
- <h3><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></h3>
- <p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></h3>
+ <p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></h3>
- <p>{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></h3>
+ <p>{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
- <p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p>
- </label>
+ <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
+ <p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p>
</div>
<div class="span3">
- <label>
- <h3>{{_i}}Transitions{{/i}} <small class="muted">*</small></h3>
- <p>{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}</p>
- <p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
- </label>
+ <h3>{{_i}}Transitions{{/i}} <small class="muted">*</small></h3>
+ <p>{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}</p>
+ <p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
</div>
</div> <!-- /row -->
<div class="alert alert-info"><strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}All javascript plugins require the latest version of jQuery.{{/i}}</div>
--
GitLab
From 3a21891824f3f0af06da750bb768902e171b2ca0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 13:58:42 -0700
Subject: [PATCH 14/42] #3469: add variables for dropdown menu dividers
---
docs/less.html | 8 ++++++++
docs/templates/pages/less.mustache | 8 ++++++++
less/dropdowns.less | 2 +-
less/mixins.less | 6 +++---
less/variables.less | 3 ++-
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/docs/less.html b/docs/less.html
index 781bd2fb72..476f5ac982 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -614,6 +614,14 @@
<td><code>@dropdownLinkBackgroundHover</code></td>
<td><code>@linkColor</code></td>
</tr>
+ <tr>
+ <td><code>@@dropdownDividerTop</code></td>
+ <td><code>#e5e5e5</code></td>
+ </tr>
+ <tr>
+ <td><code>@@dropdownDividerBottom</code></td>
+ <td><code>@white</code></td>
+ </tr>
</tbody>
</table>
<h4>Hero unit</h4>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 0532b2f9cc..bb71484534 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -537,6 +537,14 @@
<td><code>@dropdownLinkBackgroundHover</code></td>
<td><code>@linkColor</code></td>
</tr>
+ <tr>
+ <td><code>@@dropdownDividerTop</code></td>
+ <td><code>#e5e5e5</code></td>
+ </tr>
+ <tr>
+ <td><code>@@dropdownDividerBottom</code></td>
+ <td><code>@white</code></td>
+ </tr>
</tbody>
</table>
<h4>{{_i}}Hero unit{{/i}}</h4>
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 6c60385e55..2bcd556879 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -71,7 +71,7 @@
// Dividers (basically an hr) within the dropdown
.divider {
- .nav-divider();
+ .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
}
// Links within the dropdown menu
diff --git a/less/mixins.less b/less/mixins.less
index b107955f57..6989b13760 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -417,7 +417,7 @@
// Horizontal dividers
// -------------------------
// Dividers (basically an hr) within dropdowns and nav lists
-.nav-divider() {
+.nav-divider(@top: #e5e5e5, @bottom: @white) {
// IE7 needs a set width since we gave a height. Restricting just
// to IE7 to keep the 1px left/right space in other browsers.
// It is unclear where IE is getting the extra space that we need
@@ -427,8 +427,8 @@
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
*margin: -5px 0 5px;
overflow: hidden;
- background-color: #e5e5e5;
- border-bottom: 1px solid @white;
+ background-color: @top;
+ border-bottom: 1px solid @bottom;
}
// Button backgrounds
diff --git a/less/variables.less b/less/variables.less
index d8825fb076..b931d3d2a2 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -107,7 +107,8 @@
@dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: @linkColor;
-
+@dropdownDividerTop: #e5e5e5;
+@dropdownDividerBottom: @white;
--
GitLab
From 6a896597277cd382e5bfe62b6f4312cdaa4a9d8e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 13:59:20 -0700
Subject: [PATCH 15/42] #3468: 140 icons, not 120
---
docs/base-css.html | 2 +-
docs/templates/pages/base-css.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/base-css.html b/docs/base-css.html
index d1197820e0..8cf3e21b1d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1590,7 +1590,7 @@ For example, <code>section</code> should be wrapped as inline.
<pre class="prettyprint linenums">
<i class="icon-search icon-white"></i>
</pre>
- <p>There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
+ <p>There are 140 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
<p>
<span class="label label-info">Heads up!</span>
When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code><i></code> tag for proper spacing.
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index b91b7d349d..f42612a225 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1513,7 +1513,7 @@
<pre class="prettyprint linenums">
<i class="icon-search icon-white"></i>
</pre>
- <p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
+ <p>{{_i}}There are 140 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
<p>
<span class="label label-info">{{_i}}Heads up!{{/i}}</span>
{{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code><i></code> tag for proper spacing.{{/i}}
--
GitLab
From d09db29039ba498c8d3255cadafb2c5c88ff1a2f Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 14:01:57 -0700
Subject: [PATCH 16/42] #3465 part 1: add type="button" to all dismiss buttons
in docs
---
docs/components.html | 10 +++++-----
docs/javascript.html | 8 ++++----
docs/templates/pages/components.mustache | 10 +++++-----
docs/templates/pages/javascript.mustache | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docs/components.html b/docs/components.html
index 4ce4abdb19..624af075f4 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1688,7 +1688,7 @@
<h3>Example alerts</h3>
<p>Wrap your message and an optional close icon in a div with simple class.</p>
<div class="alert">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>Warning!</strong> Best check yo self, you're not looking too good.
</div>
<pre class="prettyprint linenums">
@@ -1700,7 +1700,7 @@
<p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>button</code> element with the data attribute, which we have opted to do for our docs.</p>
<p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
<div class="alert alert-block">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<h4 class="alert-heading">Warning!</h4>
<p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
</div>
@@ -1719,7 +1719,7 @@
<div class="span4">
<h3>Error or danger</h3>
<div class="alert alert-error">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>Oh snap!</strong> Change a few things up and try submitting again.
</div>
<pre class="prettyprint linenums">
@@ -1731,7 +1731,7 @@
<div class="span4">
<h3>Success</h3>
<div class="alert alert-success">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>Well done!</strong> You successfully read this important alert message.
</div>
<pre class="prettyprint linenums">
@@ -1743,7 +1743,7 @@
<div class="span4">
<h3>Information</h3>
<div class="alert alert-info">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>Heads up!</strong> This alert needs your attention, but it's not super important.
</div>
<pre class="prettyprint linenums">
diff --git a/docs/javascript.html b/docs/javascript.html
index 1b659c6bfe..bceb4528c4 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -184,7 +184,7 @@
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;">
<div class="modal-header">
- <button class="close" data-dismiss="modal">×</button>
+ <button type="button" class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
@@ -202,7 +202,7 @@
<!-- sample modal content -->
<div id="myModal" class="modal hide fade">
<div class="modal-header">
- <button class="close" data-dismiss="modal">×</button>
+ <button type="button" class="close" data-dismiss="modal">×</button>
<h3>Modal Heading</h3>
</div>
<div class="modal-body">
@@ -954,11 +954,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>Example alerts</h2>
<p>The alerts plugin works on regular alert messages, and block messages.</p>
<div class="alert fade in">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</div>
<div class="alert alert-block alert-error fade in">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<h4 class="alert-heading">Oh snap! You got an error!</h4>
<p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
<p>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index c6a78d2cc8..45c244cef3 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1611,7 +1611,7 @@
<h3>{{_i}}Example alerts{{/i}}</h3>
<p>{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}</p>
<div class="alert">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
<pre class="prettyprint linenums">
@@ -1623,7 +1623,7 @@
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>button</code> element with the data attribute, which we have opted to do for our docs.{{/i}}</p>
<p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
<div class="alert alert-block">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
<p>{{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
</div>
@@ -1642,7 +1642,7 @@
<div class="span4">
<h3>{{_i}}Error or danger{{/i}}</h3>
<div class="alert alert-error">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{_i}}Oh snap!{{/i}}</strong> {{_i}}Change a few things up and try submitting again.{{/i}}
</div>
<pre class="prettyprint linenums">
@@ -1654,7 +1654,7 @@
<div class="span4">
<h3>{{_i}}Success{{/i}}</h3>
<div class="alert alert-success">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{_i}}Well done!{{/i}}</strong> {{_i}}You successfully read this important alert message.{{/i}}
</div>
<pre class="prettyprint linenums">
@@ -1666,7 +1666,7 @@
<div class="span4">
<h3>{{_i}}Information{{/i}}</h3>
<div class="alert alert-info">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but it's not super important.{{/i}}
</div>
<pre class="prettyprint linenums">
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 9fd84a43e9..7665a4cc61 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -107,7 +107,7 @@
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;">
<div class="modal-header">
- <button class="close" data-dismiss="modal">×</button>
+ <button type="button" class="close" data-dismiss="modal">×</button>
<h3>{{_i}}Modal header{{/i}}</h3>
</div>
<div class="modal-body">
@@ -125,7 +125,7 @@
<!-- sample modal content -->
<div id="myModal" class="modal hide fade">
<div class="modal-header">
- <button class="close" data-dismiss="modal">×</button>
+ <button type="button" class="close" data-dismiss="modal">×</button>
<h3>{{_i}}Modal Heading{{/i}}</h3>
</div>
<div class="modal-body">
@@ -877,11 +877,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>{{_i}}Example alerts{{/i}}</h2>
<p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p>
<div class="alert fade in">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
<div class="alert alert-block alert-error fade in">
- <button class="close" data-dismiss="alert">×</button>
+ <button type="button" class="close" data-dismiss="alert">×</button>
<h4 class="alert-heading">{{_i}}Oh snap! You got an error!{{/i}}</h4>
<p>{{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}</p>
<p>
--
GitLab
From 7de65e0a628a3faa1b3837aabea43ae234c5b7a4 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 14:03:32 -0700
Subject: [PATCH 17/42] #3465 part 2: add mention to docs of type button issue
---
docs/components.html | 4 ++--
docs/templates/pages/components.mustache | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/components.html b/docs/components.html
index 624af075f4..1ff759f2e0 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1665,7 +1665,7 @@
-<!-- Alerts & Messages
+<!-- Alerts
================================================== -->
<section id="alerts">
<div class="page-header">
@@ -1697,7 +1697,7 @@
<strong>Warning!</strong> Best check yo self, you're not looking too good.
</div>
</pre>
- <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>button</code> element with the data attribute, which we have opted to do for our docs.</p>
+ <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or risk unintentional form submissions.</p>
<p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">×</button>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 45c244cef3..fd6748fe03 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1588,7 +1588,7 @@
-<!-- Alerts & Messages
+<!-- Alerts
================================================== -->
<section id="alerts">
<div class="page-header">
@@ -1620,7 +1620,7 @@
<strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
</pre>
- <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>button</code> element with the data attribute, which we have opted to do for our docs.{{/i}}</p>
+ <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or risk unintentional form submissions.{{/i}}</p>
<p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">×</button>
--
GitLab
From 8f4424585094354589fbab80d5b0e6b1bb6d87cf Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 14:31:31 -0700
Subject: [PATCH 18/42] document .hyphens() mixin
---
docs/less.html | 5 +++++
docs/templates/pages/less.mustache | 5 +++++
less/mixins.less | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/docs/less.html b/docs/less.html
index 476f5ac982..aff16044f9 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -907,6 +907,11 @@
<td><code>@columnCount, @columnGap: @gridGutterWidth</code></td>
<td>Make the content of any element use CSS3 columns</td>
</tr>
+ <tr>
+ <td><code>.hyphens()</code></td>
+ <td><code>@mode: auto</code></td>
+ <td>CSS3 hyphenation when you want it (includes <code>word-wrap: break-word</code>)</td>
+ </tr>
</tbody>
</table>
<h3>Backgrounds and gradients</h3>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index bb71484534..a83a28ceda 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -830,6 +830,11 @@
<td><code>@columnCount, @columnGap: @gridGutterWidth</code></td>
<td>{{_i}}Make the content of any element use CSS3 columns{{/i}}</td>
</tr>
+ <tr>
+ <td><code>.hyphens()</code></td>
+ <td><code>@mode: auto</code></td>
+ <td>{{_i}}CSS3 hyphenation when you want it (includes <code>word-wrap: break-word</code>){{/i}}</td>
+ </tr>
</tbody>
</table>
<h3>{{_i}}Backgrounds and gradients{{/i}}</h3>
diff --git a/less/mixins.less b/less/mixins.less
index b5c5352cf2..8efe12b388 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -314,12 +314,12 @@
// Optional hyphenation
.hyphens(@mode: auto) {
+ word-wrap: break-word;
-webkit-hyphens: @mode;
-moz-hyphens: @mode;
-ms-hyphens: @mode;
-o-hyphens: @mode;
hyphens: @mode;
- word-wrap: break-word;
}
// Opacity
--
GitLab
From a2fb9ed42f4fedbf2045601bedc8dace4d8bbd36 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 17:43:04 -0700
Subject: [PATCH 19/42] #3449: make legend and form-actions the same border
color
---
docs/assets/css/bootstrap.css | 6 +++---
less/forms.less | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f13cad826d..d6326a156f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -603,7 +603,7 @@ em {
abbr[title] {
cursor: help;
- border-bottom: 1px dotted #ddd;
+ border-bottom: 1px dotted #999999;
}
abbr.initialism {
@@ -740,7 +740,7 @@ legend {
line-height: 36px;
color: #333333;
border: 0;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #e5e5e5;
}
legend small {
@@ -1190,7 +1190,7 @@ select:focus:required:invalid:focus {
margin-top: 18px;
margin-bottom: 18px;
background-color: #f5f5f5;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e5e5e5;
*zoom: 1;
}
diff --git a/less/forms.less b/less/forms.less
index 61e29b6977..9f95dd64f8 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -27,7 +27,7 @@ legend {
line-height: @baseLineHeight * 2;
color: @grayDark;
border: 0;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #e5e5e5;
// Small
small {
@@ -329,7 +329,7 @@ select:focus:required:invalid {
margin-top: @baseLineHeight;
margin-bottom: @baseLineHeight;
background-color: @formActionsBackground;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e5e5e5;
.clearfix(); // Adding clearfix to allow for .pull-right button containers
}
--
GitLab
From 332d2a7384621e113282752d21987b04f1ec6388 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 17:43:56 -0700
Subject: [PATCH 20/42] #3438: fix typo on i18n tag
---
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 fd6748fe03..759e9a4159 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1252,7 +1252,7 @@
<span class="label label-success">{{_i}}Success{{/i}}</span>
</td>
<td>
- <code><span class="label label-success">{{/_i}}Success{{/i}}</span></code>
+ <code><span class="label label-success">{{_i}}Success{{/i}}</span></code>
</td>
</tr>
<tr>
--
GitLab
From ea156609736513a4ad5aa22ef574bccbc3d23330 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 21:52:18 -0700
Subject: [PATCH 21/42] #3420: properly scope dropdown open state to immediate
children only
---
docs/assets/css/bootstrap.css | 2 +-
less/dropdowns.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d6326a156f..ab6059ad01 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2433,7 +2433,7 @@ table .span24 {
*z-index: 1000;
}
-.open .dropdown-menu {
+.open > .dropdown-menu {
display: block;
}
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 2bcd556879..96dfec2237 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -103,7 +103,7 @@
// make the menu appear below buttons that appeared later on the page
*z-index: @zindexDropdown;
- .dropdown-menu {
+ & > .dropdown-menu {
display: block;
}
}
--
GitLab
From 826a8714e266e488fc51bc9ca779556731b8afd3 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 13 May 2012 22:11:35 -0700
Subject: [PATCH 22/42] #3257: share .navbar-fixed-top styles with
.navbar-fixed-bottom
---
docs/assets/css/bootstrap-responsive.css | 11 +++++++++--
less/responsive-navbar.less | 11 +++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 4791a686f9..9f32f08085 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -683,11 +683,18 @@
body {
padding-top: 0;
}
- .navbar-fixed-top {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
position: static;
+ }
+ .navbar-fixed-top {
margin-bottom: 18px;
}
- .navbar-fixed-top .navbar-inner {
+ .navbar-fixed-bottom {
+ margin-top: 18px;
+ }
+ .navbar-fixed-top .navbar-inner,
+ .navbar-fixed-bottom .navbar-inner {
padding: 5px;
}
.navbar .container {
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index d49b8ae12d..8d31db5310 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -9,11 +9,18 @@
padding-top: 0;
}
// Unfix the navbar
- .navbar-fixed-top {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
position: static;
+ }
+ .navbar-fixed-top {
margin-bottom: @baseLineHeight;
}
- .navbar-fixed-top .navbar-inner {
+ .navbar-fixed-bottom {
+ margin-top: @baseLineHeight;
+ }
+ .navbar-fixed-top .navbar-inner,
+ .navbar-fixed-bottom .navbar-inner {
padding: 5px;
}
.navbar .container {
--
GitLab
From e9a7d26d0636445fb20def22db54fe703164031b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Borgesen?= <joergen.borgesen@gmail.com>
Date: Mon, 14 May 2012 14:03:36 +0200
Subject: [PATCH 23/42] Cancel running timer for tooltips with delayed show,
but instant hide. This prevents delayed tooltips from appearing if the mouse
leaves the elements before tooltip is showed and the hiding delay is 0.
---
js/bootstrap-tooltip.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 577ead48b5..4c2a2a328d 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -84,6 +84,7 @@
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+ if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
clearTimeout(this.timeout)
@@ -272,4 +273,4 @@
, delay: 0
}
-}(window.jQuery);
\ No newline at end of file
+}(window.jQuery);
--
GitLab
From 1b537c6f9c86806143c6e7afb3f720c99da7006c Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 08:57:24 -0700
Subject: [PATCH 24/42] adding navbar example, for fixed and static navbars
---
docs/examples/navbar.html | 108 ++++++++++++++++++++++++++++++++++++++
1 file changed, 108 insertions(+)
create mode 100644 docs/examples/navbar.html
diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html
new file mode 100644
index 0000000000..822eb76c86
--- /dev/null
+++ b/docs/examples/navbar.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <title>Bootstrap, from Twitter</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- Le styles -->
+ <link href="../assets/css/bootstrap.css" rel="stylesheet">
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ padding-bottom: 20px;
+ }
+ </style>
+ <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="../assets/ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ </head>
+
+ <body>
+
+ <!-- Fixed navbar -->
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="#">Project name</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#about">About</a></li>
+ <li><a href="#contact">Contact</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+
+ <!-- Static navbar -->
+ <div class="navbar">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="#">Project name</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#about">About</a></li>
+ <li><a href="#contact">Contact</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+ </div>
+
+ <!-- Main hero unit for a primary marketing message or call to action -->
+ <div class="hero-unit">
+ <h1>Navbar example</h1>
+ <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
+ <p>
+ <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs »</a>
+ </p>
+ </div>
+
+ </div> <!-- /container -->
+
+ <!-- Le javascript
+ ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="../assets/js/jquery.js"></script>
+ <script src="../assets/js/bootstrap-transition.js"></script>
+ <script src="../assets/js/bootstrap-alert.js"></script>
+ <script src="../assets/js/bootstrap-modal.js"></script>
+ <script src="../assets/js/bootstrap-dropdown.js"></script>
+ <script src="../assets/js/bootstrap-scrollspy.js"></script>
+ <script src="../assets/js/bootstrap-tab.js"></script>
+ <script src="../assets/js/bootstrap-tooltip.js"></script>
+ <script src="../assets/js/bootstrap-popover.js"></script>
+ <script src="../assets/js/bootstrap-button.js"></script>
+ <script src="../assets/js/bootstrap-collapse.js"></script>
+ <script src="../assets/js/bootstrap-carousel.js"></script>
+ <script src="../assets/js/bootstrap-typeahead.js"></script>
+
+ </body>
+</html>
--
GitLab
From 33061a8e0b5a5955c469c3e5184e989e497db4e3 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 22:02:51 -0700
Subject: [PATCH 25/42] document .lead per #3213
---
docs/base-css.html | 6 ++++--
docs/templates/pages/base-css.mustache | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/base-css.html b/docs/base-css.html
index 8cf3e21b1d..69a9a2f590 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -111,8 +111,10 @@
</div>
<div class="span4">
<h3>Example body text</h3>
- <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
+ <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
+ <h3>Lead body copy</h3>
+ <p>Make a paragraph stand out by adding <code>.lead</code>.</p>
+ <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
</div>
<div class="span4">
<div class="well">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index f42612a225..1404a31f02 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -34,8 +34,10 @@
</div>
<div class="span4">
<h3>{{_i}}Example body text{{/i}}</h3>
- <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
+ <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
+ <h3>{{_i}}Lead body copy{{/i}}</h3>
+ <p>{{_i}}Make a paragraph stand out by adding <code>.lead</code>.{{/i}}</p>
+ <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
</div>
<div class="span4">
<div class="well">
--
GitLab
From a0809ceebe5332a1c3e355a762d1bff3e477ce37 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 23:40:06 -0700
Subject: [PATCH 26/42] add forms test page for all html5 input types and
refactor selectors
---
docs/assets/css/bootstrap.css | 129 ++++++++----------------
docs/assets/css/docs.css | 5 +
docs/examples/forms.html | 181 ++++++++++++++++++++++++++++++++++
less/forms.less | 131 +++++++++++-------------
4 files changed, 286 insertions(+), 160 deletions(-)
create mode 100644 docs/examples/forms.html
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ab6059ad01..d8b4c6b328 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -771,23 +771,59 @@ label {
color: #333333;
}
-input,
-textarea,
select,
-.uneditable-input {
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"] {
display: inline-block;
- width: 210px;
height: 18px;
padding: 4px;
margin-bottom: 9px;
font-size: 13px;
line-height: 18px;
color: #555555;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"] {
background-color: #ffffff;
border: 1px solid #cccccc;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+ transition: border linear 0.2s, box-shadow linear 0.2s;
}
.uneditable-textarea {
@@ -795,56 +831,6 @@ select,
height: auto;
}
-label input,
-label textarea,
-label select {
- display: block;
-}
-
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
- width: auto;
- height: auto;
- padding: 0;
- margin: 3px 0;
- *margin-top: 0;
- /* IE7 */
-
- line-height: normal;
- cursor: pointer;
- background-color: transparent;
- border: 0 \9;
- /* IE9 and down */
-
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
-}
-
-input[type="image"] {
- border: 0;
-}
-
-input[type="file"] {
- width: auto;
- padding: initial;
- line-height: initial;
- background-color: #ffffff;
- background-color: initial;
- border: initial;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- width: auto;
- height: auto;
-}
-
select,
input[type="file"] {
height: 28px;
@@ -856,34 +842,11 @@ input[type="file"] {
line-height: 28px;
}
-input[type="file"] {
- line-height: 18px \9;
-}
-
-select {
- width: 220px;
- background-color: #ffffff;
-}
-
select[multiple],
select[size] {
height: auto;
}
-input[type="image"] {
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-
-textarea {
- height: auto;
-}
-
-input[type="hidden"] {
- display: none;
-}
-
.radio,
.checkbox {
min-height: 18px;
@@ -914,18 +877,6 @@ input[type="hidden"] {
margin-left: 10px;
}
-input,
-textarea {
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
- -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
- -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
- -o-transition: border linear 0.2s, box-shadow linear 0.2s;
- transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
input:focus,
textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b7e0c8dbfa..92a4ec8e67 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -649,6 +649,11 @@ form.well {
margin-top: 18px;
}
+ /* icons */
+ .marketing .bs-icon {
+ margin: 0;
+ }
+
/* Adjust the jumbotron */
.jumbotron h1,
.jumbotron p {
diff --git a/docs/examples/forms.html b/docs/examples/forms.html
new file mode 100644
index 0000000000..ee0eb9c647
--- /dev/null
+++ b/docs/examples/forms.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <title>Bootstrap, from Twitter</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- Le styles -->
+ <link href="../assets/css/bootstrap.css" rel="stylesheet">
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ padding-bottom: 20px;
+ }
+ </style>
+ <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="../assets/ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ </head>
+
+ <body>
+
+ <form class="container">
+
+ <div class="page-header">
+ <h1>Form controls</h1>
+ </div>
+
+ <div class="row">
+ <div class="span6">
+
+ <label>Select</label>
+ <select>
+ <option>Select</option>
+ <option>Option 2</option>
+ <option>Option 3</option>
+ </select>
+
+ <hr>
+
+ <label>textarea</label>
+ <textarea>Textarea</textarea>
+
+ <hr>
+
+ <label>text</label>
+ <input type="text" value="Text input">
+
+ <hr>
+
+ <label>password</label>
+ <input type="password" value="Password input">
+
+ <hr>
+
+ <label>checkbox</label>
+ <input type="checkbox" value="">
+
+ <hr>
+
+ <label>radio</label>
+ <input type="radio" value="">
+
+ <hr>
+
+ <label>button</label>
+ <input type="button" value="Button">
+
+ <hr>
+
+ <label>submit</label>
+ <input type="submit" value="Submit">
+
+ <hr>
+
+ <label>reset</label>
+ <input type="reset" value="Reset">
+
+ <hr>
+
+ <label>file</label>
+ <input type="file" value="">
+
+ <hr>
+
+ <label>hidden</label>
+ <input type="hidden" value="hidden">
+
+ <hr>
+
+ <label>image</label>
+ <input type="image" value="">
+
+ </div><!-- /span6 -->
+
+ <div class="span6">
+
+ <hr class="visible-phone">
+
+ <label>datetime</label>
+ <input type="datetime" value="">
+
+ <hr>
+
+ <label>datetime-local</label>
+ <input type="datetime-local" value="">
+
+ <hr>
+
+ <label>date</label>
+ <input type="date" value="">
+
+ <hr>
+
+ <label>month</label>
+ <input type="month" value="">
+
+ <hr>
+
+ <label>time</label>
+ <input type="time" value="">
+
+ <hr>
+
+ <label>week</label>
+ <input type="week" value="">
+
+ <hr>
+
+ <label>number</label>
+ <input type="number" value="">
+
+ <hr>
+
+ <label>range</label>
+ <input type="range" value="">
+
+ <hr>
+
+ <label>email</label>
+ <input type="email" value="">
+
+ <hr>
+
+ <label>url</label>
+ <input type="url" value="">
+
+ <hr>
+
+ <label>search</label>
+ <input type="search" value="">
+
+ <hr>
+
+ <label>tel</label>
+ <input type="tel" value="">
+
+ <hr>
+
+ <label>color</label>
+ <input type="color" value="">
+
+ </div><!-- /span6 -->
+ </div><!-- /row -->
+
+ </form> <!-- /container -->
+
+ </body>
+</html>
diff --git a/less/forms.less b/less/forms.less
index 9f95dd64f8..f9a994a7b5 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -58,69 +58,88 @@ label {
color: @grayDark;
}
-// Inputs, Textareas, Selects
-input,
-textarea,
+// Form controls
+// -------------------------
+
+// Shared resets
select,
-.uneditable-input {
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"] {
display: inline-block;
- width: 210px;
height: @baseLineHeight;
padding: 4px;
margin-bottom: 9px;
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @gray;
+}
+
+// Textual inputs and textareas
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"] {
background-color: @inputBackground;
border: 1px solid @inputBorder;
.border-radius(@inputBorderRadius);
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+ @transition: border linear .2s, box-shadow linear .2s;
+ .transition(@transition);
}
-.uneditable-textarea {
- width: auto;
- height: auto;
+
+input[type="radio"],
+input[type="checkbox"] {
+
}
-// Inputs within a label
-label input,
-label textarea,
-label select {
- display: block;
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+
}
-// Mini reset for unique input types
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
- width: auto;
- height: auto;
- padding: 0;
- margin: 3px 0;
- *margin-top: 0; /* IE7 */
- line-height: normal;
- cursor: pointer;
- background-color: transparent;
- border: 0 \9; /* IE9 and down */
- .border-radius(0);
+input[type="file"] {
+
+}
+
+input[type="hidden"] {
+
}
+
input[type="image"] {
- border: 0;
+
}
-// Reset the file input to browser defaults
-input[type="file"] {
- width: auto;
- padding: initial;
- line-height: initial;
- background-color: @inputBackground;
- background-color: initial;
- border: initial;
- .box-shadow(none);
+input[type="range"] {
+
}
-// Help out input buttons
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
width: auto;
height: auto;
}
@@ -133,37 +152,13 @@ input[type="file"] {
line-height: 28px;
}
-// Reset line-height for IE
-input[type="file"] {
- line-height: 18px \9;
-}
-
-// Chrome on Linux and Mobile Safari need background-color
-select {
- width: 220px; // default input width + 10px of padding that doesn't get applied
- background-color: @inputBackground;
-}
-
// Make multiple select elements height not fixed
select[multiple],
select[size] {
height: auto;
}
-// Remove shadow from image inputs
-input[type="image"] {
- .box-shadow(none);
-}
-// Make textarea height behave
-textarea {
- height: auto;
-}
-
-// Hidden inputs
-input[type="hidden"] {
- display: none;
-}
@@ -207,12 +202,6 @@ input[type="hidden"] {
// FOCUS STATE
// -----------
-input,
-textarea {
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
- @transition: border linear .2s, box-shadow linear .2s;
- .transition(@transition);
-}
input:focus,
textarea:focus {
border-color: rgba(82,168,236,.8);
--
GitLab
From e28efd7da07d20d706421b3c868ccc08e0e3077d Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 23:42:32 -0700
Subject: [PATCH 27/42] consolidate and relabel new form selectors
---
less/forms.less | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/less/forms.less b/less/forms.less
index f9a994a7b5..4a218033ae 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -61,7 +61,7 @@ label {
// Form controls
// -------------------------
-// Shared resets
+// Shared size and type resets
select,
textarea,
input[type="text"],
@@ -87,7 +87,7 @@ input[type="color"] {
color: @gray;
}
-// Textual inputs and textareas
+// Reset background, border, and box-shadow for textual inputs and textarea
textarea,
input[type="text"],
input[type="password"],
@@ -111,31 +111,21 @@ input[type="color"] {
.transition(@transition);
}
+// Unused selectors
input[type="radio"],
input[type="checkbox"] {
-
}
-
input[type="button"],
input[type="submit"],
input[type="reset"] {
-
}
-
input[type="file"] {
-
}
-
input[type="hidden"] {
-
}
-
input[type="image"] {
-
}
-
input[type="range"] {
-
}
// Make uneditable textareas behave like a textarea
--
GitLab
From c8cafa5d5a352d33e96b8580a4a68b943f71882e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 23:45:25 -0700
Subject: [PATCH 28/42] move forms test to less/tests
---
{docs/examples => less/tests}/forms.html | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
rename {docs/examples => less/tests}/forms.html (85%)
diff --git a/docs/examples/forms.html b/less/tests/forms.html
similarity index 85%
rename from docs/examples/forms.html
rename to less/tests/forms.html
index ee0eb9c647..4b3328e2ef 100644
--- a/docs/examples/forms.html
+++ b/less/tests/forms.html
@@ -8,14 +8,8 @@
<meta name="author" content="">
<!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <style type="text/css">
- body {
- padding-top: 60px;
- padding-bottom: 20px;
- }
- </style>
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
+ <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
@@ -23,11 +17,11 @@
<![endif]-->
<!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
--
GitLab
From 87f6e426b33590bf8b14d933cd9cbb101a9bed23 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 23:50:34 -0700
Subject: [PATCH 29/42] three columns
---
less/tests/forms.html | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/less/tests/forms.html b/less/tests/forms.html
index 4b3328e2ef..a63d728a00 100644
--- a/less/tests/forms.html
+++ b/less/tests/forms.html
@@ -10,6 +10,12 @@
<!-- Le styles -->
<link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
<link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <style>
+ body {
+ padding-top: 30px;
+ padding-bottom: 30px;
+ }
+ </style>
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
@@ -33,7 +39,7 @@
</div>
<div class="row">
- <div class="span6">
+ <div class="span4">
<label>Select</label>
<select>
@@ -82,7 +88,8 @@
<label>reset</label>
<input type="reset" value="Reset">
- <hr>
+ </div><!-- /span4 -->
+ <div class="span4">
<label>file</label>
<input type="file" value="">
@@ -97,11 +104,7 @@
<label>image</label>
<input type="image" value="">
- </div><!-- /span6 -->
-
- <div class="span6">
-
- <hr class="visible-phone">
+ <hr>
<label>datetime</label>
<input type="datetime" value="">
@@ -131,7 +134,8 @@
<label>week</label>
<input type="week" value="">
- <hr>
+ </div><!-- /span4 -->
+ <div class="span4">
<label>number</label>
<input type="number" value="">
@@ -166,7 +170,7 @@
<label>color</label>
<input type="color" value="">
- </div><!-- /span6 -->
+ </div><!-- /span4 -->
</div><!-- /row -->
</form> <!-- /container -->
--
GitLab
From ecf84bdac51a9c56d18c4a25b3d5b0c66a09151a Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 00:17:02 -0700
Subject: [PATCH 30/42] correct regressions against 2.0.3
---
docs/assets/css/bootstrap.css | 28 ++++++++++++++++++++++++++
less/forms.less | 37 +++++++++++++++++++++++------------
2 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d8b4c6b328..fabedd1f77 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -796,6 +796,11 @@ input[type="color"] {
color: #555555;
}
+input,
+textarea {
+ width: 210px;
+}
+
textarea,
input[type="text"],
input[type="password"],
@@ -826,6 +831,24 @@ input[type="color"] {
transition: border linear 0.2s, box-shadow linear 0.2s;
}
+input[type="radio"],
+input[type="checkbox"] {
+ margin: 3px 0;
+ *margin-top: 0;
+ /* IE7 */
+
+ line-height: normal;
+ cursor: pointer;
+}
+
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+ width: auto;
+}
+
.uneditable-textarea {
width: auto;
height: auto;
@@ -842,6 +865,11 @@ input[type="file"] {
line-height: 28px;
}
+select {
+ width: 220px;
+ border: 1px solid #bbb;
+}
+
select[multiple],
select[size] {
height: auto;
diff --git a/less/forms.less b/less/forms.less
index 4a218033ae..277cdf42f1 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -87,7 +87,13 @@ input[type="color"] {
color: @gray;
}
-// Reset background, border, and box-shadow for textual inputs and textarea
+// Reset appearance properties for textual inputs and textarea
+// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
+input,
+textarea {
+ width: 210px;
+}
+// Everything else
textarea,
input[type="text"],
input[type="password"],
@@ -111,21 +117,22 @@ input[type="color"] {
.transition(@transition);
}
-// Unused selectors
+// Position radios and checkboxes better
input[type="radio"],
input[type="checkbox"] {
+ margin: 3px 0;
+ *margin-top: 0; /* IE7 */
+ line-height: normal;
+ cursor: pointer;
}
-input[type="button"],
+
+// Reset width of input buttons, radios, checkboxes
input[type="submit"],
-input[type="reset"] {
-}
-input[type="file"] {
-}
-input[type="hidden"] {
-}
-input[type="image"] {
-}
-input[type="range"] {
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+ width: auto; // Override of generic input selector
}
// Make uneditable textareas behave like a textarea
@@ -142,6 +149,12 @@ input[type="file"] {
line-height: 28px;
}
+// Make select elements obey height by applying a border
+select {
+ width: 220px; // default input width + 10px of padding that doesn't get applied
+ border: 1px solid #bbb;
+}
+
// Make multiple select elements height not fixed
select[multiple],
select[size] {
--
GitLab
From 532569fe59bbc8a1a74d7984279749f736cbdd3a Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 09:04:44 -0700
Subject: [PATCH 31/42] updated forms to rearrange focus state, reinstate
uneditable-input, and a few other cleanup tidbits
---
less/forms.less | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/less/forms.less b/less/forms.less
index 277cdf42f1..f0fd90f8d7 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -77,7 +77,8 @@ input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
-input[type="color"] {
+input[type="color"],
+.uneditable-input {
display: inline-block;
height: @baseLineHeight;
padding: 4px;
@@ -115,6 +116,14 @@ input[type="color"] {
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@transition: border linear .2s, box-shadow linear .2s;
.transition(@transition);
+
+ // Focus state
+ &:focus {
+ border-color: rgba(82,168,236,.8);
+ outline: 0;
+ outline: thin dotted \9; /* IE6-9 */
+ .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
+ }
}
// Position radios and checkboxes better
@@ -161,7 +170,13 @@ select[size] {
height: auto;
}
-
+// Focus for select, file, radio, and checkbox
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+ .tab-focus();
+}
@@ -202,26 +217,6 @@ select[size] {
-// FOCUS STATE
-// -----------
-
-input:focus,
-textarea:focus {
- border-color: rgba(82,168,236,.8);
- outline: 0;
- outline: thin dotted \9; /* IE6-9 */
- .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus {
- .tab-focus();
- .box-shadow(none); // override for file inputs
-}
-
-
-
// INPUT SIZES
// -----------
@@ -252,8 +247,7 @@ textarea[class*="span"],
// GRID SIZING FOR INPUTS
// ----------------------
-#grid > .input (@gridColumnWidth, @gridGutterWidth);
-
+#grid > .input(@gridColumnWidth, @gridGutterWidth);
--
GitLab
From a9d4b667ff6349a54cdd470c82c7ef3c88de4165 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 09:07:19 -0700
Subject: [PATCH 32/42] finish fixing uneditable-input and remake
---
docs/assets/css/bootstrap.css | 6 ++++--
less/forms.less | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fabedd1f77..46e163a46f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -786,7 +786,8 @@ input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
-input[type="color"] {
+input[type="color"],
+.uneditable-input {
display: inline-block;
height: 18px;
padding: 4px;
@@ -815,7 +816,8 @@ input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
-input[type="color"] {
+input[type="color"],
+.uneditable-input {
background-color: #ffffff;
border: 1px solid #cccccc;
-webkit-border-radius: 3px;
diff --git a/less/forms.less b/less/forms.less
index 277cdf42f1..d70dd9c4dd 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -77,7 +77,8 @@ input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
-input[type="color"] {
+input[type="color"],
+.uneditable-input {
display: inline-block;
height: @baseLineHeight;
padding: 4px;
@@ -108,7 +109,8 @@ input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
-input[type="color"] {
+input[type="color"],
+.uneditable-input {
background-color: @inputBackground;
border: 1px solid @inputBorder;
.border-radius(@inputBorderRadius);
--
GitLab
From 3a27b4e6f6722ebde97644126b16da0fbb0ea474 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 09:07:55 -0700
Subject: [PATCH 33/42] remake again after pull
---
docs/assets/css/bootstrap.css | 59 +++++++++++++++++++++--------------
1 file changed, 35 insertions(+), 24 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 46e163a46f..42d1907d69 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -833,6 +833,32 @@ input[type="color"],
transition: border linear 0.2s, box-shadow linear 0.2s;
}
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+ border-color: rgba(82, 168, 236, 0.8);
+ outline: 0;
+ outline: thin dotted \9;
+ /* IE6-9 */
+
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
input[type="radio"],
input[type="checkbox"] {
margin: 3px 0;
@@ -877,6 +903,15 @@ select[size] {
height: auto;
}
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+ outline: thin dotted #333;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+
.radio,
.checkbox {
min-height: 18px;
@@ -907,30 +942,6 @@ select[size] {
margin-left: 10px;
}
-input:focus,
-textarea:focus {
- border-color: rgba(82, 168, 236, 0.8);
- outline: 0;
- outline: thin dotted \9;
- /* IE6-9 */
-
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus {
- outline: thin dotted #333;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-
.input-mini {
width: 60px;
}
--
GitLab
From 0679f24606dff0a3d38f88bad220d393bb363dba Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 09:37:28 -0700
Subject: [PATCH 34/42] example incorrect for modal dismiss button
---
docs/javascript.html | 2 +-
docs/templates/pages/javascript.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/javascript.html b/docs/javascript.html
index bceb4528c4..0208af819d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -279,7 +279,7 @@
<pre class="prettyprint linenums">
<div class="modal" id="myModal">
<div class="modal-header">
- <button class="close" data-dismiss="modal">×</button>
+ <button type="button" class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 7665a4cc61..f5c6ce9107 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -202,7 +202,7 @@
<pre class="prettyprint linenums">
<div class="modal" id="myModal">
<div class="modal-header">
- <button class="close" data-dismiss="modal">×</button>
+ <button type="button" class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
--
GitLab
From 67f81a2ed53d5608a26eae5eb301614ad53cf3b5 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 09:41:06 -0700
Subject: [PATCH 35/42] clarify button type on dismiss icons
---
docs/components.html | 2 +-
docs/templates/pages/components.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/components.html b/docs/components.html
index 1ff759f2e0..523b189bb7 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1697,7 +1697,7 @@
<strong>Warning!</strong> Best check yo self, you're not looking too good.
</div>
</pre>
- <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or risk unintentional form submissions.</p>
+ <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or your forms may not submit.</p>
<p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">×</button>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 759e9a4159..b1f8589981 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1620,7 +1620,7 @@
<strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
</pre>
- <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or risk unintentional form submissions.{{/i}}</p>
+ <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or your forms may not submit.{{/i}}</p>
<p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">×</button>
--
GitLab
From e009ed23fcdfa87cc773c2c08f546b30e0e35950 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 09:45:53 -0700
Subject: [PATCH 36/42] move navbar and update paths so it sits in tests
---
{docs/examples => less/tests}/navbar.html | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
rename {docs/examples => less/tests}/navbar.html (87%)
diff --git a/docs/examples/navbar.html b/less/tests/navbar.html
similarity index 87%
rename from docs/examples/navbar.html
rename to less/tests/navbar.html
index 822eb76c86..17754bf6e8 100644
--- a/docs/examples/navbar.html
+++ b/less/tests/navbar.html
@@ -8,14 +8,14 @@
<meta name="author" content="">
<!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <style type="text/css">
+ <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
+ <style>
body {
padding-top: 60px;
- padding-bottom: 20px;
+ padding-bottom: 30px;
}
</style>
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
@@ -23,11 +23,11 @@
<![endif]-->
<!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
--
GitLab
From 5ecab6112cb3a53b3222f90c44b0938929e71ac9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 15 May 2012 10:59:06 -0700
Subject: [PATCH 37/42] version bump on docs home
---
docs/index.html | 2 +-
docs/templates/pages/index.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/index.html b/docs/index.html
index 19e6a676ad..370750be90 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -83,7 +83,7 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">View project on GitHub</a>
- <a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap <small>(v2.0.3)</small></a>
+ <a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap <small>(v2.0.4)</small></a>
</p>
</div>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 41a89e07a3..f4806183ef 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -6,7 +6,7 @@
<p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p>
<p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
- <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap <small>(v2.0.3)</small>{{/i}}</a>
+ <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap <small>(v2.0.4)</small>{{/i}}</a>
</p>
</div>
--
GitLab
From 1dbf4c92ce4937a62db93094dd449982cb8c9639 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 17 May 2012 21:45:45 -0700
Subject: [PATCH 38/42] manually resolve #3516: type in less docs
---
docs/less.html | 2 +-
docs/templates/pages/less.mustache | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/less.html b/docs/less.html
index aff16044f9..41f62ee209 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -818,7 +818,7 @@
<tr>
<td><code>#grid > .fluid()</code></td>
<td><code>@fluidGridColumnWidth, @fluidGridGutterWidth</code></td>
- <td>Generate a precent grid system with <em>n</em> columns and <em>x</em> % wide gutter</td>
+ <td>Generate a percent grid system with <em>n</em> columns and <em>x</em> % wide gutter</td>
</tr>
<tr>
<td><code>#grid > .input()</code></td>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index a83a28ceda..c9a00eadc8 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -741,7 +741,7 @@
<tr>
<td><code>#grid > .fluid()</code></td>
<td><code>@fluidGridColumnWidth, @fluidGridGutterWidth</code></td>
- <td>{{_i}}Generate a precent grid system with <em>n</em> columns and <em>x</em> % wide gutter{{/i}}</td>
+ <td>{{_i}}Generate a percent grid system with <em>n</em> columns and <em>x</em> % wide gutter{{/i}}</td>
</tr>
<tr>
<td><code>#grid > .input()</code></td>
--
GitLab
From e5187e12c445fbba269c5a99f47ec2673e52969b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 17 May 2012 21:48:13 -0700
Subject: [PATCH 39/42] fix modal example per #3510
---
docs/javascript.html | 4 ++--
docs/templates/pages/javascript.mustache | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/javascript.html b/docs/javascript.html
index 0208af819d..c910a5ce5d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -277,7 +277,7 @@
</pre>
<pre class="prettyprint linenums">
-<div class="modal" id="myModal">
+<div class="modal hide" id="myModal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
@@ -286,7 +286,7 @@
<p>One fine body…</p>
</div>
<div class="modal-footer">
- <a href="#" class="btn">Close</a>
+ <a href="#" class="btn" data-dismiss="modal">Close</a>
<a href="#" class="btn btn-primary">Save changes</a>
</div>
</div>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index f5c6ce9107..ba3787561f 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -200,7 +200,7 @@
</pre>
<pre class="prettyprint linenums">
-<div class="modal" id="myModal">
+<div class="modal hide" id="myModal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
@@ -209,7 +209,7 @@
<p>{{_i}}One fine body…{{/i}}</p>
</div>
<div class="modal-footer">
- <a href="#" class="btn">{{_i}}Close{{/i}}</a>
+ <a href="#" class="btn" data-dismiss="modal">{{_i}}Close{{/i}}</a>
<a href="#" class="btn btn-primary">{{_i}}Save changes{{/i}}</a>
</div>
</div>
--
GitLab
From 78790da03c2f18912215c6dc4c19d88e636c31dd Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 17 May 2012 22:00:49 -0700
Subject: [PATCH 40/42] fix resizing issues from incorrectly changing <767px
grid classes to inline-block, fix height issue on textareas
---
docs/assets/css/bootstrap-responsive.css | 6 +++++-
docs/assets/css/bootstrap.css | 4 ++++
less/forms.less | 4 ++++
less/responsive-767px-max.less | 6 +++++-
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 9f32f08085..a5d9ff4267 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -169,11 +169,15 @@
}
[class*="span"],
.row-fluid [class*="span"] {
- display: inline-block;
+ display: block;
float: none;
width: auto;
margin-left: 0;
}
+ .row-fluid .input-prepend [class*="span"],
+ .row-fluid .input-append [class*="span"] {
+ display: inline-block;
+ }
.input-large,
.input-xlarge,
.input-xxlarge,
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 42d1907d69..549c4d37e1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -802,6 +802,10 @@ textarea {
width: 210px;
}
+textarea {
+ height: auto;
+}
+
textarea,
input[type="text"],
input[type="password"],
diff --git a/less/forms.less b/less/forms.less
index 606446638e..582bb413ba 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -94,6 +94,10 @@ input,
textarea {
width: 210px;
}
+// Reset height since textareas have rows
+textarea {
+ height: auto;
+}
// Everything else
textarea,
input[type="text"],
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index e35e45d892..fc422d3a25 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -120,10 +120,14 @@
[class*="span"],
.row-fluid [class*="span"] {
float: none;
- display: inline-block;
+ display: block;
width: auto;
margin-left: 0;
}
+ .row-fluid .input-prepend [class*="span"],
+ .row-fluid .input-append [class*="span"] {
+ display: inline-block;
+ }
// FORM FIELDS
// -----------
--
GitLab
From e388a5e475867cd266d58caf83b614aafe06cc10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Borgesen?= <joergen.borgesen@gmail.com>
Date: Sun, 20 May 2012 19:59:53 +0200
Subject: [PATCH 41/42] Added unit test to check that tooltips is not showed
when leave event is triggered before show delay has expired AND the hide
delay is set to 0
---
js/bootstrap-tooltip.js | 1 -
js/tests/unit/bootstrap-tooltip.js | 21 ++++++++++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 4c2a2a328d..6ff2b47086 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -87,7 +87,6 @@
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
- clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index 63f4f0b07c..c25093420d 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -78,6 +78,25 @@ $(function () {
}, 100)
})
+ test("should not show tooltip if leave event occurs before delay expires, even if hide delay is 0", function () {
+ var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+ .appendTo('#qunit-fixture')
+ .tooltip({ delay: { show: 200, hide: 0} })
+
+ stop()
+
+ tooltip.trigger('mouseenter')
+
+ setTimeout(function () {
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+ tooltip.trigger('mouseout')
+ setTimeout(function () {
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+ start()
+ }, 200)
+ }, 100)
+ })
+
test("should not show tooltip if leave event occurs before delay expires", function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture')
@@ -133,4 +152,4 @@ $(function () {
ok($.fn.tooltip.Constructor.prototype.isHTML($('<div></div>')), 'correctly detected html')
})
-})
\ No newline at end of file
+})
--
GitLab
From 8dda83906d72ade81ecf9b21d55b5a2922589d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Borgesen?= <joergen.borgesen@gmail.com>
Date: Sun, 20 May 2012 20:10:21 +0200
Subject: [PATCH 42/42] Swapped out .hasClass() with .is() when checking for
multiple classes
---
js/tests/unit/bootstrap-tooltip.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index c25093420d..63a42b0d4d 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -33,7 +33,7 @@ $(function () {
.tooltip({placement: 'bottom'})
.tooltip('show')
- ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
+ ok($(".tooltip").is('.fade.bottom.in'), 'has correct classes applied')
tooltip.tooltip('hide')
})
@@ -69,10 +69,10 @@ $(function () {
tooltip.trigger('mouseenter')
setTimeout(function () {
- ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
tooltip.trigger('mouseout')
setTimeout(function () {
- ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
start()
}, 200)
}, 100)
@@ -104,10 +104,10 @@ $(function () {
stop()
tooltip.trigger('mouseenter')
setTimeout(function () {
- ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
tooltip.trigger('mouseout')
setTimeout(function () {
- ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
start()
}, 100)
}, 50)
@@ -120,9 +120,9 @@ $(function () {
stop()
tooltip.trigger('mouseenter')
setTimeout(function () {
- ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
setTimeout(function () {
- ok(!$(".tooltip").hasClass('fade in'), 'tooltip has faded in')
+ ok(!$(".tooltip").is('.fade.in'), 'tooltip has faded in')
start()
}, 200)
}, 100)
--
GitLab