From 00d6f26270485cde0fb8474b76396eb81cd97eff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 31 Aug 2012 23:12:02 -0700 Subject: fixes #4896: reflect media query order in docs --- docs/templates/pages/scaffolding.mustache | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 3fb7841b1..f32581faa 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -345,14 +345,16 @@ - {{_i}}Phones{{/i}} - 480px and below - {{_i}}Fluid columns, no fixed widths{{/i}} + {{_i}}Large display{{/i}} + 1200px and up + 70px + 30px - {{_i}}Phones to tablets{{/i}} - 767px and below - {{_i}}Fluid columns, no fixed widths{{/i}} + {{_i}}Default{{/i}} + 980px and up + 60px + 20px {{_i}}Portrait tablets{{/i}} @@ -361,31 +363,29 @@ 20px - {{_i}}Default{{/i}} - 980px and up - 60px - 20px + {{_i}}Phones to tablets{{/i}} + 767px and below + {{_i}}Fluid columns, no fixed widths{{/i}} - {{_i}}Large display{{/i}} - 1200px and up - 70px - 30px + {{_i}}Phones{{/i}} + 480px and below + {{_i}}Fluid columns, no fixed widths{{/i}} 
-/* {{_i}}Landscape phones and down{{/i}} */
-@media (max-width: 480px) { ... }
-
-/* {{_i}}Landscape phone to portrait tablet{{/i}} */
-@media (max-width: 767px) { ... }
+/* {{_i}}Large desktop{{/i}} */
+@media (min-width: 1200px) { ... }
 
 /* {{_i}}Portrait tablet to landscape and desktop{{/i}} */
 @media (min-width: 768px) and (max-width: 979px) { ... }
 
-/* {{_i}}Large desktop{{/i}} */
-@media (min-width: 1200px) { ... }
+/* {{_i}}Landscape phone to portrait tablet{{/i}} */
+@media (max-width: 767px) { ... }
+
+/* {{_i}}Landscape phones and down{{/i}} */
+@media (max-width: 480px) { ... }
-- cgit v1.2.3 From b1bdca0fdb1e14ede6904fe652746811d0e4c274 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 31 Aug 2012 23:25:58 -0700 Subject: fixes #4901: attribute typo and reran make --- docs/templates/pages/base-css.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 23f63228f..1a437f112 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -932,7 +932,7 @@

{{_i}}Textarea{{/i}}

-

{{_i}}Form control which supports multiple lines of text. Change row attribute as necessary.{{/i}}

+

{{_i}}Form control which supports multiple lines of text. Change rows attribute as necessary.{{/i}}

-- cgit v1.2.3 From e8c5b3c9a518c58d16558a711dcd4843b26548de Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 31 Aug 2012 23:51:48 -0700 Subject: fixes #4869: typo in getting started --- docs/templates/pages/getting-started.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index d8e6a811a..513124c27 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -33,7 +33,7 @@

{{_i}}1. Download{{/i}}

-

{{_i}}Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.{{/i}}

+

{{_i}}Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with the compiled Bootstrap files.{{/i}}

-- cgit v1.2.3 From 209852c805be35a8a59a1c71cf46e9048d1363d3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 1 Sep 2012 12:03:55 -0700 Subject: fixes #4902: proper accordion html example --- docs/templates/pages/javascript.mustache | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index ba762d56b..5f8883bdf 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1191,6 +1191,36 @@ $('#my-alert').bind('closed', function () {
{{! /example }} 
+<div class="accordion" id="accordion2">
+  <div class="accordion-group">
+    <div class="accordion-heading">
+      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+        {{_i}}Collapsible Group Item #1{{/i}}
+      </a>
+    </div>
+    <div id="collapseOne" class="accordion-body collapse in">
+      <div class="accordion-inner">
+        Anim pariatur cliche...
+      </div>
+    </div>
+  </div>
+  <div class="accordion-group">
+    <div class="accordion-heading">
+      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
+        {{_i}}Collapsible Group Item #2{{/i}}
+      </a>
+    </div>
+    <div id="collapseTwo" class="accordion-body collapse">
+      <div class="accordion-inner">
+        Anim pariatur cliche...
+      </div>
+    </div>
+  </div>
+</div>
+...
+
+

{{_i}}You can also use the plugin without the accordion markup. Make a button toggle the expanding and collapsing of another element.{{/i}}

+
 <button type="button" class="btn btn-danger" data-toggle="collapse" data-target="#demo">
   {{_i}}simple collapsible{{/i}}
 </button>
-- 
cgit v1.2.3


From 9d5f9eca85b9d413b4389b744bbf57c20c447c2b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 3 Sep 2012 00:47:48 -0700
Subject: fixes #4909: add color utility classes .text-warning, etc and
 document them

---
 docs/templates/pages/base-css.mustache | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 1a437f112..1fe63a609 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -88,14 +88,14 @@
 </p>
-

<strong>

+

{{_i}}Bold{{/i}}

{{_i}}For emphasizing a snippet of text with important{{/i}}

The following snippet of text is rendered as bold text.

<strong>rendered as bold text</strong>
-

<em>

+

{{_i}}Italics{{/i}}

{{_i}}For emphasizing a snippet of text with stress{{/i}}

The following snippet of text is rendered as italicized text.

@@ -104,6 +104,23 @@

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

+

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

+

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

+
+

Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.

+

Etiam porta sem malesuada magna mollis euismod.

+

Donec ullamcorper nulla non metus auctor fringilla.

+

Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis.

+

Duis mollis, est non commodo luctus, nisi erat porttitor ligula.

+
+
+<p class="muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
+<p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
+<p class="text-error">Donec ullamcorper nulla non metus auctor fringilla.</p>
+<p class="text-info">Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis.</p>
+<p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
+
+
-- cgit v1.2.3 From 1f0043a7f5285018a79e464503a60e0e3215aba9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Sep 2012 09:13:09 -0700 Subject: fixes #4959: docs example --- docs/templates/pages/base-css.mustache | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 1fe63a609..cc83e0d73 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1854,8 +1854,9 @@ <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label> <div class="controls"> <div class="input-prepend"> - <span class="add-on"><i class="icon-envelope"></i></span> - <input class="span2" id="inputIcon" type="text"> + <span class="add-on"><i class="icon-envelope"></i></span> + <input class="span2" id="inputIcon" type="text"> + </div> </div> </div> -- cgit v1.2.3 From 7e4629fbbec63bda9986023dd29879d2565e570e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Sep 2012 14:27:48 -0700 Subject: fixes #4968 manually: typo in scaffolding docs about offset classes --- docs/templates/pages/scaffolding.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index f32581faa..0d9c191e3 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -105,7 +105,7 @@

{{_i}}Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.{{/i}}

{{_i}}Offsetting columns{{/i}}

-

{{_i}}Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.{{/i}}

+

{{_i}}Move columns to the right using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.{{/i}}

4
-- cgit v1.2.3 From 08b8571cb842e9fc668d9faf6c305a51523b27fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 5 Sep 2012 10:00:57 -0700 Subject: version bump to get this started --- docs/templates/pages/index.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index f02b8d505..10977cfd3 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -2,11 +2,11 @@

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

-

{{_i}}Download Bootstrap{{/i}}

+

{{_i}}Download Bootstrap{{/i}}

-- cgit v1.2.3 From 138b5a8c0569e548ec93803aaa88ea7033363680 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Wed, 5 Sep 2012 23:07:52 -0300 Subject: Fix small documentatio typos. --- docs/templates/pages/getting-started.mustache | 2 +- docs/templates/pages/scaffolding.mustache | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 513124c27..e9f86dc98 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -128,7 +128,7 @@

{{_i}}4. Basic HTML template{{/i}}

-

{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.{{/i}}

+

{{_i}}With a brief intro into the contents out of the way, we can focus on putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.{{/i}}

{{_i}}Now, here's a look at a typical HTML file:{{/i}}

 <!DOCTYPE html>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 0d9c191e3..f87af3c90 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -130,7 +130,7 @@
           
{{_i}}To nest your content with the default grid, add a new .row and set of .span* columns within an existing .span* column. Nested rows should include a set of columns that add up to the number of columns of its parent.{{/i}}

           

             

-              {{_i}}Level 1 of column{{/i}}
+              {{_i}}Level 1 column{{/i}}
               

                 

                   {{_i}}Level 2{{/i}}
@@ -247,10 +247,10 @@
 
 <div class="row-fluid">
   <div class="span12">
-    {{_i}}Level 1 of column{{/i}}
+    {{_i}}Fluid 12{{/i}}
     <div class="row-fluid">
-      <div class="span6">{{_i}}Level 2{{/i}}</div>
-      <div class="span6">{{_i}}Level 2{{/i}}</div>
+      <div class="span6">{{_i}}Fluid 6{{/i}}</div>
+      <div class="span6">{{_i}}Fluid 6{{/i}}</div>
     </div>
   </div>
 </div>
-- 
cgit v1.2.3


From 61332d727e6e1d67def803b2f8d61047d79db0cc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 7 Sep 2012 11:34:05 -0700
Subject: fixes #5020: submenu support in dropup

---
 docs/templates/pages/components.mustache | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 53936e5d0..95ac1ce4c 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -111,6 +111,24 @@
                   
                 
               
+              

+                
+              

             

           
{{! /example }}
 
-- 
cgit v1.2.3