diff --git a/_config.yml b/_config.yml index 6b6c87acc1..dd064d3083 100644 --- a/_config.yml +++ b/_config.yml @@ -15,9 +15,6 @@ repo: https://github.com/twbs/bootstrap download: https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip download_dist: http://getbootstrap.com/bs-v3.0.0-rc.2-dist.zip -examples: http://examples.getbootstrap.com -examples_repo: https://github.com/twbs/bootstrap-examples - glyphicons: http://glyphicons.getbootstrap.com glyphicons_repo: https://github.com/twbs/bootstrap-glyphicons diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 2024883708..f5226ec5e6 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -20,6 +20,7 @@
  • Ex: Stacked-to-horizonal
  • Ex: Mobile-desktop
  • Ex: Mobile, tablet, desktop
  • +
  • Responsive column resets
  • Offset columns
  • Nested columns
  • Column ordering
  • @@ -47,7 +48,7 @@
  • Bordered tables
  • Hover rows
  • Condensed tables
  • -
  • Contextual row classes
  • +
  • Contextual classes
  • diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index ad574b6211..fca38bde36 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -11,6 +11,12 @@
  • Basic template
  • +
  • + Examples +
  • +
  • + Disabling responsiveness +
  • Browser support
  • diff --git a/_layouts/default.html b/_layouts/default.html index d254f2e4fe..c2ff9f8084 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -26,7 +26,7 @@
    - +
    -
    +
    {{ content }} -
    +
    diff --git a/_layouts/home.html b/_layouts/home.html index 2d04e5f733..b51eea2438 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -25,7 +25,7 @@ GitHub project
  • - Examples + Examples
  • Glyphicons diff --git a/assets/css/docs.css b/assets/css/docs.css index e346d0333e..f3e3b13bb0 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -178,6 +178,7 @@ body { margin-top: 15px; } .bs-customizer input[type="text"] { + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; background-color: #fafafa; } .bs-customizer .help-block { @@ -188,6 +189,10 @@ body { text-align: center; } +#less-section label { + font-weight: normal; +} + /* Docs pages and sections @@ -343,6 +348,17 @@ body { } +/* Examples grid +-------------------------------------------------- */ + +.bs-examples h4 { + margin-bottom: 5px; +} +.bs-examples p { + margin-bottom: 20px; +} + + /* Special grid styles -------------------------------------------------- */ @@ -368,7 +384,7 @@ body { .bs-example { position: relative; padding: 45px 15px 15px; - margin: 0 -15px -1px; + margin: 0 -15px 15px; background-color: #fafafa; box-shadow: inset 0 3px 6px rgba(0,0,0,.05); border-color: #e5e5e5 #eee #eee; @@ -390,7 +406,7 @@ body { /* Tweak display of the examples */ .bs-example + .highlight { - margin: 0 -15px; + margin: -15px -15px 15px; border-radius: 0; border-width: 0 0 1px; } @@ -400,16 +416,15 @@ body { .bs-example > ul:last-child, .bs-example > ol:last-child, .bs-example > blockquote:last-child, -.bs-example > input:last-child, -.bs-example > select:last-child, -.bs-example > textarea:last-child, +.bs-example > .form-control:last-child, .bs-example > .table:last-child, .bs-example > .navbar:last-child .bs-example > .jumbotron:last-child, .bs-example > .alert:last-child, .bs-example > .panel:last-child, .bs-example > .list-group:last-child, -.bs-example > .well:last-child { +.bs-example > .well:last-child, +.bs-example > .progress:last-child { margin-bottom: 0; } .bs-example > p > .close { @@ -437,6 +452,23 @@ body { margin: 0; } +/* Images */ +.bs-example > .img-circle, +.bs-example > .img-rounded, +.bs-example > .img-thumbnail { + margin: 5px; +} + +/* Buttons */ +.bs-example > .btn, +.bs-example > .btn-group { + margin-top: 5px; + margin-bottom: 5px; +} +.bs-example > .btn-toolbar + .btn-toolbar { + margin-top: 10px; +} + /* Forms */ .bs-example-control-sizing select, .bs-example-control-sizing input[type="text"] + input[type="text"] { @@ -445,6 +477,9 @@ body { .bs-example-form .input-group { margin-bottom: 10px; } +.bs-example > textarea.form-control { + resize: vertical; +} /* List groups */ .bs-example > .list-group { @@ -459,7 +494,6 @@ body { .bs-navbar-bottom-example { z-index: 1; padding: 0; - min-height: 110px; overflow: hidden; /* cut the drop shadows off */ } .bs-navbar-top-example .navbar-fixed-top, @@ -468,33 +502,35 @@ body { margin-left: 0; margin-right: 0; } -.bs-navbar-top-example .navbar-fixed-top { - top: -1px; -} -.bs-navbar-bottom-example .navbar-fixed-bottom { - bottom: -1px; -} .bs-navbar-top-example { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + padding-bottom: 45px; } .bs-navbar-top-example:after { top: auto; bottom: 15px; - -webkit-border-radius: 0 4px 0 4px; - -moz-border-radius: 0 4px 0 4px; - border-radius: 0 4px 0 4px; +} +.bs-navbar-top-example .navbar-fixed-top { + top: -1px; } .bs-navbar-bottom-example { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + padding-top: 45px; +} +.bs-navbar-bottom-example .navbar-fixed-bottom { + bottom: -1px; } .bs-navbar-bottom-example .navbar { margin-bottom: 0; } +@media (min-width: 768px) { + .bs-navbar-top-example { + border-radius: 0 0 4px 4px; + } + .bs-navbar-bottom-example { + border-radius: 4px 4px 0 0; + } +} + /* Example modals */ .bs-example-modal { background-color: #f5f5f5; @@ -515,19 +551,11 @@ body { } /* Example dropdowns */ -.bs-example > .dropdown > .dropdown-menu, -.bs-example-submenu > .pull-left > .dropup > .dropdown-menu, -.bs-example-submenu > .pull-left > .dropdown > .dropdown-menu { +.bs-example > .dropdown > .dropdown-menu { position: static; display: block; margin-bottom: 5px; } -.bs-example-submenu { - min-height: 230px; -} -.bs-example-submenu > .pull-left + .pull-left { - margin-left: 20px; -} /* Example tabbable tabs */ .bs-example-tabs .nav-tabs { @@ -538,6 +566,10 @@ body { .bs-example-tooltips { text-align: center; } +.bs-example-tooltips > .btn { + margin-top: 5px; + margin-bottom: 5px; +} /* Popovers */ .bs-example-popover { @@ -553,19 +585,6 @@ body { } - -/* Example templates --------------------------------------------------- */ - -.bs-examples h4 { - margin-bottom: 5px; -} -.bs-examples p { - margin-bottom: 20px; -} - - - /* Responsive docs -------------------------------------------------- */ @@ -599,6 +618,10 @@ body { border-bottom: 0; } } +.bs-table-scrollable .highlight pre { + white-space: normal; +} + /* Related: responsive utilities tables */ .table code { @@ -645,13 +668,25 @@ body { text-align: center; border-radius: 4px; } -.responsive-utilities-test.visible-on [class*="hidden"], -.responsive-utilities-test.hidden-on [class*="visible"] { +.visible-on .col-xs-6 .hidden-xs, +.visible-on .col-xs-6 .hidden-sm, +.visible-on .col-xs-6 .hidden-md, +.visible-on .col-xs-6 .hidden-lg, +.hidden-on .col-xs-6 .visible-xs, +.hidden-on .col-xs-6 .visible-sm, +.hidden-on .col-xs-6 .visible-md, +.hidden-on .col-xs-6 .visible-lg { color: #999; border: 1px solid #ddd; } -.responsive-utilities-test.visible-on [class*="visible"], -.responsive-utilities-test.hidden-on [class*="hidden"] { +.visible-on .col-xs-6 .visible-xs, +.visible-on .col-xs-6 .visible-sm, +.visible-on .col-xs-6 .visible-md, +.visible-on .col-xs-6 .visible-lg, +.hidden-on .col-xs-6 .hidden-xs, +.hidden-on .col-xs-6 .hidden-sm, +.hidden-on .col-xs-6 .hidden-md, +.hidden-on .col-xs-6 .hidden-lg { color: #468847; background-color: #dff0d8; border: 1px solid #d6e9c6; @@ -804,7 +839,7 @@ body { } .bs-example + .prettyprint, .bs-example + .highlight { - margin-top: 0; + margin-top: -16px; margin-left: 0; margin-right: 0; border-width: 1px; @@ -858,9 +893,7 @@ body { width: 330px !important; min-height: 132px; } -} -@media screen and (min-width: 992px) and (min-height: 700px) { /* Show the hidden subnavs when space allows it */ .bs-sidebar .nav > .active > ul { display: block; diff --git a/assets/js/application.js b/assets/js/application.js index 66456ddb85..81b644b97a 100644 --- a/assets/js/application.js +++ b/assets/js/application.js @@ -50,7 +50,8 @@ // tooltip demo $('.tooltip-demo').tooltip({ - selector: "[data-toggle=tooltip]" + selector: "[data-toggle=tooltip]", + container: "body" }) $('.tooltip-test').tooltip() diff --git a/bower.json b/bower.json index a7f3f769a0..7ba448d27c 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "version": "3.0.0", - "main": ["./dist/js/bootstrap.min.js", "./dist/css/bootstrap.min.css"], + "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css"], "ignore": [ "**/.*" ], diff --git a/components.html b/components.html index 17a96e86bd..ead8cf1418 100644 --- a/components.html +++ b/components.html @@ -2,7 +2,7 @@ layout: default title: Components slug: components -lead: "Dozens of reusable components built to provide iconography, dropdowns, navigation, alerts, popovers, and much more." +lead: "Over a dozen reusable components built to provide iconography, dropdowns, navigation, alerts, popovers, and much more." base_url: "../" --- @@ -160,34 +160,40 @@ base_url: "../"

    Button group sizing

    Instead of applying button sizing classes to every button in a group, just add .btn-group-* to the .btn-group.

    -
    - - - +
    +
    + + + +
    -
    - - - +
    +
    + + + +
    -
    - - - +
    +
    + + + +
    -
    - - - +
    +
    + + + +
    {% highlight html %} -
    -
    ...
    -
    ...
    -
    ...
    -
    ...
    -
    +
    ...
    +
    ...
    +
    ...
    +
    ...
    {% endhighlight %}

    Nested button groups

    @@ -324,58 +330,66 @@ base_url: "../"

    Single button dropdowns

    Turn a button into a dropdown toggle with some basic markup changes.

    {% highlight html %} @@ -396,69 +410,78 @@ base_url: "../"

    Split button dropdowns

    Similarly, create split button dropdowns with the same markup changes, only with a separate button.

    {% highlight html %}
    - - +
    +
    +
    +
    +
  • -