From 76e42edb29301be6d2f1014bbd64939d3f6f39a4 Mon Sep 17 00:00:00 2001 From: Geoff Young Date: Sun, 9 Sep 2012 18:58:23 -0400 Subject: Updated sample markup to reflect live demo. --- docs/templates/pages/javascript.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 5f8883bdf..3c412a982 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -183,7 +183,7 @@ $('#myModal').on('show', function (e) { <a href="#myModal" role="button" class="btn" data-toggle="modal">{{_i}}Launch demo modal{{/i}}</a> <-- Modal --> -<div class="modal" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> +<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 id="myModalLabel">Modal header</h3> -- cgit v1.2.3 From 39791a8ea8445932cebab737087da8710255556a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Sep 2012 22:44:08 -0700 Subject: fixes #5059 manually: include media type in css getting started block --- 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 e9f86dc98..77e16d225 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -149,7 +149,7 @@ <head> <title>Bootstrap 101 Template</title> <!-- Bootstrap --> - <link href="css/bootstrap.min.css" rel="stylesheet"> + <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"> </head> <body> <h1>Hello, world!</h1> -- cgit v1.2.3 From 2c8eff0eecb92b7e1b585afe3b59bf907a3e3a78 Mon Sep 17 00:00:00 2001 From: Brian Campbell Date: Wed, 12 Sep 2012 14:10:03 -0600 Subject: Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. --- docs/templates/pages/components.mustache | 99 ++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 95ac1ce4c..e3f8474a5 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1402,6 +1402,105 @@
+

{{_i}}Sizes{{/i}}

+

{{_i}}Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.{{/i}}

+
+ + + + +
+
+<div class="pagination pagination-large">
+  <ul>
+    <li><a href="#">«</a></li>
+    <li><a href="#">1</a></li>
+    <li><a href="#">2</a></li>
+    <li><a href="#">3</a></li>
+    <li><a href="#">4</a></li>
+    <li><a href="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination">
+  <ul>
+    <li><a href="#">«</a></li>
+    <li><a href="#">1</a></li>
+    <li><a href="#">2</a></li>
+    <li><a href="#">3</a></li>
+    <li><a href="#">4</a></li>
+    <li><a href="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination pagination-small">
+  <ul>
+    <li><a href="#">«</a></li>
+    <li><a href="#">1</a></li>
+    <li><a href="#">2</a></li>
+    <li><a href="#">3</a></li>
+    <li><a href="#">4</a></li>
+    <li><a href="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination pagination-mini">
+  <ul>
+    <li><a href="#">«</a></li>
+    <li><a href="#">1</a></li>
+    <li><a href="#">2</a></li>
+    <li><a href="#">3</a></li>
+    <li><a href="#">4</a></li>
+    <li><a href="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+
+ + +
+ +

{{_i}}Options{{/i}}

{{_i}}Disabled and active states{{/i}}

-- cgit v1.2.3 From e1deba30aa6b894aa8228cc9bfcec8490df47873 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Sep 2012 16:22:52 -0700 Subject: fixes #5097: js docs typos --- docs/templates/pages/javascript.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 3c412a982..2cdb172db 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -49,7 +49,7 @@

{{_i}}That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:{{/i}} 

$('body').off('.data-api')
-

{{_i}}Alternatively, to target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:{{/i}}

+

{{_i}}Alternatively, to target a specific plugin, just include the plugin's name as a namespace along with the data-api namespace like this:{{/i}}

$('body').off('.alert.data-api')

{{_i}}Programmatic API{{/i}}

@@ -61,10 +61,10 @@ $("#myModal").modal() // initialized with defaults $("#myModal").modal({ keyboard: false }) // initialized with no keyboard $("#myModal").modal('show') // initializes and invokes show immediately

-

{{_i}}Each plugin also exposes it's raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').{{/i}}

+

{{_i}}Each plugin also exposes its raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').{{/i}}

{{_i}}Events{{/i}}

-

{{_i}}Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and it's past participle form (ex. shown) is trigger on the completion of an action.{{/i}}

+

{{_i}}Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and its past participle form (ex. shown) is trigger on the completion of an action.{{/i}}

{{_i}}All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.{{/i}}

 $('#myModal').on('show', function (e) {
-- 
cgit v1.2.3


From 595e1a189c1911ada7c4bd4c769c28b1741611ac Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 13 Sep 2012 10:07:57 -0700
Subject: fixes #5119: javascript in navbar typo

---
 docs/templates/layout.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates')

diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index d463f441e..2f0e1e856 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -70,7 +70,7 @@
                 {{_i}}Components{{/i}}
               
               
  • 
-                {{_i}}Javascript{{/i}}
+                {{_i}}JavaScript{{/i}}
               
    • 
               
  • 
                 {{_i}}Customize{{/i}}
-- 
cgit v1.2.3


From 2ead9a5bc34608c982f06391a55fa82cbd856701 Mon Sep 17 00:00:00 2001
From: Martin Bean 
Date: Fri, 14 Sep 2012 14:06:15 +0100
Subject: Standardized spelling of 'JavaScript'; added icons to file trees

---
 docs/templates/pages/components.mustache      | 20 ++++++++---------
 docs/templates/pages/customize.mustache       |  2 +-
 docs/templates/pages/extend.mustache          | 26 +++++++++++-----------
 docs/templates/pages/getting-started.mustache | 32 +++++++++++++--------------
 docs/templates/pages/index.mustache           |  2 +-
 5 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 95ac1ce4c..412e62ec2 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -42,7 +42,7 @@
           
 
           
    {{_i}}Example{{/i}}
    
-          
    {{_i}}Toggleable, contextual menu for displaying lists of links. Made interactive with the dropdown javascript plugin.{{/i}}
    
+          
    {{_i}}Toggleable, contextual menu for displaying lists of links. Made interactive with the dropdown JavaScript plugin.{{/i}}
    
           
    
             
    
               
    
           
    {{! /example }}
 
-          
    {{_i}}Requires javascript{{/i}}
    
+          
    {{_i}}Requires JavaScript{{/i}}
    
           
    {{_i}}Button dropdowns require the Bootstrap dropdown plugin to function.{{/i}}
    
-          
    {{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}}
    
+          
    {{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom JavaScript.{{/i}}
    
 
 
           
    
@@ -616,7 +616,7 @@

    • {{_i}}Disabled state{{/i}}

    -

    {{_i}}For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless custom javascript is implemented to prevent those clicks.{{/i}}

    +

    {{_i}}For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.{{/i}}

    • {{_i}}Clickable link{{/i}}
      • @@ -675,7 +675,7 @@

      {{_i}}Dropdowns{{/i}}

      -

      {{_i}}Add dropdown menus with a little extra HTML and the dropdowns javascript plugin.{{/i}}

      +

      {{_i}}Add dropdown menus with a little extra HTML and the dropdowns JavaScript plugin.{{/i}}

      {{_i}}Tabs with dropdowns{{/i}}

      @@ -840,7 +840,7 @@

      {{_i}}To make tabs fade in, add .fade to each .tab-pane.{{/i}}

      {{_i}}Requires jQuery plugin{{/i}}

      -

      {{_i}}All tabbable tabs are powered by our lightweight jQuery plugin. Read more about how to bring tabbable tabs to life on the javascript docs page.{{/i}}

      +

      {{_i}}All tabbable tabs are powered by our lightweight jQuery plugin. Read more about how to bring tabbable tabs to life on the JavaScript docs page.{{/i}}

      {{_i}}Tabbable in any direction{{/i}}

      @@ -1086,7 +1086,7 @@

      {{_i}}Align nav links, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

      {{_i}}Using dropdowns{{/i}}

      -

      {{_i}}Add dropdowns and dropups to the nav with a bit of markup and the dropdowns javascript plugin.{{/i}}

      +

      {{_i}}Add dropdowns and dropups to the nav with a bit of markup and the dropdowns JavaScript plugin.{{/i}}

       <ul class="nav">
   <li class="dropdown">
@@ -1100,7 +1100,7 @@
   </li>
 </ul>
      -

      {{_i}}Visit the javascript dropdowns documentation for more markup and information on calling dropdowns.{{/i}}

      +

      {{_i}}Visit the JavaScript dropdowns documentation for more markup and information on calling dropdowns.{{/i}}

      {{_i}}Text{{/i}}

      {{_i}}Wrap strings of text in an element with .navbar-text, usually on a <p> tag for proper leading and color.{{/i}}

      @@ -1902,7 +1902,7 @@

      {{_i}}Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.{{/i}}

      <button type="button" class="close" data-dismiss="alert">×</button>
      -

      {{_i}}Dismiss alerts via javascript{{/i}}

      +

      {{_i}}Dismiss alerts via JavaScript{{/i}}

      {{_i}}Use the alerts jQuery plugin for quick and easy dismissal of alerts.{{/i}}

      diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 0e78f99fd..403d1bd45 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -3,7 +3,7 @@

      {{_i}}Customize and download{{/i}}

      -

      {{_i}}Download Bootstrap or customize variables, components, javascript plugins, and more.{{/i}}

      +

      {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

      diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache index a4332e62e..c1976427c 100644 --- a/docs/templates/pages/extend.mustache +++ b/docs/templates/pages/extend.mustache @@ -76,7 +76,7 @@ 
      $ lessc ./less/bootstrap.less > bootstrap.css

      {{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}

      -

      {{_i}}Javascript{{/i}}

      +

      {{_i}}JavaScript{{/i}}

      {{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}

       <link rel="stylesheet/less" href="/path/to/bootstrap.less">
@@ -109,18 +109,18 @@
 
           
      {{_i}}Setup file structure{{/i}}
      
           
      {{_i}}Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:{{/i}}
      
-
      -  app/
-  ├── layouts/
-  └── templates/
-  public/
-  ├── css/
-  │   ├── bootstrap.min.css
-  ├── js/
-  │   ├── bootstrap.min.js
-  └── img/
-      ├── glyphicons-halflings.png
-      └── glyphicons-halflings-white.png
+
      +   app/
+       layouts/
+       templates/
+   public/
+       css/
+           bootstrap.min.css
+       js/
+           bootstrap.min.js
+       img/
+           glyphicons-halflings.png
+           glyphicons-halflings-white.png
 
      
 
           
      {{_i}}Utilize starter template{{/i}}
      
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 77e16d225..7363806f7 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -59,18 +59,18 @@

      {{_i}}Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.{{/i}}

      {{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}

      -
      -  bootstrap/
-  ├── css/
-  │   ├── bootstrap.css
-  │   ├── bootstrap.min.css
-  ├── js/
-  │   ├── bootstrap.js
-  │   ├── bootstrap.min.js
-  ├── img/
-  │   ├── glyphicons-halflings.png
-  │   ├── glyphicons-halflings-white.png
-  └── README.md
+
      +   bootstrap/
+       css/
+           bootstrap.css
+           bootstrap.min.css
+       js/
+           bootstrap.js
+           bootstrap.min.js
+       img/
+           glyphicons-halflings.png
+           glyphicons-halflings-white.png
+       README.md
 
      
           
      {{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.{{/i}}
      
           
      {{_i}}Please note that all JavaScript plugins require jQuery to be included.{{/i}}
      
@@ -93,11 +93,11 @@
           
      {{_i}}Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.{{/i}}
      
           
      {{_i}}Components{{/i}}
      
           
      {{_i}}Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.{{/i}}
      
-          
      {{_i}}Javascript plugins{{/i}}
      
-          
      {{_i}}Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.{{/i}}
      
+          
      {{_i}}JavaScript plugins{{/i}}
      
+          
      {{_i}}Similar to Components, these JavaScript plugins are interactive components for things like tooltips, popovers, modals, and more.{{/i}}
      
 
           
      {{_i}}List of components{{/i}}
      
-          
      {{_i}}Together, the Components and Javascript plugins sections provide the following interface elements:{{/i}}
      
+          
      {{_i}}Together, the Components and JavaScript plugins sections provide the following interface elements:{{/i}}
      
           
        
             
      • {{_i}}Button groups{{/i}}
        • 
             
      • {{_i}}Button dropdowns{{/i}}
        • 
@@ -190,7 +190,7 @@
                 
               
               
        {{_i}}Starter template{{/i}}
        
-              
        {{_i}}A barebones HTML document with all the Bootstrap CSS and javascript included.{{/i}}
        
+              
        {{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}
        
             
           
      
         
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 10977cfd3..da12f106f 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -51,7 +51,7 @@
       
      
         
         
      {{_i}}Packed with features.{{/i}}
      
-        
      {{_i}}A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.{{/i}}
      
+        
      {{_i}}A 12-column responsive grid, dozens of components, JavaScript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.{{/i}}
    -- cgit v1.2.3 From faa760f563635c6b3f4f94246ff23ed7f49ae8fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 14 Sep 2012 10:30:55 -0700 Subject: revert docs change --- docs/templates/pages/getting-started.mustache | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 7363806f7..512801f2b 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -59,18 +59,17 @@

    {{_i}}Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.{{/i}}

    {{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}

    -
    -   bootstrap/
-       css/
-           bootstrap.css
-           bootstrap.min.css
-       js/
-           bootstrap.js
-           bootstrap.min.js
-       img/
-           glyphicons-halflings.png
-           glyphicons-halflings-white.png
-       README.md
+
    +  bootstrap/
+  ├── css/
+  │   ├── bootstrap.css
+  │   ├── bootstrap.min.css
+  ├── js/
+  │   ├── bootstrap.js
+  │   ├── bootstrap.min.js
+  └── img/
+      ├── glyphicons-halflings.png
+      └── glyphicons-halflings-white.png
 
    
           
    {{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.{{/i}}
    
           
    {{_i}}Please note that all JavaScript plugins require jQuery to be included.{{/i}}
    
-- 
cgit v1.2.3


From 5aa10184968ac70b7d0d809d370623866252a663 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 14 Sep 2012 14:31:14 -0700
Subject: i18n homepage

---
 docs/templates/pages/index.mustache | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index da12f106f..f8fe1bd53 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -1,12 +1,12 @@
 
    
   
    
-    
    Bootstrap
    
-    
    Sleek, intuitive, and powerful front-end framework for faster and easier web development.
    
+    
    {{_i}}Bootstrap{{/i}}
    
+    
    {{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}
    
     
    {{_i}}Download Bootstrap{{/i}}
    
     
   
    
 
    
-- 
cgit v1.2.3


From e4e2e37c5c713944df61dd807bedb2febca31c13 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 14 Sep 2012 14:48:03 -0700
Subject: add in some more examples (will work em in later), removed fleetio
 per their request, and added gather content to replace it

---
 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 f8fe1bd53..ddd296299 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -72,8 +72,8 @@
           
         
         
  • 
-          
-            Fleetio
+          
+            Gather Content
           
         
    • 
         
  • 
-- 
cgit v1.2.3


From 6c4b276cd4ca648db0afcd84aba809a74fa23bda Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 14 Sep 2012 15:55:46 -0700
Subject: way cooler carousel example, along with updated screenshots for
 examples

---
 docs/templates/pages/getting-started.mustache | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 512801f2b..0eecd6247 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -191,6 +191,29 @@
               
    {{_i}}Starter template{{/i}}
    
               
    {{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}
    
             
    • 
+
+            
  • 
+              
+                
+              
+              
    {{_i}}Narrow marketing{{/i}}
    
+              
    {{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}
    
+            
    • 
+            
  • 
+              
+                
+              
+              
    {{_i}}Sign in{{/i}}
    
+              
    {{_i}}Barebones sign in form with custom, larger form controls and a flexible layout.{{/i}}
    
+            
    • 
+            
  • 
+              
+                
+              
+              
    {{_i}}Carousel jumbotron{{/i}}
    
+              
    {{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}
    
+            
    • 
+
           
         
 
-- 
cgit v1.2.3


From caa79ed594daae704793a08e94a6e2d9da32eaf1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 17 Sep 2012 16:26:51 -0700
Subject: fixes #5001: proper ids on form examples

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

(limited to 'docs/templates')

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index cc83e0d73..ed9d9827b 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1339,9 +1339,9 @@
               
             
             
    
-              
+              
               
    
-                
+                
                 {{_i}}Username is taken{{/i}}
               
    
             
    
-- 
cgit v1.2.3


From 143fef9f95daca088c1a910fccd07f2b520d8b0b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 17 Sep 2012 18:15:39 -0700
Subject: overhaul the docs and css to merge into 2.1.2 since this was against
 master

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

(limited to 'docs/templates')

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 53936e5d0..8c3ab8171 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -27,6 +27,7 @@
           
  •  {{_i}}Thumbnails{{/i}}
    • 
           
  •  {{_i}}Alerts{{/i}}
    • 
           
  •  {{_i}}Progress bars{{/i}}
    • 
+          
  •  {{_i}}Media object{{/i}}
    • 
           
  •  {{_i}}Misc{{/i}}
    • 
         
       
@@ -1856,6 +1857,7 @@
 
 
 
+
         
         
    
@@ -1958,6 +1960,7 @@
 
 
 
+
         
         
    
@@ -2104,6 +2107,144 @@
 
 
 
+        
+        
    
+          
    
+            
    {{_i}}Media object{{/i}}
    
+          
    
+          
    {{_i}}Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.{{/i}}
    
+
+          
    {{_i}}Default example{{/i}}
    
+          
    {{_i}}The default media allow to float a media object (images, video, audio) to the left or right of a content block.{{/i}}
    
+          
    
+            
    
+              
+                
+              
+              
    
+                
    {{_i}}Media heading{{/i}}
    
+                Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
+              
    
+            
    
+            
    
+              
+                
+              
+              
    
+                
    {{_i}}Media heading{{/i}}
    
+                Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
+                
    
+                  
+                    
+                  
+                  
    
+                    
    {{_i}}Media heading{{/i}}
    
+                    Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
+                  
    
+                
    
+              
    
+            
    
+          
    {{! /.bs-docs-example }}
+
    +<div class="media">
+  <a class="pull-left" href="#">
+    <img class="media-object" src="http://placehold.it/64x64">
+  </a>
+  <div class="media-body">
+    <h4 class="media-heading">{{_i}}Media heading{{/i}}</h4>
+    ...
+
+    <!-- Nested media object -->
+    <div class="media">
+      ...
+    </div>
+  </div>
+</div>
+
    
+
+
+          
    
+
+
+          
    {{_i}}Media list{{/i}}
    
+          
    {{_i}}With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).{{/i}}
    
+          
    
+            
      
+              
    • 
+                
+                  
+                
+                
      
+                  
      {{_i}}Media heading{{/i}}
      
+                  
      Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
      
+                  
+                  
      
+                    
+                      
+                    
+                    
      
+                      
      {{_i}}Nested media heading{{/i}}
      
+                      Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
+                      
+                      
      
+                        
+                          
+                        
+                        
      
+                          
      {{_i}}Nested media heading{{/i}}
      
+                          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
+                        
      
+                      
      
+                    
      
+                  
      
+                  
+                  
      
+                    
+                      
+                    
+                    
      
+                      
      {{_i}}Nested media heading{{/i}}
      
+                      Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
+                    
      
+                  
      
+                
      
+              
      • 
+              
    • 
+                
+                  
+                
+                
      
+                  
      {{_i}}Media heading{{/i}}
      
+                  Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
+                
      
+              
      • 
+            
    
+          
    
+
    +<ul class="media-list">
+  <li class="media">
+    <a class="pull-left" href="#">
+      <img class="media-object" src="http://placehold.it/64x64">
+    </a>
+    <div class="media-body">
+      <h4 class="media-heading">{{_i}}Media heading{{/i}}</h4>
+      ...
+
+      <!-- Nested media object -->
+      <div class="media">
+        ...
+     </div>
+    </div>
+  </li>
+</ul>
+
    
+
+
    
+
+
+
+
 
         
-- 
cgit v1.2.3


From 783f4885ab984acecfcb2a2986158aaa8933ea2d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 17 Sep 2012 18:17:22 -0700
Subject: add the media css to customizer

---
 docs/templates/pages/customize.mustache | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index 403d1bd45..1f35ab7a1 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -72,6 +72,7 @@
               
               
    
                 
    {{_i}}Miscellaneous{{/i}}
    
+                
                 
                 
                 
-- 
cgit v1.2.3


From cedb3c7c56887d4ca42296ee193f2ff08dfe9ac4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 17 Sep 2012 23:03:18 -0700
Subject: fixes #5173: proper popover offsets; added docs examples to enable
 tests in the future

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

(limited to 'docs/templates')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 2cdb172db..b707ebe20 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -855,6 +855,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           {{_i}}Click to toggle popover{{/i}}
         
    
 
+        
    {{_i}}Four directions{{/i}}
    
+        
    
+          
+        
    {{! /example }}
+
 
         
    
 
-- 
cgit v1.2.3


From 2769241aeb5e9eba4a34ddbd9d495f7f8271e360 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 18 Sep 2012 20:56:20 -0700
Subject: add new vars for common font-sizes and paddings with large, small,
 and mini components; resize pagination and buttons to better match each other

---
 docs/templates/pages/components.mustache | 114 ++++++++++---------------------
 1 file changed, 35 insertions(+), 79 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index c674863f2..67fbf5535 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1403,21 +1403,47 @@
           
    
 
 
-          
    {{_i}}Sizes{{/i}}
    
-          
    {{_i}}Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.{{/i}}
    
+          
    {{_i}}Options{{/i}}
    
+
+          
    {{_i}}Disabled and active states{{/i}}
    
+          
    {{_i}}Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.{{/i}}
    
           
    
-