From d3873b0fc7818c12ec42a6fcfce344950c19fea5 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 14 Mar 2012 20:28:24 -0600 Subject: Typo Fixes for .mustache files Added the doc typo fixes to the .mustache files as well. --- docs/templates/pages/components.mustache | 4 ++-- docs/templates/pages/scaffolding.mustache | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 1a7f5b91a..b03e52e3e 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -964,7 +964,7 @@ -

{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

+

{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

{{_i}}Brand name{{/i}}

{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}

@@ -1440,7 +1440,7 @@
   

{{_i}}Page header{{/i}}

-

{{_i}}A simple shell for an h1 to appropratiely space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).{{/i}}

+

{{_i}}A simple shell for an h1 to appropriately space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).{{/i}}

{{_i}}Markup{{/i}}

- {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.{{/i}} + {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

{{_i}}Methods{{/i}}

$().popover({{_i}}options{{/i}})

-- cgit v1.2.3 From cfce34e3000b2c02549e3af280668afea61fa752 Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Thu, 22 Mar 2012 20:36:49 +0100 Subject: Add more examples for activating tabs Make naming of tab id consistent --- docs/templates/pages/javascript.mustache | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index b61a0d424..925377339 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -533,7 +533,7 @@ $('#myModal').on('hidden', function () {

{{_i}}Example tabs{{/i}}

{{_i}}Click the tabs below to toggle between hidden panes, even via dropdown menus.{{/i}}

-

{{_i}}Using bootstrap-tab.js{{/i}}

-

{{_i}}Enable tabbable tabs via javascript:{{/i}}

-
$('#myTab').tab('show')
-

{{_i}}You can select individual tabs in several ways:{{/i}}

+

{{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}

+
+$('#myTab a').click(function (e) {
+  e.preventDefault();
+  $(this).tab('show');
+})
+

{{_i}}You can activate individual tabs in several ways:{{/i}}

 $('#myTab a[href="#profile"]').tab('show'); //Select tab by name
 $('#myTab a:first').tab('show'); //Select first tab
-- 
cgit v1.2.3


From 0e73a0e94b70eab01ca0cafbec48a892531304af Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 22 Mar 2012 17:09:54 -0700
Subject: change spacing and fix code blocks

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

(limited to 'docs/templates')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c6d1f403c..01fcb9761 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -568,10 +568,10 @@ $('#myTab a').click(function (e) {
 })

{{_i}}You can activate individual tabs in several ways:{{/i}}

-$('#myTab a[href="#profile"]').tab('show'); //Select tab by name
-$('#myTab a:first').tab('show'); //Select first tab
-$('#myTab a:last').tab('show'); //Select last tab
-$('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
+$('#myTab a[href="#profile"]').tab('show'); // Select tab by name
+$('#myTab a:first').tab('show'); // Select first tab
+$('#myTab a:last').tab('show'); // Select last tab
+$('#myTab li:eq(2) a').tab('show'); // Select third tab (0-indexed)
 

{{_i}}Markup{{/i}}

{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.{{/i}}

@@ -585,7 +585,7 @@ $('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)

{{_i}}Methods{{/i}}

$().tab

- {{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}} + {{_i}}Activates a tab element and content container. Tab should have either a data-target or an href targeting a container node in the DOM.{{/i}}

 <ul class="nav nav-tabs" id="myTab">
@@ -604,7 +604,7 @@ $('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
 
 <script>
   $(function () {
-    $('#myTab a:last').tab('show')
+    $('#myTab a:last').tab('show');
   })
 </script>

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

-- cgit v1.2.3 From 89ea238c32716aabe59dcab7d4e2480858bbba91 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:13:20 -0700 Subject: move navbarBrandColor closer to link color --- docs/templates/pages/download.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index c7f6cfab8..b282db6c9 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -241,6 +241,8 @@ + + @@ -259,8 +261,6 @@ - -

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

-- cgit v1.2.3 From e0c85fb69cfc4a9956856e0b14afb12def2fccf0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:18:07 -0700 Subject: use new font-stack mixins in base and alt font family mixins --- docs/templates/pages/download.mustache | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index d7cc9e9f7..e5564a1f2 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -200,14 +200,20 @@

{{_i}}Typography{{/i}}

+ + + + + + - + - + @@ -220,12 +226,6 @@ - - - - - -

{{_i}}Tables{{/i}}

-- cgit v1.2.3 From 42f636032cf8ce66a61ef1fbdcac60b1d498aaf5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:22:19 -0700 Subject: fix #2716, incorrect required markup for navbar search form --- docs/templates/pages/components.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index a3aabe966..3ca43a206 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -979,7 +979,7 @@ <input type="text" class="span2"> </form>
-

{{_i}}For a more customized search form, add the .navbar-search class to receive specialized styles in the navbar.{{/i}}

+

{{_i}}For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.{{/i}}

 <form class="navbar-search pull-left">
   <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
-- 
cgit v1.2.3


From 1a6a1828bf92aec044387ff7020a1f77abcd6730 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 22 Mar 2012 17:23:20 -0700
Subject: remove mention of siteWidth, no longer used

---
 docs/templates/pages/scaffolding.mustache | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 2d6d54c4c..b64c63af3 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -298,11 +298,6 @@
         20px
         {{_i}}Negative space between columns{{/i}}
       
-      
-        @siteWidth
-        {{_i}}Computed sum of all columns and gutters{{/i}}
-        {{_i}}Counts number of columns and gutters to set width of the .container-fixed() mixin{{/i}}
-      
     
   
   
@@ -551,7 +546,7 @@
- +
-- cgit v1.2.3 From b7b84c7a0dfaad5134258b5a50e8d42bd0656b81 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:36:32 -0700 Subject: remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append --- docs/templates/pages/base-css.mustache | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9b2964d74..b463462bc 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1563,8 +1563,7 @@
- - +
-- cgit v1.2.3 From 254bb40f006ebe0c546a9840bd3cae51047e3628 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:49:13 -0700 Subject: remove mentions of unused button variable per #2537 --- docs/templates/pages/less.mustache | 78 +++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 23a4486a1..00130550a 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -214,10 +214,86 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@primaryButtonBackground@btnBackground@white
@btnBackgroundHighlightdarken(@white, 10%)
@btnBorderdarken(@white, 20%)
@btnPrimaryBackground @linkColor
@btnPrimaryBackgroundHighlightspin(@btnPrimaryBackground, 15%)
@btnInfoBackground#5bc0de
@btnInfoBackgroundHighlight#2f96b4
@btnSuccessBackground#62c462
@btnSuccessBackgroundHighlight51a351
@btnWarningBackgroundlighten(@orange, 15%)
@btnWarningBackgroundHighlight@orange
@btnDangerBackground#ee5f5b
@btnDangerBackgroundHighlight#bd362f
@btnInverseBackground@gray
@btnInverseBackgroundHighlight@grayDarker

{{_i}}Forms{{/i}}

-- cgit v1.2.3 From b011daf67fbb3cde6c33b40a0347d7e1a8d183ad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 19:36:55 -0700 Subject: finish adding remaining component variables to less docs page --- docs/templates/pages/less.mustache | 225 +++++++++++++++++++++++++++++++------ 1 file changed, 193 insertions(+), 32 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 00130550a..129c76e9c 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -63,12 +63,24 @@
-

{{_i}}Hyperlinks{{/i}}

+

{{_i}}Scaffolding and links{{/i}}

- - + + + + + + + + + + + + + + @@ -108,18 +120,69 @@

{{_i}}Typography{{/i}}

@linkColor#08c@bodyBackground@white{{_i}}Page background color{{/i}}
@textColor@grayDark{{_i}}Default text color for entire body, headings, and more{{/i}}
@linkColor#08c {{_i}}Default link text color{{/i}}
+ + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + +
@sansFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@serifFontFamilyGeorgia, "Times New Roman", Times, serif
@monoFontFamilyMenlo, Monaco, "Courier New", monospace
@baseFontSize 13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif@sansFontFamily
@baseLineHeight 18px
@altFontFamily@serifFontFamily
@headingsFontFamilyinherit
@headingsFontWeightbold
@headingsColorinherit
+

{{_i}}Tables{{/i}}

+ + + + + + + + + + + + + + + + + +
@tableBackgroundtransparent
@tableBackgroundAccent#f9f9f9
@tableBackgroundHover#f5f5f5
@tableBorderddd
@@ -302,10 +365,68 @@ @placeholderText @grayLight - + + + @inputBackground + @white + + + @inputBorder + #ccc + + + @inputDisabledBackground + @grayLighter +

{{_i}}Form states and alerts{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@warningText#c09853
@warningBackground#f3edd2
@errorText#b94a48
@errorBackground#f2dede
@successText#468847
@successBackground#dff0d8
@infoText#3a87ad
@infoBackground#d9edf7
+
+

{{_i}}Navbar{{/i}}

@@ -324,6 +445,7 @@ + @@ -339,52 +461,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@grayDark
@navbarText @grayLight@white
@navbarLinkColorActive@navbarLinkColorHover
@navbarLinkBackgroundHovertransparent
@navbarLinkBackgroundActive@navbarBackground
@navbarSearchBackgroundlighten(@navbarBackground, 25%)
@navbarSearchBackgroundFocus@white
@navbarSearchBorderdarken(@navbarSearchBackground, 30%)
@navbarSearchPlaceholderColor#ccc
@navbarBrandColor@navbarLinkColor
-
-
-

{{_i}}Form states and alerts{{/i}}

+

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

- - - + + - - - + + - - - + + - - - + + - - - + + + +
@warningText#c09853@dropdownBackground@white
@warningBackground#f3edd2@dropdownBorderrgba(0,0,0,.2)
@errorText#b94a48@dropdownLinkColor@grayDark
@errorBackground#f2dede@dropdownLinkColorHover@white
@successText#468847@dropdownLinkBackgroundHover@linkColor
+

{{_i}}Hero unit{{/i}}

+ + - - - + + + - - - + + + - - - + + +
@successBackground#dff0d8@heroUnitBackground@grayLighter
@infoText#3a87ad@heroUnitHeadingColorinherit
@infoBackground#d9edf7@heroUnitLeadColorinhereit
-- cgit v1.2.3 From 1852d077bfa15308808c470a031f6e6b5c3dc8d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:08:41 -0700 Subject: add shell of tests page, lighten form actions background and give it a variable --- docs/templates/pages/css-tests.mustache | 6 ++++++ docs/templates/pages/less.mustache | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 docs/templates/pages/css-tests.mustache (limited to 'docs/templates') diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache new file mode 100644 index 000000000..6455039c4 --- /dev/null +++ b/docs/templates/pages/css-tests.mustache @@ -0,0 +1,6 @@ + +
+

{{_i}}Tests{{/i}}

+

{{_i}}{{/i}}

+
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 129c76e9c..263ec7fce 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -378,6 +378,10 @@ @inputDisabledBackground @grayLighter + + @formActionsBackground + #f5f5f5 +

{{_i}}Form states and alerts{{/i}}

-- cgit v1.2.3 From dbadac183df8efff4307b2c28daac8414165feaa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:09:27 -0700 Subject: add new @formActionsBackground to customize page --- docs/templates/pages/download.mustache | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index e5564a1f2..dfc96fdc3 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -290,6 +290,8 @@ + + -- cgit v1.2.3 From bdf8a6966be7d2b2e62ea1860501fbdf59ef671d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:17:55 -0700 Subject: remove labels and badges from customizer and replace with single file --- docs/templates/pages/download.mustache | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index dfc96fdc3..cec420f3e 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -31,8 +31,7 @@

{{_i}}Base CSS{{/i}}

- - + -- cgit v1.2.3 From ab068f6fda525236220af6e1bf879a677ed6bfc0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:33:06 -0700 Subject: bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization --- docs/templates/pages/download.mustache | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index cec420f3e..051291148 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -66,7 +66,11 @@

{{_i}}Responsive{{/i}}

- + + + + +
-- cgit v1.2.3 From ac64d9405b3f650704f2e63b52c26b9f6f792cb8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 23:09:31 -0700 Subject: Dropdowns overhaul: 1. Removed broken and unused dropup examples from the navs/pills docs 2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified 3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button 4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less. 5. Annnnnnnnnd I think that's it. --- docs/templates/pages/components.mustache | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 3ca43a206..25741608b 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -563,16 +563,6 @@
  • {{_i}}Separated link{{/i}}
  • -
     <ul class="nav nav-tabs">
    @@ -605,16 +595,6 @@
                 
  • {{_i}}Separated link{{/i}}
  • -
     <ul class="nav nav-pills">
    -- 
    cgit v1.2.3
    
    
    From e84161076b6c54be4ab0950f5d91c23456a967a7 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 23 Mar 2012 00:58:41 -0700
    Subject: add mention of transitions plugin requirement on collapse
    
    ---
     docs/templates/pages/javascript.mustache | 3 ++-
     1 file changed, 2 insertions(+), 1 deletion(-)
    
    (limited to 'docs/templates')
    
    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
    index 01fcb9761..06816c7ad 100644
    --- a/docs/templates/pages/javascript.mustache
    +++ b/docs/templates/pages/javascript.mustache
    @@ -1036,7 +1036,8 @@ $('#my-alert').bind('closed', function () {
               

    {{_i}}About{{/i}}

    {{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

    {{_i}}Download file{{/i}} - +

    * {{_i}}Requires the Transitions plugin to be included.{{/i}}

    +

    {{_i}}Example accordion{{/i}}

    {{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}

    -- cgit v1.2.3 From 622b8fa3f0d54e1c356fbe76d7bdc407919ff840 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 01:13:20 -0700 Subject: adding blog link to docs homepage --- docs/templates/pages/index.mustache | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 9d8253df1..bef11b810 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -14,6 +14,7 @@ -- cgit v1.2.3 From de7aee246591f0be9ee58079175b42af7f5a6947 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 01:28:04 -0700 Subject: fix broken tables with double borders and such, add css tests page to start with table edge cases --- docs/templates/pages/css-tests.mustache | 184 +++++++++++++++++++++++++++++++- 1 file changed, 182 insertions(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache index 6455039c4..cde7484dc 100644 --- a/docs/templates/pages/css-tests.mustache +++ b/docs/templates/pages/css-tests.mustache @@ -1,6 +1,186 @@ + +
    -

    {{_i}}Tests{{/i}}

    -

    {{_i}}{{/i}}

    +

    {{_i}}CSS Tests{{/i}}

    +

    {{_i}}One stop shop for quick debugging and edge-case tests of CSS.{{/i}}

    + + + +
    +
    +

    Bordered without thead

    + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    +

    Bordered without thead, with caption

    + + + + + + + + + + + + + + + + + + + +
    Table caption
    123
    123
    123
    +

    Bordered without thead, with colgroup

    + + + + + + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    +

    Bordered with thead, with colgroup

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    123
    +
    +
    +

    Bordered with thead and caption

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Table caption
    123
    123
    123
    123
    +

    Bordered with rowspan and colspan

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    123
    1 and 23
    123
    13
    2 and 3
    +
    +
    -- cgit v1.2.3 From 5179df1928e82670a2f16ce414a42f1008c6d652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 01:31:22 -0700 Subject: css tests cleanup --- docs/templates/pages/css-tests.mustache | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache index cde7484dc..6f460569d 100644 --- a/docs/templates/pages/css-tests.mustache +++ b/docs/templates/pages/css-tests.mustache @@ -1,16 +1,23 @@
    @@ -27,6 +32,11 @@

    {{_i}}One stop shop for quick debugging and edge-case tests of CSS.{{/i}}

    + + + + @@ -191,3 +201,49 @@
    + + + + + + + +
    +
    +

    Prepend and append on inputs

    +
    +
    +
    + @ +
    +
    +
    +
    + @ +
    +
    +
    +
    + $.00 +
    +
    +
    +
    +
    +

    Prepend and append with uneditable

    +
    +
    + $Some value here +
    +
    + Some value here.00 +
    +
    + +
    +
    + + -- cgit v1.2.3 From 6dc59a9c3e0facab3abed7cb66d90c2316530014 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:45:12 -0700 Subject: add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip --- docs/templates/pages/javascript.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 1c5b96d2e..e037dd024 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -721,7 +721,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}number | object{{/i}} 0 -

    {{_i}}delay showing and hiding the tooltip (ms){{/i}}

    +

    {{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    @@ -830,7 +830,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}number | object{{/i}} 0 -

    {{_i}}delay showing and hiding the popover (ms){{/i}}

    +

    {{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    -- cgit v1.2.3 From d1864b3608d215ee22daf96268f878b1818c6de1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 00:46:03 -0700 Subject: adding 144x144 ipad touch icon --- docs/templates/layout.mustache | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/templates') diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 3434bdcbf..d3c06e096 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -20,6 +20,7 @@ + -- cgit v1.2.3 From a7b8e52f8e08cc821d7324153885c085fad25c1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 01:12:51 -0700 Subject: Overhaul the responsive utility classes: 1. Rename file from responsive-utility-classes.less to responsive-utilities.less 2. Add additional help text around the documentation for the classes in Scaffolding 3. Remove unnecessary display values on initial classes 4. Drop block values for inherit for better support on inline and table elements 5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid) --- docs/templates/pages/download.mustache | 2 +- docs/templates/pages/scaffolding.mustache | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 051291148..0e73c44a4 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -66,7 +66,7 @@

    {{_i}}Responsive{{/i}}

    - + diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index b64c63af3..6d99965b3 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -532,16 +532,18 @@

    {{_i}}Test case{{/i}}

    {{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}

    {{_i}}Visible on...{{/i}}

    +

    {{_i}}Green checkmarks indicate that class is visible in your current viewport.{{/i}}

      -
    • Phone✔ Phone
    • -
    • Tablet✔ Tablet
    • -
    • Desktop✔ Desktop
    • +
    • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
    • +
    • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
    • +
    • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}

    {{_i}}Hidden on...{{/i}}

    +

    {{_i}}Here, green checkmarks indicate that class is hidden in your current viewport.{{/i}}

      -
    • Phone✔ Phone
    • -
    • Tablet✔ Tablet
    • -
    • Desktop✔ Desktop
    • +
    • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
    • +
    • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
    • +
    • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}
    -- cgit v1.2.3 From a62810918f8a27b5755258521422eb912a1edfd8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 25 Mar 2012 13:33:36 -0700 Subject: fix responsive navbar --- 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 d3c06e096..4fdaadb3b 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -40,7 +40,7 @@ Bootstrap - +

    Fluid row with inputs

    +

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

    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + + + + + + -- cgit v1.2.3 From 825227474b57c90181e9c1b43da952d01b6c1dc1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 17:37:38 -0700 Subject: add refresh method documentation to js docs to close #2028 and #2795 --- docs/templates/pages/javascript.mustache | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index e037dd024..a5010f226 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -494,6 +494,14 @@ $('#myModal').on('hidden', function () { {{_i}}Heads up!{{/i}} {{_i}}Navbar links must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.{{/i}} +

    {{_i}}Methods{{/i}}

    +

    .scrollspy('refresh')

    +

    {{_i}}When using scrollspy in conjunction with adding or removing of elements from the DOM, you'll need to call the refresh method like so:{{/i}}

    +
    +$('[data-spy="scroll"]').each(function () {
    +  var $spy = $(this).scrollspy('refresh')
    +});
    +

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

    -- cgit v1.2.3 From 4893928310288d7bccb400017d333c6a49700046 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 18:03:30 -0700 Subject: add back href for alerts in components docs to make close work on iphone --- docs/templates/pages/components.mustache | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 79019addc..5226296d9 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1607,7 +1607,7 @@

    {{_i}}Example alerts{{/i}}

    {{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}

    - × + × {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}}
    @@ -1618,7 +1618,7 @@
     

    {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}

    - × + ×

    {{_i}}Warning!{{/i}}

    {{_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.

    @@ -1637,7 +1637,7 @@

    {{_i}}Error or danger{{/i}}

    - × + × {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}}
    @@ -1649,7 +1649,7 @@
         

    {{_i}}Success{{/i}}

    - × + × {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}}
    @@ -1661,7 +1661,7 @@
         

    {{_i}}Information{{/i}}

    - × + × {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}}
    -- 
    cgit v1.2.3
    
    
    From ea437351ed115b240e9b150da7ee93582f31dd17 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Sun, 25 Mar 2012 19:47:13 -0700
    Subject: add heads up note for required href on alert dismiss actions
    
    ---
     docs/templates/pages/components.mustache | 5 +++--
     1 file changed, 3 insertions(+), 2 deletions(-)
    
    (limited to 'docs/templates')
    
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
    index 5226296d9..d99a1ad44 100644
    --- a/docs/templates/pages/components.mustache
    +++ b/docs/templates/pages/components.mustache
    @@ -1612,10 +1612,11 @@
           
     <div class="alert">
    -  <a class="close" data-dismiss="alert">×</a>
    +  <a class="close" data-dismiss="alert" href="#">×</a>
       <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
     </div>
     
    +

    {{_i}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for fully responsive and dismissable alerts.{{/i}}

    {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}

    × @@ -1624,7 +1625,7 @@
     <div class="alert alert-block">
    -  <a class="close" data-dismiss="alert">×</a>
    +  <a class="close" data-dismiss="alert" href="#">×</a>
       <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
       {{_i}}Best check yo self, you're not...{{/i}}
     </div>
    -- 
    cgit v1.2.3
    
    
    From 473e5714f756d9be81e9321d451bb05431dd28ee Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Sun, 25 Mar 2012 20:41:59 -0700
    Subject: change all anchor alert closes to buttons
    
    ---
     docs/templates/pages/components.mustache | 12 ++++++------
     1 file changed, 6 insertions(+), 6 deletions(-)
    
    (limited to 'docs/templates')
    
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
    index d99a1ad44..4188ebcd7 100644
    --- a/docs/templates/pages/components.mustache
    +++ b/docs/templates/pages/components.mustache
    @@ -1607,19 +1607,19 @@
           

    {{_i}}Example alerts{{/i}}

    {{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}

    - × + {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}}
     <div class="alert">
    -  <a class="close" data-dismiss="alert" href="#">×</a>
    +  <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>
     

    {{_i}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for fully responsive and dismissable alerts.{{/i}}

    {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}

    - × +

    {{_i}}Warning!{{/i}}

    {{_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.

    @@ -1638,7 +1638,7 @@

    {{_i}}Error or danger{{/i}}

    - × + {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}}
    @@ -1650,7 +1650,7 @@
         

    {{_i}}Success{{/i}}

    - × + {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}}
    @@ -1662,7 +1662,7 @@
         

    {{_i}}Information{{/i}}

    - × + {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}}
    -- 
    cgit v1.2.3
    
    
    From 4449c4e9e041136c7f03438ab3f078f4d837f6d5 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Sun, 25 Mar 2012 20:44:01 -0700
    Subject: update docs messaging around alerts and buttons
    
    ---
     docs/templates/pages/components.mustache | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    (limited to 'docs/templates')
    
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
    index 4188ebcd7..2ceb43ba1 100644
    --- a/docs/templates/pages/components.mustache
    +++ b/docs/templates/pages/components.mustache
    @@ -1616,7 +1616,7 @@
       <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
     </div>
     
    -

    {{_i}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for fully responsive and dismissable alerts.{{/i}}

    +

    {{_i}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a button element with the data attribute, which we have opted to do for our docs.{{/i}}

    {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}

    -- cgit v1.2.3 From d4914f47c34053fded5aea39fcb9b7747f7bbecc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Mar 2012 09:25:31 -0700 Subject: fix #2799, mention of text in the navbar --- docs/templates/pages/components.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 2ceb43ba1..ac06367ce 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1038,7 +1038,7 @@

    {{_i}}Get the javascript →{{/i}}


    {{_i}}Text in the navbar{{/i}}

    -

    {{_i}}Wrap strings of text in a <p> tag for proper leading and color.{{/i}}

    +

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

    -- cgit v1.2.3 From 917f11e6799ddd43b439ce1f7a10c1a7360bcf3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Mar 2012 09:30:42 -0700 Subject: update LESS docs to note @baseFontSize and @baseLineHeight must be pixels --- docs/templates/pages/less.mustache | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 263ec7fce..0b58cfc9e 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -122,45 +122,47 @@
    - + - + - + + - + + - + - + - + - +
    @sansFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif"Helvetica Neue", Helvetica, Arial, sans-serif
    @serifFontFamilyGeorgia, "Times New Roman", Times, serifGeorgia, "Times New Roman", Times, serif
    @monoFontFamilyMenlo, Monaco, "Courier New", monospaceMenlo, Monaco, "Courier New", monospace
    @baseFontSize 13pxMust be pixels
    @baseFontFamily@sansFontFamily@sansFontFamily
    @baseLineHeight 18pxMust be pixels
    @altFontFamily@serifFontFamily@serifFontFamily
    @headingsFontFamilyinheritinherit
    @headingsFontWeightboldbold
    @headingsColorinheritinherit
    -- cgit v1.2.3 From 5d2062a3ccb0fed4901fc9f312c961d042f569bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Tue, 27 Mar 2012 08:36:34 +0200 Subject: Finish of close conversion from a to button --- docs/templates/pages/components.mustache | 6 ++++-- docs/templates/pages/javascript.mustache | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index ac06367ce..b0d88dd14 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1802,8 +1802,10 @@

    {{_i}}Close icon{{/i}}

    {{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}

    -

    ×

    -
    <a class="close">&times;</a>
    +

    +
    <button class="close">&times;</button>
    +

    {{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}

    +
    <a class="close" href="#">&times;</a>
    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index a5010f226..d61a364f0 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -131,7 +131,7 @@
    - +
    -- cgit v1.2.3 From 04baa07547692f75dd708afaf50700075df1a60a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Mar 2012 18:25:27 -0700 Subject: document .backface-visibility and update comments and initial value --- docs/templates/pages/less.mustache | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 0b58cfc9e..280c39318 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -793,6 +793,11 @@ @select {{_i}}Control cursor selection of text on a page{{/i}} + + .backface-visibility() + @visibility: visible + {{_i}}Prevent flickering of content when using CSS 3D transforms{{/i}} + .resizable() @direction: both -- cgit v1.2.3 From a9f9949b3e4a0b3cd84f3088c050296e18a0f8df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Mar 2012 19:41:23 -0700 Subject: rearrange other parts of forms docs --- docs/templates/pages/base-css.mustache | 87 ++++++++++++++++------------------ 1 file changed, 41 insertions(+), 46 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9644ea770..0b6e17e69 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -863,10 +863,22 @@

    {{_i}}Horizontal forms{{/i}}

    +
    +

    {{_i}}{{/i}}

    +

    {{_i}}Shown on the right are all the default form controls we support. Here's the bulleted list:{{/i}}

    +
      +
    • {{_i}}text inputs (text, password, email, etc){{/i}}
    • +
    • {{_i}}checkbox{{/i}}
    • +
    • {{_i}}radio{{/i}}
    • +
    • {{_i}}select{{/i}}
    • +
    • {{_i}}multiple select{{/i}}
    • +
    • {{_i}}file input{{/i}}
    • +
    • {{_i}}textarea{{/i}}
    • +
    +
    - {{_i}}Controls Bootstrap supports{{/i}}
    @@ -942,31 +954,27 @@ </form>
    -
    -

    {{_i}}What's included{{/i}}

    -

    {{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}

    -
      -
    • {{_i}}text inputs (text, password, email, etc){{/i}}
    • -
    • {{_i}}checkbox{{/i}}
    • -
    • {{_i}}radio{{/i}}
    • -
    • {{_i}}select{{/i}}
    • -
    • {{_i}}multiple select{{/i}}
    • -
    • {{_i}}file input{{/i}}
    • -
    • {{_i}}textarea{{/i}}
    • -
    -
    -

    {{_i}}New defaults with v2.0{{/i}}

    -

    {{_i}}Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.{{/i}}

    -

    +

    {{_i}}Form control states{{/i}}

    +
    +

    {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}

    +
    +

    {{_i}}Form validation{{/i}}

    +

    {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}

    +
    +<fieldset
    +  class="control-group error">
    +  …
    +</fieldset>
    +
    +
    - {{_i}}Form control states{{/i}}
    @@ -1035,28 +1043,29 @@
    -
    -

    {{_i}}Redesigned browser states{{/i}}

    -

    {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}

    -
    -

    {{_i}}Form validation{{/i}}

    -

    {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}

    -
    -<fieldset
    -  class="control-group error">
    -  …
    -</fieldset>
    -
    -

    +

    {{_i}}Extending form controls{{/i}}

    +
    +

    {{_i}}Prepend & append inputs{{/i}}

    +

    {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}

    +
    +

    {{_i}}Checkboxes and radios{{/i}}

    +

    {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}

    +

    {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}

    +
    +

    {{_i}}Inline forms and append/prepend{{/i}}

    +

    {{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}

    +
    +

    {{_i}}Form help text{{/i}}

    +

    {{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}

    +
    - {{_i}}Extending form controls{{/i}}
    @@ -1182,20 +1191,6 @@
    -
    -

    {{_i}}Prepend & append inputs{{/i}}

    -

    {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}

    -
    -

    {{_i}}Checkboxes and radios{{/i}}

    -

    {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}

    -

    {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}

    -
    -

    {{_i}}Inline forms and append/prepend{{/i}}

    -

    {{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}

    -
    -

    {{_i}}Form help text{{/i}}

    -

    {{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}

    -
    -- cgit v1.2.3 From 56ecc6ba96550d8e66d0484c21fc20da5f8e52e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 12:31:56 -0700 Subject: clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html --- docs/templates/pages/javascript.mustache | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index d61a364f0..bb25f0957 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -416,6 +416,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul>
    +

    {{_i}}To keep URLs intact, use the data-target attribute instead of href="#".{{/i}}

    +
    +<ul class="nav nav-pills">
    +  <li class="dropdown">
    +    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
    +      {{_i}}Dropdown{{/i}}
    +      <b class="caret"></b>
    +    </a>
    +    <ul class="dropdown-menu">
    +      ...
    +    </ul>
    +  </li>
    +</ul>
    +

    {{_i}}Methods{{/i}}

    $().dropdown()

    {{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}

    -- cgit v1.2.3 From 452ddc0f0dd5cfd3bb867e17d603c98d6db2ec19 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:36:45 -0700 Subject: update less docs page to reflect changes in mixins (no more default values) and variable name fix --- docs/templates/pages/less.mustache | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 280c39318..8b7f4495d 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -627,17 +627,17 @@ .size() - @height: 5px, @width: 5px + @height @width {{_i}}Quickly set the height and width on one line{{/i}} .square() - @size: 5px + @size {{_i}}Builds on .size() to set the width and height as same value{{/i}} .opacity() - @opacity: 100 + @opacity {{_i}}Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{/i}} @@ -745,12 +745,12 @@ .border-radius() - @radius: 5px + @radius {{_i}}Round the corners of an element. Can be a single value or four space-separated values{{/i}} .box-shadow() - @shadow: 0 1px 3px rgba(0,0,0,.25) + @shadow {{_i}}Add a drop shadow to an element{{/i}} @@ -770,7 +770,7 @@ .translate() - @x: 0, @y: 0 + @x, @y {{_i}}Move an element on the x and y planes{{/i}} @@ -805,7 +805,7 @@ .content-columns() - @columnCount, @columnGap: @gridColumnGutter + @columnCount, @columnGap: @gridGutterWidth {{_i}}Make the content of any element use CSS3 columns{{/i}} -- cgit v1.2.3 From d652af10971d79cde92336700e156c63ff2c0b24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 23:53:54 -0700 Subject: fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts --- docs/templates/pages/base-css.mustache | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 0b6e17e69..66bf70474 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -294,7 +294,14 @@
    Donec id elit non mi porta gravida at eget metus.
    Malesuada porta
    Etiam porta sem malesuada magna mollis euismod.
    +
    Felis euismod semper eget lacinia
    +
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    +
    +

    + {{_i}}Heads up!{{/i}} + {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout.{{/i}} +

    -- cgit v1.2.3 From 4462f24753463dda66a8301ff10b8e7c0abc5ac8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Apr 2012 22:40:06 -0700 Subject: fix #2911: correct /lib/ path to /less/ --- docs/templates/pages/less.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 8b7f4495d..5005fb166 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -892,7 +892,7 @@

    {{_i}}Command line{{/i}}

    {{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}

    -
    $ lessc ./lib/bootstrap.less > bootstrap.css
    +
    $ lessc ./less/bootstrap.less > bootstrap.css

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

    -- cgit v1.2.3 From 0a71f171bc63dcfea42fe002bab00454d728fc42 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 16:17:15 -0700 Subject: readd bootstrap.zip, add @inputBorderRadius var to close #2946 --- docs/templates/pages/download.mustache | 2 ++ docs/templates/pages/less.mustache | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 0e73c44a4..e9c27588b 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -291,6 +291,8 @@ + + diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 5005fb166..5345cbf97 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -376,6 +376,10 @@ @inputBorder #ccc + + @inputBorderRadius + 3px + @inputDisabledBackground @grayLighter -- cgit v1.2.3 From 3ecf1098357618092280b2e7c562a1ef5bf11959 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 16:44:03 -0700 Subject: fix conflicts, add docs example for two buttons on an append --- docs/templates/pages/base-css.mustache | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 66bf70474..57e2401d1 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1146,6 +1146,14 @@
    +
    + +
    +
    + +
    +
    +
    -- cgit v1.2.3 From a20cd66ba479053f060b1a7ed61cb1f0cd90450f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 16:49:06 -0700 Subject: clean up new input append examples --- docs/templates/pages/base-css.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 57e2401d1..b61e77ac5 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1139,18 +1139,18 @@
    - +
    - +
    - +
    - +
    -- cgit v1.2.3 From 5bc601d9a8c330a4ad14375e63519fcf11bb08ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 23:37:58 -0700 Subject: fix typo on js docs selector --- 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 bb25f0957..3792279ef 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1011,7 +1011,7 @@ $('#my-alert').bind('closed', function () {

    {{_i}}Using bootstrap-button.js{{/i}}

    {{_i}}Enable buttons via javascript:{{/i}}

    -
    $('.tabs').button()
    +
    $('.nav-tabs').button()

    {{_i}}Markup{{/i}}

    {{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

    -- 
    cgit v1.2.3
    
    
    From 0e6f12af861745961a90aef58d8d783bebd0b58e Mon Sep 17 00:00:00 2001
    From: ctalkington 
    Date: Thu, 12 Apr 2012 15:14:54 -0500
    Subject: add 's' to 'classe' in components docs. thanks mishmosh.
    
    ---
     docs/templates/pages/components.mustache | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    (limited to 'docs/templates')
    
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
    index aff449c73..ac6ce243b 100644
    --- a/docs/templates/pages/components.mustache
    +++ b/docs/templates/pages/components.mustache
    @@ -345,7 +345,7 @@
             
           
           

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

    -

    {{_i}}Utilize the extra button classe .btn-mini, .btn-small, or .btn-large for sizing.{{/i}}

    +

    {{_i}}Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.{{/i}}

    -- cgit v1.2.3 From dbde2dc9e40f077af4fcaa1714ade7bc94398da9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 17:15:16 -0700 Subject: adding icon classes to finish off glyphicons 1.6 update --- docs/templates/pages/base-css.mustache | 44 ++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 12 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index b61e77ac5..200cd41c4 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1368,15 +1368,15 @@
  • icon-inbox
  • icon-play-circle
  • icon-repeat
  • - -
    -
    -
    • icon-refresh
    • icon-list-alt
    • icon-lock
    • icon-flag
    • icon-headphones
    • +
    +
    +
    +
    • icon-volume-off
    • icon-volume-down
    • icon-volume-up
    • @@ -1402,10 +1402,6 @@
    • icon-indent-right
    • icon-facetime-video
    • icon-picture
    • -
    -
    -
    -
    • icon-pencil
    • icon-map-marker
    • icon-adjust
    • @@ -1416,6 +1412,10 @@
    • icon-move
    • icon-step-backward
    • icon-fast-backward
    • +
    +
    +
    +
    • icon-backward
    • icon-play
    • icon-pause
    • @@ -1436,10 +1436,6 @@
    • icon-remove-circle
    • icon-ok-circle
    • icon-ban-circle
    • -
    -
    -
    -
    • icon-arrow-left
    • icon-arrow-right
    • icon-arrow-up
    • @@ -1455,6 +1451,10 @@
    • icon-leaf
    • icon-fire
    • icon-eye-open
    • +
    +
    +
    +
    • icon-eye-close
    • icon-warning-sign
    • icon-plane
    • @@ -1470,6 +1470,26 @@
    • icon-folder-open
    • icon-resize-vertical
    • icon-resize-horizontal
    • +
    • icon-hdd
    • +
    • icon-bullhorn
    • +
    • icon-bell
    • +
    • icon-certificate
    • +
    • icon-thumbs-up
    • +
    • icon-thumbs-down
    • +
    • icon-hand-right
    • +
    • icon-hand-left
    • +
    • icon-hand-up
    • +
    • icon-hand-down
    • +
    • icon-circle-arrow-right
    • +
    • icon-circle-arrow-left
    • +
    • icon-circle-arrow-up
    • +
    • icon-circle-arrow-down
    • +
    • icon-globe
    • +
    • icon-wrench
    • +
    • icon-tasks
    • +
    • icon-filter
    • +
    • icon-briefcase
    • +
    • icon-fullscreen
    -- cgit v1.2.3 From 4bcb89946bf556ff524a67c82e079f43b045e747 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:18:11 -0700 Subject: merge in #2684, offset on the .makeColumn mixin --- docs/templates/pages/less.mustache | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/templates') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 5345cbf97..7698dd290 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -735,6 +735,16 @@ @fluidGridColumnWidth, @fluidGridGutterWidth {{_i}}Generate a precent grid system with n columns and x % wide gutter{{/i}} + + #grid > .input() + @gridColumnWidth, @gridGutterWidth + {{_i}}Generate the pixel grid system for input elements, accounting for padding and borders{{/i}} + + + .makeColumn + @columns: 1, @offset: 0 + {{_i}}Turn any div into a grid column without the .span* classes{{/i}} +

    {{_i}}CSS3 properties{{/i}}

    -- cgit v1.2.3 From def7ae7798916f105ba489b617cfa2b4af16afa4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:30:43 -0700 Subject: bump version on docs homepage to 2.0.3 --- docs/templates/pages/index.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index bef11b810..41a89e07a 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -6,7 +6,7 @@

    {{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}

    {{_i}}View project on GitHub{{/i}} - {{_i}}Download Bootstrap (v2.0.2){{/i}} + {{_i}}Download Bootstrap (v2.0.3){{/i}}

    -- cgit v1.2.3 From a4c2332eb1b5b4baf4309463ab88141d82c88c04 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Apr 2012 00:06:11 -0700 Subject: move js tooltip link --- 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 3792279ef..e0f3822e0 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -690,7 +690,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    {{_i}}Example use of Tooltips{{/i}}

    {{_i}}Hover over the links below to see tooltips:{{/i}}

    -

    {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}} +

    {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}}


    -- cgit v1.2.3 From 5fa0fcc888bdeb5210b03445045ba61bdf7b0034 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 16 Apr 2012 14:38:22 -0700 Subject: fix modal per #3086 --- 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 e0f3822e0..1ae3ffa5a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -129,7 +129,7 @@

    {{_i}}Static example{{/i}}

    {{_i}}Below is a statically rendered modal.{{/i}}

    -- cgit v1.2.3 From fd009597b67fc8bbd599248ce832a3930c85a966 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Apr 2012 09:28:40 -0700 Subject: mention responsive css in navbar responsive section --- docs/templates/pages/components.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index ac6ce243b..8e81a95df 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -996,7 +996,7 @@ </div>
    - {{_i}}Heads up!{{/i}} The responsive navbar requires the collapse plugin. + {{_i}}Heads up!{{/i}} The responsive navbar requires the collapse plugin and responsive Bootstrap CSS file.
    -- cgit v1.2.3 From 192cb575da73ed2c056319b27613407729796a4f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 22 Apr 2012 23:56:36 -0700 Subject: fix typo --- 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 200cd41c4..3524ac985 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1239,7 +1239,7 @@ btn btn-info - {{_i}}Used as an alternate to the default styles{{/i}} + {{_i}}Used as an alternative to the default styles{{/i}} -- cgit v1.2.3 From 73453c7f79e6bf6be13917f854ed172e214eada2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Apr 2012 02:02:06 -0700 Subject: changes for build in preperation for 2.0.3 release --- docs/templates/pages/download.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index e9c27588b..ffade0977 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -31,7 +31,7 @@

    {{_i}}Base CSS{{/i}}

    - + -- cgit v1.2.3