From ab178060be19a60f52dc548d4cfd505c1e30ace5 Mon Sep 17 00:00:00 2001 From: Allen Bargi Date: Thu, 26 Apr 2012 17:38:47 +0300 Subject: [PATCH 01/61] 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%; From ec56940c511df165784a2a203be8e05644661c46 Mon Sep 17 00:00:00 2001 From: Anirvan Chatterjee Date: Fri, 27 Apr 2012 10:48:59 -0700 Subject: [PATCH 02/61] 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" From ad46b0980caf9a943ca213ce240083f7a65ac993 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:06:26 -0700 Subject: [PATCH 03/61] 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 @@ +

Fixed row with inputs

+

Inputs should not extend past the light red background, set on their parent, a .span* column.

+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+

Fluid row with inputs

Inputs should not extend past the light red background, set on their parent, a .span* column.

From 6e9756ebb682dbb1ea9c9a75653838bd130a9cb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:30:56 -0700 Subject: [PATCH 04/61] #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 @@

Node with makefile

-

Install the LESS command line compiler and uglify-js globally with npm by running the following command:

- 
$ npm install -g less uglify-js
+

Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:

+ 
$ npm install -g less jshint recess uglify-js

Once installed just run make from the root of your bootstrap directory and you're all set.

Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

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 @@

{{_i}}Node with makefile{{/i}}

-

{{_i}}Install the LESS command line compiler and uglify-js globally with npm by running the following command:{{/i}}

- 
$ npm install -g less uglify-js
+

{{_i}}Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:{{/i}}

+ 
$ npm install -g less jshint recess uglify-js

{{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}

{{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}

From c204bc66d693b1dece2d69384431ae7a4e88b80f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:33:35 -0700 Subject: [PATCH 05/61] #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 @@ 
-  // 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) { ... }
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 @@ 
-  // {{_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) { ... }
From 59ec4c7154984bd2847ff434fae7874f0b8e5265 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:40:49 -0700 Subject: [PATCH 06/61] 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; } From b6b354ceaa1b29650b2b131bf436d64b70f5f344 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:42:55 -0700 Subject: [PATCH 07/61] #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 @@

Straightforward markup

Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.

-<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 @@
       
{{_i}}Straightforward markup{{/i}}

       
{{_i}}Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.{{/i}}

 
-<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>

From ef368f0076523a8d0cd6b411549d7e9af9d1cf98 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Apr 2012 15:43:47 -0700
Subject: [PATCH 08/61] #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.
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 @@ From 5ffb6d670683a32ec2a31c8550ea2669bfac7559 Mon Sep 17 00:00:00 2001 From: Synchro Date: Tue, 1 May 2012 17:01:26 +0200 Subject: [PATCH 09/61] 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; From dcc89e7400ae9e7575ea2671d27b514db9beaf3f Mon Sep 17 00:00:00 2001 From: Synchro Date: Tue, 1 May 2012 17:06:19 +0200 Subject: [PATCH 10/61] 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 From ca369c4b2af2a94acea00cd228d87a30fe5d2886 Mon Sep 17 00:00:00 2001 From: Synchro Date: Tue, 1 May 2012 17:54:53 +0200 Subject: [PATCH 11/61] 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; } From 20eae67147da15a75250a09f0932c0f3f2198b2b Mon Sep 17 00:00:00 2001 From: Milos Gavrilovic Date: Thu, 10 May 2012 12:25:22 +0300 Subject: [PATCH 12/61] 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(); From 526d77af6188427e1ed6cc3ec280e08e986379ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 May 2012 11:10:08 -0700 Subject: [PATCH 13/61] remove wrapping