From 739ef39050c0a9f59b726eb9b0ac5a3ba96aba00 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Tue, 7 May 2013 15:20:28 +0300 Subject: Updated URL for jekyll installation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7579d3a99..b76a8da23 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/tw ## Documentation -Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](https://github.com/mojombo/jekyll/wiki/install) to run a local server. +Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](http://jekyllrb.com/docs/installation) to run a local server. Documentation for [previous versions](https://github.com/twitter/bootstrap/tags) is also available via tags. -- cgit v1.2.3 From f06294d80f7a8dd0752837aab3ed5fca17d3d9be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 May 2013 10:33:41 -0700 Subject: Outdent nav links a bit more so they line up in navbar --- docs/assets/css/bootstrap.css | 2 +- less/navbar.less | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 67b0bd18e..e8ddf5bb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3529,7 +3529,7 @@ button.close { } .navbar-nav { - margin-top: 5px; + margin: 10px -15px 0; } .navbar-nav > li > a { diff --git a/less/navbar.less b/less/navbar.less index d4e5286a5..494f43b6f 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -20,7 +20,8 @@ .navbar-nav { // Space out from .navbar .brand and .btn-navbar when stacked in mobile views - margin-top: 5px; + // and outdent nav links so text lines up with logo. + margin: 10px -15px 0; > li > a { padding-top: ((@navbar-height - @line-height-base) / 2); -- cgit v1.2.3 From ad5f88e1c5384d8312655298dcff429253ad2d9c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 May 2013 18:03:32 -0700 Subject: Update config after updating to jekyll 1.0.1 --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 57a28e0a7..6b328977b 100644 --- a/_config.yml +++ b/_config.yml @@ -8,5 +8,5 @@ permalink: pretty # Server source: ./docs destination: ./_gh_pages +port: 9001 url: http://bootstrap.dev:9001 -server_port: 9001 -- cgit v1.2.3 From d7f84d1220719cdf2272c9aa3c6731a932394c58 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 May 2013 18:07:06 -0700 Subject: Require .btn-default for regular buttons * Instead of , use for standard, gray button * Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes * Updates docs to reflect the change * Reorganize buttons CSS --- docs/assets/css/bootstrap.css | 111 +++++++++++++------------ docs/docs.html | 187 +++++++++++++++++++++--------------------- less/button-groups.less | 4 +- less/buttons.less | 119 ++++++++++++--------------- less/mixins.less | 3 +- less/variables.less | 11 ++- 6 files changed, 217 insertions(+), 218 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e8ddf5bb1..26cfc3b09 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1830,7 +1830,7 @@ select:focus:invalid:focus { white-space: nowrap; vertical-align: middle; cursor: pointer; - border: 1px solid #a7a9aa; + border: 1px solid transparent; border-radius: 4px; } @@ -1865,72 +1865,38 @@ fieldset[disabled] .btn { box-shadow: none; } -.btn-large { - padding: 11px 14px; - font-size: 17.5px; - border-radius: 6px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - border-radius: 3px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn { +.btn-default { color: #ffffff; background-color: #a7a9aa; border-color: #a7a9aa; } -.btn:hover, -.btn:focus, -.btn:active, -.btn.active { +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active { background-color: #9a9c9d; border-color: #8d9091; } -.btn.disabled:hover, -.btn[disabled]:hover, -fieldset[disabled] .btn:hover, -.btn.disabled:focus, -.btn[disabled]:focus, -fieldset[disabled] .btn:focus, -.btn.disabled:active, -.btn[disabled]:active, -fieldset[disabled] .btn:active, -.btn.disabled.active, -.btn[disabled].active, -fieldset[disabled] .btn.active { +.btn-default.disabled:hover, +.btn-default[disabled]:hover, +fieldset[disabled] .btn-default:hover, +.btn-default.disabled:focus, +.btn-default[disabled]:focus, +fieldset[disabled] .btn-default:focus, +.btn-default.disabled:active, +.btn-default[disabled]:active, +fieldset[disabled] .btn-default:active, +.btn-default.disabled.active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default.active { background-color: #a7a9aa; border-color: #a7a9aa; } .btn-primary { + color: #ffffff; background-color: #428bca; border-color: #428bca; } @@ -1960,6 +1926,7 @@ fieldset[disabled] .btn-primary.active { } .btn-warning { + color: #ffffff; background-color: #f0ad4e; border-color: #f0ad4e; } @@ -1989,6 +1956,7 @@ fieldset[disabled] .btn-warning.active { } .btn-danger { + color: #ffffff; background-color: #d9534f; border-color: #d9534f; } @@ -2018,6 +1986,7 @@ fieldset[disabled] .btn-danger.active { } .btn-success { + color: #ffffff; background-color: #5cb85c; border-color: #5cb85c; } @@ -2047,6 +2016,7 @@ fieldset[disabled] .btn-success.active { } .btn-info { + color: #ffffff; background-color: #5bc0de; border-color: #5bc0de; } @@ -2114,6 +2084,41 @@ fieldset[disabled] .btn-link:focus { text-decoration: none; } +.btn-large { + padding: 11px 14px; + font-size: 17.5px; + border-radius: 6px; +} + +.btn-small { + padding: 2px 10px; + font-size: 11.9px; + border-radius: 3px; +} + +.btn-mini { + padding: 0 6px; + font-size: 10.5px; + border-radius: 3px; +} + +.btn-block { + display: block; + width: 100%; + padding-right: 0; + padding-left: 0; +} + +.btn-block + .btn-block { + margin-top: 5px; +} + +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; +} + .fade { opacity: 0; -webkit-transition: opacity 0.15s linear; diff --git a/docs/docs.html b/docs/docs.html index 88ab16d7c..5b502cf89 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -2047,7 +2047,7 @@ For example, <section> should be wrapped as inline.

Button options

-

Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements for the best rendering.

+

Use any of the available button classes to quickly create a styled button.

@@ -2080,56 +2080,55 @@ For example, <section> should be wrapped as inline. {% endhighlight %} -

Button sizes

Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for additional sizes.

- - + +

- +

- - + +

- - + +

{% highlight html %}

- - + +

- +

- - + +

- - + +

{% endhighlight %}

Create block level buttons—those that span the full width of a parent— by adding .btn-block.

- - + +
{% highlight html %} - - + + {% endhighlight %} @@ -2139,12 +2138,12 @@ For example, <section> should be wrapped as inline.

Button element

Add the disabled attribute to <button> buttons.

- - + +

{% highlight html %} - + {% endhighlight %}
@@ -2155,12 +2154,12 @@ For example, <section> should be wrapped as inline.

Anchor element

Add the .disabled class to <a> buttons.

- Primary link - Link + Primary link + Link

{% highlight html %} -Primary link -Link +Primary link +Link {% endhighlight %}

We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. @@ -2171,19 +2170,19 @@ For example, <section> should be wrapped as inline.

-

One class, multiple tags

-

Use the .btn class on an <a>, <button>, or <input> element.

+

Using multiple tags

+

Use the button classes on an <a>, <button>, or <input> element.

- Link - - - + Link + + +
{% highlight html %} -Link - - - +Link + + + {% endhighlight %}
@@ -2599,20 +2598,20 @@ For example, <section> should be wrapped as inline.
- - - - + + + +
{% highlight html %}
- - - - + + + +
{% endhighlight %} @@ -2638,8 +2637,8 @@ For example, <section> should be wrapped as inline.
{% highlight html %}
- User - + User +
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9221cac1b..ddab6ba6a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -94,6 +94,29 @@ body { +/* Customize and Download button +-------------------------------------------------- */ + +.bs-customize-download { + text-align:center; +} +.bs-customize-download .btn { + margin-top: 5px; + margin-bottom: 5px; + padding: 18px 24px; + font-size: 21px; + color: #b94a48; + background-color: #fff; + border-color: #b94a48; +} +.bs-customize-download .btn:hover, +.bs-customize-download .btn:active { + color: #fff; + background-color: #b94a48; +} + + + /* Docs pages and sections -------------------------------------------------- */ diff --git a/docs/customize.html b/docs/customize.html index 32a00b441..6a703e47f 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -1,354 +1,1160 @@ --- -layout: customize +layout: default title: Customize and download slug: customize +lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to get your very own version. --- - - - - - -
-
- -
-
- - -
-
- -
- -
- Customize and Download -

What's included?

-

Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

-
-
- +
+ +

Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.

+ +
+

What's included?

+

Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

+
+
+ -- cgit v1.2.3 From cdcc3e87688e470598fb8254194a5c86f72dd368 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 May 2013 21:50:25 -0700 Subject: delete customize layout since it's no longer in use --- docs/_layouts/customize.html | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 docs/_layouts/customize.html diff --git a/docs/_layouts/customize.html b/docs/_layouts/customize.html deleted file mode 100644 index f01f4f86e..000000000 --- a/docs/_layouts/customize.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {% include header.html %} - - - - - - {% include nav-main.html %} - - -
- {{ content }} - - - {% include colophon.html %} -
- - - {% include footer.html %} - - - -- cgit v1.2.3 From 432d417ade569cce1a8a4a2e5fbbd32b57170891 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 May 2013 23:17:39 -0700 Subject: fixes #6898: typo in modal test --- js/tests/unit/modal.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 7ee47be38..9187b5e23 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -28,7 +28,7 @@ $(function () { $.support.transition = false $("") .on("shown.bs.modal", function () { - ok($('#modal-test').length, 'modal insterted into dom') + ok($('#modal-test').length, 'modal inserted into dom') $(this).remove() start() }) @@ -71,7 +71,7 @@ $(function () { $("") .on("shown.bs.modal", function () { ok($('#modal-test').is(":visible"), 'modal visible') - ok($('#modal-test').length, 'modal insterted into dom') + ok($('#modal-test').length, 'modal inserted into dom') $(this).modal("hide") }) .on("hidden.bs.modal", function() { @@ -89,7 +89,7 @@ $(function () { div .on("shown.bs.modal", function () { ok($('#modal-test').is(":visible"), 'modal visible') - ok($('#modal-test').length, 'modal insterted into dom') + ok($('#modal-test').length, 'modal inserted into dom') div.modal("toggle") }) .on("hidden.bs.modal", function() { @@ -107,7 +107,7 @@ $(function () { div .on("shown.bs.modal", function () { ok($('#modal-test').is(":visible"), 'modal visible') - ok($('#modal-test').length, 'modal insterted into dom') + ok($('#modal-test').length, 'modal inserted into dom') div.find('.close').click() }) .on("hidden.bs.modal", function() { -- cgit v1.2.3 From acc0875259593d3206a07ac24bf877d0c8c0c8b9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 May 2013 23:34:28 -0700 Subject: fix up customizer js and classes; turn buttons into real buttons --- docs/assets/css/docs.css | 11 +++++++++++ docs/assets/js/application.js | 29 +++++++++++------------------ docs/customize.html | 14 +++++++------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ddab6ba6a..6f7254e82 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -97,6 +97,17 @@ body { /* Customize and Download button -------------------------------------------------- */ +.bs-customizer { + +} +.bs-customizer .toggle { + float: right; +} +.bs-customizer label { + margin-top: 10px; +} + + .bs-customize-download { text-align:center; } diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 02785a49c..9e75a8040 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -27,13 +27,6 @@ $('.bs-top').affix() }, 100) - // add-ons - $('.add-on :checkbox').on('click', function () { - var $this = $(this) - , method = $this.attr('checked') ? 'addClass' : 'removeClass' - $(this).parents('.add-on')[method]('active') - }) - // add tipsies to grid for scaffolding if ($('#grid-system').length) { $('#grid-system').tooltip({ @@ -76,22 +69,22 @@ $('.bs-docs-carousel-example').carousel() // javascript build logic - var inputsComponent = $("#components.download input") - , inputsPlugin = $("#plugins.download input") - , inputsVariables = $("#variables.download input") + var inputsComponent = $("#components input") + , inputsPlugin = $("#plugins input") + , inputsVariables = $("#variables input") // toggle all plugin checkboxes - $('#components.download .toggle-all').on('click', function (e) { + $('#components .toggle').on('click', function (e) { e.preventDefault() - inputsComponent.attr('checked', !inputsComponent.is(':checked')) + inputsComponent.prop('checked', !inputsComponent.is(':checked')) }) - $('#plugins.download .toggle-all').on('click', function (e) { + $('#plugins .toggle').on('click', function (e) { e.preventDefault() - inputsPlugin.attr('checked', !inputsPlugin.is(':checked')) + inputsPlugin.prop('checked', !inputsPlugin.is(':checked')) }) - $('#variables.download .toggle-all').on('click', function (e) { + $('#variables .toggle').on('click', function (e) { e.preventDefault() inputsVariables.val('') }) @@ -99,16 +92,16 @@ // request built javascript $('.download-btn .btn').on('click', function () { - var css = $("#components.download input:checked") + var css = $("#components input:checked") .map(function () { return this.value }) .toArray() - , js = $("#plugins.download input:checked") + , js = $("#plugins input:checked") .map(function () { return this.value }) .toArray() , vars = {} , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png'] - $("#variables.download input") + $("#variables input") .each(function () { $(this).val() && (vars[ $(this).prev().text() ] = $(this).val()) }) diff --git a/docs/customize.html b/docs/customize.html index 6a703e47f..e6139f23a 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -7,10 +7,10 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge -
+

Choose which LESS files should be compiled into your custom stylesheets.

@@ -273,10 +273,10 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
- +

Choose which jQuery plugins should be included in your custom JavaScript files.

@@ -369,11 +369,11 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

- - + +

Customize LESS variables to define colors, sizes and more inside your custom CSS stylesheets.

-- cgit v1.2.3 From a3cba92edd6f778c061ff40dc34a5e939342d31c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 May 2013 23:45:12 -0700 Subject: rejigger the customizer layout --- docs/customize.html | 167 ++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 85 deletions(-) diff --git a/docs/customize.html b/docs/customize.html index e6139f23a..62ed43a9b 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -13,31 +13,32 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

LESS components

-

Choose which LESS files should be compiled into your custom stylesheets.

+

Choose which LESS files to compile into your custom build of Bootstrap.

Read the documentation

Make an informed choice by first reading about CSS and Components in the docs.

+

The basics

-
+

Layout

@@ -47,79 +48,76 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
-
-

Utility classes

+
+

Global CSS

-
-
-

Standard element styles

-
-
+
+
+

Utility classes

-
-
+

Bootstrap features

-
+

Navigation

@@ -141,75 +139,76 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
-
-

Additional information

+
+

Content blocks

+
+
+

Behavioral (requires JS)

-
-
-
-
-

Content blocks

-
+
+ +
+

Media

-
-
-
-

Other

+
+

Miscellaneous

@@ -381,7 +378,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

Body background

-

Background color applied to <body>.

+

Background color applied to <body>.

Typography

-- cgit v1.2.3 From 371d14e2173888932b1edf11083ccbf73bae313e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 23 May 2013 21:06:02 -0700 Subject: Remove commented out code and properly nest CSS again for .collapse --- docs/assets/css/bootstrap.css | 10 ---------- less/component-animations.less | 13 ++----------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 29cf51923..b65d86480 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1985,16 +1985,6 @@ input[type="button"].btn-block { opacity: 1; } -/*.collapse { - position: relative; - height: 0; - overflow: hidden; - .transition(height .35s ease); - &.in { - height: auto; - } -}*/ - .collapse { position: relative; height: 0; diff --git a/less/component-animations.less b/less/component-animations.less index b25adc932..50e5e45c1 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -11,22 +11,13 @@ } } -/*.collapse { +.collapse { position: relative; height: 0; overflow: hidden; .transition(height .35s ease); + &.in { height: auto; } -}*/ - -.collapse { - position: relative; - height: 0; - overflow: hidden; - .transition(height .35s ease); -} -.collapse.in { - height: auto; } -- cgit v1.2.3 From 3160bd872ee02567ae369ad1d940207523cd5a44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 23 May 2013 21:34:32 -0700 Subject: rearrange customizer content --- docs/_includes/nav-customize.html | 43 +++---- docs/assets/css/docs.css | 8 ++ docs/assets/js/application.js | 2 +- docs/customize.html | 241 +++++++++++++++++--------------------- 4 files changed, 138 insertions(+), 156 deletions(-) diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html index 5a869659f..38c96d543 100644 --- a/docs/_includes/nav-customize.html +++ b/docs/_includes/nav-customize.html @@ -1,10 +1,5 @@
  • - LESS components - + LESS components
  • jQuery plugins @@ -12,24 +7,24 @@
  • LESS variables
  • diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6f7254e82..305247251 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -105,6 +105,14 @@ body { } .bs-customizer label { margin-top: 10px; + font-weight: 500; + color: #555; +} +.bs-customizer h4 { + margin-top: 15px; +} +.bs-customizer input[type="text"] { + background-color: #fafafa; } diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 9e75a8040..30a7c0d6e 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -69,7 +69,7 @@ $('.bs-docs-carousel-example').carousel() // javascript build logic - var inputsComponent = $("#components input") + var inputsComponent = $("#less input") , inputsPlugin = $("#plugins input") , inputsVariables = $("#variables input") diff --git a/docs/customize.html b/docs/customize.html index 62ed43a9b..6b3c627d0 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -8,18 +8,14 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge -
    +
    -

    Choose which LESS files to compile into your custom build of Bootstrap.

    -
    -

    Read the documentation

    -

    Make an informed choice by first reading about CSS and Components in the docs.

    +

    LESS files

    +

    Choose which LESS files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the CSS and Components pages in the docs

    -

    The basics

    +

    Basics

    Layout

    @@ -104,7 +100,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    Bootstrap features

    +

    Components

    Navigation

    @@ -271,16 +267,14 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    + +
    -

    Choose which jQuery plugins should be included in your custom JavaScript files.

    -
    -

    Read the documentation

    -

    Make an informed choice by first reading about JavaScript in the docs.

    -
    +

    Choose which jQuery plugins should be included in your custom JavaScript files. Unsure what to include? Read the JavaScript page in the docs.

    Linked to components

    @@ -368,53 +362,57 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -
    + +

    Customize LESS variables to define colors, sizes and more inside your custom CSS stylesheets.

    -

    The basics

    + +

    Basics

    +

    Body background

    - - -

    Background color applied to <body>.

    +
    +
    + + +

    Background color applied to <body>.

    +
    +
    +

    Typography

    - -

    Default sans-serif fonts. Used almost anywhere in Bootstrap.

    + +

    Default sans-serif fonts.

    - +

    Default serif fonts.

    + + +

    Default monospace fonts for <code> and <pre>.

    - - -

    Default monospace fonts. Most prominently used for <code> and <pre>.

    -
    -
    -
    -
    +

    Used to globally set font-family in Bootstrap.

    -

    Will be used to calculate font sizes throughout Bootstrap.

    +

    Used to calculate font-size throughout Bootstrap.

    -

    Will be used to calculate line heights throughout Bootstrap. Default is ˜14/20.

    -
    -
    +

    Used to calculate line-height throughout Bootstrap.

    -

    Choose a separate font weight for headings.

    +

    Choose a separate font-weight for headings.

    -

    Choose a separate line height for headings.

    +

    Choose a separate line-height for headings.

    +

    Colors

    @@ -439,15 +437,16 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Define your preferred colors for standard text and links.

    -

    Color for all standard text.

    +

    Global color set on the body.

    -

    Link color for links in standard text.

    +

    Global link color for text.

    -

    Hovered link color. Leave this blank to compute using @link-color.

    +

    Automatically darken links on hover via color function.

    +

    Media queries breakpoints

    Define the breakpoints at which your layout will change, adapting to different screen sizes.

    @@ -464,7 +463,8 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    The grid

    + +

    Grid system

    Define your custom responsive grid.

    @@ -481,6 +481,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Point at which the navbar stops collapsing.

    +

    Components

    Define common padding and border radius sizes and more.

    @@ -509,11 +510,17 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    +

    Active background color

    - - -

    Used for active or hovered items in places like navs or dropdowns.

    -

    Buttons

    +
    +
    + + +

    Used for active or hovered items in places like navs or dropdowns.

    +
    +
    + +

    Buttons

    For each of Bootstrap's buttons, define text, background and border color.

    @@ -563,7 +570,8 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    Form states and alerts

    + +

    Form states and alerts

    Define colors for form feedback states and, by default, alerts.

    @@ -599,7 +607,8 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    Alerts

    + +

    Alerts

    Define alert colors and border radius.

    Border radius

    @@ -638,10 +647,12 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    Navbar

    + +

    Navbar

    -

    The basics

    +

    Default navbar

    +

    Basics

    @@ -672,8 +683,8 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    Inverted variation

    -

    The basics

    +

    Inverted navbar

    +

    Basics

    @@ -702,28 +713,29 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -

    Tables

    + +

    Tables

    -
    +

    Default background color used for all tables.

    -
    -
    +

    Background color used for .table-striped.

    -
    +

    Background color used for .table-hover.

    + + +

    Border color for table and cell borders.

    - - -

    Border color for table and cell borders.

    -

    Forms

    + +

    Forms

    Background

    @@ -733,6 +745,11 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    <input disabled>background color

    + +

    Placeholder

    + + +

    Placeholder text color

    Border

    @@ -744,10 +761,8 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    <input>border radius

    - - -

    Placeholder text color

    -

    Dropdowns

    + +

    Dropdowns

    Background

    @@ -780,40 +795,30 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Dropdown divider top border color

    -
    -

    Dropdown divider bottom border color

    -

    Panels and wells

    -

    Panel background

    + +

    Panels and wells

    +

    Default panel styles

    -
    +

    Panel body background color

    -
    -

    Panel heading background color

    -
    -

    Panel footer background color

    -
    -

    Panel border

    -

    Panel border color

    -
    -

    Panel border radius

    @@ -821,94 +826,67 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Contextual panel colors

    -
    +
    +

    Primary

    Primary text color

    -
    -

    Primary border color

    -
    -

    Primary heading background color

    -
    -
    -
    -
    +

    Success

    Success text color

    -
    -

    Success border color

    -
    -

    Success heading background color

    +

    Info

    + + +

    Info text color

    + + +

    Info border color

    + + +

    Info heading background color

    -
    -
    -
    +
    +

    Warning

    Warning text color

    -
    -

    Warning border color

    -
    -

    Warning heading background color

    -
    -
    -
    -
    +

    Danger

    Danger text color

    -
    -

    Danger border color

    -
    -

    Danger heading background color

    -
    -
    - - -

    Info text color

    -
    -
    - - -

    Info border color

    -
    -
    - - -

    Info heading background color

    -
    -
    -

    Well background

    + +

    Wells

    -

    Jumbotron

    + +

    Jumbotron

    @@ -926,7 +904,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Jumbotron lead paragraph color

    -

    Modals

    +

    Modals

    @@ -944,7 +922,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Modal title line-height

    -

    List group

    +

    List group

    Background

    @@ -984,7 +962,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Text color of active list elements

    -

    Thumbnails

    +

    Thumbnails

    @@ -1003,7 +981,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Thumbnail border radius

    -

    Progress bars

    +

    Progress bars

    @@ -1038,7 +1016,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Info progress bar color

    -

    Pagination

    +

    Pagination

    @@ -1056,7 +1034,8 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Active background color

    -

    Labels

    + +

    Labels

    @@ -1075,7 +1054,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Danger label background color

    -

    Tooltips and popovers

    +

    Tooltips and popovers

    Tooltip styles

    @@ -1126,7 +1105,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

    Popover outer arrow color

    -

    Other

    +

    Other

    -- cgit v1.2.3 From 79666385f761bd27a31fc363fa26cdbe5b037017 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Fri, 24 May 2013 08:14:11 -0400 Subject: Use base padding for input-group-addon class --- docs/assets/css/bootstrap.css | 2 +- less/forms.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b65d86480..53dcf2edc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1579,7 +1579,7 @@ select:focus:invalid:focus { } .input-group-addon { - padding: 6px 8px; + padding: 8px 12px; font-size: 14px; font-weight: normal; line-height: 1.428571429; diff --git a/less/forms.less b/less/forms.less index c61fd50fa..10a315da6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -359,7 +359,7 @@ select:focus:invalid { // ------------------------- .input-group-addon { .box-sizing(border-box); - padding: 6px 8px; + padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; font-weight: normal; line-height: @line-height-base; -- cgit v1.2.3 From f3e45c37780b12a3fa96e7d4578f38a883cba9a0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 24 May 2013 23:15:04 -0700 Subject: add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things --- docs/assets/js/bootstrap.js | 36 ++++++++++++++-------- docs/assets/js/bootstrap.min.js | 2 +- docs/javascript.html | 48 ++++++++++++++--------------- js/carousel.js | 2 +- js/collapse.js | 2 +- js/dropdown.js | 30 ++++++++++++------ js/scrollspy.js | 2 +- js/tests/unit/dropdown.js | 67 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 138 insertions(+), 51 deletions(-) diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index f19a123a4..b2b408672 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -433,7 +433,7 @@ // CAROUSEL DATA-API // ================= - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { var $this = $(this), href var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 var options = $.extend({}, $target.data(), $this.data()) @@ -590,7 +590,7 @@ // COLLAPSE DATA-API // ================= - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { var $this = $(this), href var target = $this.attr('data-target') || e.preventDefault() @@ -630,10 +630,7 @@ var backdrop = '.dropdown-backdrop' var toggle = '[data-toggle=dropdown]' var Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) + var $el = $(element).on('click.bs.dropdown', this.toggle) } Dropdown.prototype.toggle = function (e) { @@ -651,7 +648,14 @@ // if mobile we we use a backdrop because click events don't delegate $('
  • @@ -369,11 +369,11 @@ $('#myModal').on('hidden.bs.modal', function () { @@ -389,31 +389,31 @@ $('#myModal').on('hidden.bs.modal', function () { diff --git a/js/carousel.js b/js/carousel.js index f1d035e9a..628d72a12 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -185,7 +185,7 @@ // CAROUSEL DATA-API // ================= - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { var $this = $(this), href var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 var options = $.extend({}, $target.data(), $this.data()) diff --git a/js/collapse.js b/js/collapse.js index e37f25592..f8b65b393 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -139,7 +139,7 @@ // COLLAPSE DATA-API // ================= - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { var $this = $(this), href var target = $this.attr('data-target') || e.preventDefault() diff --git a/js/dropdown.js b/js/dropdown.js index 39c4ad258..2bb789a79 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -26,10 +26,7 @@ var backdrop = '.dropdown-backdrop' var toggle = '[data-toggle=dropdown]' var Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) + var $el = $(element).on('click.bs.dropdown', this.toggle) } Dropdown.prototype.toggle = function (e) { @@ -47,7 +44,14 @@ // if mobile we we use a backdrop because click events don't delegate $('