From 6e9756ebb682dbb1ea9c9a75653838bd130a9cb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:30:56 -0700 Subject: #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(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 09e2833dc..f13cad826 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 3fecd1ade..781bd2fb7 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 7698dd290..0532b2f9c 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}}

-- cgit v1.2.3 From c204bc66d693b1dece2d69384431ae7a4e88b80f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:33:35 -0700 Subject: #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(-) (limited to 'docs') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index caffa6af6..e88656dbb 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 13c777a26..2db9e9d3d 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) { ... }
-- cgit v1.2.3 From 59ec4c7154984bd2847ff434fae7874f0b8e5265 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:40:49 -0700 Subject: 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 7f669d573..4791a686f 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; -- cgit v1.2.3 From b6b354ceaa1b29650b2b131bf436d64b70f5f344 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Apr 2012 15:42:55 -0700 Subject: #3255: typo in components for tabbable tabs --- docs/components.html | 2 +- docs/templates/pages/components.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 1678e58aa..4ce4abdb1 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 8e81a95df..c6a78d2cc 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>
-- 
cgit v1.2.3


From ef368f0076523a8d0cd6b411549d7e9af9d1cf98 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Apr 2012 15:43:47 -0700
Subject: #3263: typo in forms docs

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5c55e0432..d1197820e 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 3524ac985..b91b7d349 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1195,7 +1195,7 @@
               
               
             
           
-- 
cgit v1.2.3


From 526d77af6188427e1ed6cc3ec280e08e986379ac Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 13 May 2012 11:10:08 -0700
Subject: remove wrapping