From: Mark Otto Date: Wed, 5 Dec 2012 19:05:10 +0000 (-0800) Subject: Merge branch '2.2.2-wip' into 3.0.0-wip X-Git-Tag: v3.0.0-rc1~850 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33e14fe5bfd7a7091ab491a961d66a2a2580f1de;p=thirdparty%2Fbootstrap.git Merge branch '2.2.2-wip' into 3.0.0-wip Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less --- 33e14fe5bfd7a7091ab491a961d66a2a2580f1de diff --cc README.md index c75f4090d9,39ccc6987d..de6973b85f --- a/README.md +++ b/README.md @@@ -1,5 -1,4 +1,4 @@@ - [Twitter Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) - ================= -# [Twitter Bootstrap v2.2.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) ++# [Twitter Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). diff --cc docs/assets/css/bootstrap.css index 9c4172fd3b,4a06a956be..c40d0fa756 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -2754,9 -3159,10 +2754,9 @@@ button.close background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-repeat: repeat-x; border: 1px solid #bbbbbb; - *border: 0; border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-bottom-color: #a2a2a2; @@@ -3602,12 -4292,16 +3615,12 @@@ input[type="button"].btn-block background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); } @@@ -3978,9 -4704,9 +3991,9 @@@ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); background-image: -webkit-linear-gradient(top, #222222, #111111); background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - border-color: #252525; + border-color: #111111; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); } @@@ -4124,22 -4854,24 +4137,22 @@@ margin: 0 0 20px; list-style: none; background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; } - .breadcrumb li { + .breadcrumb > li { display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; + text-shadow: 0 1px 0 #fff; } - .breadcrumb li:after { -.breadcrumb > .divider { ++.breadcrumb > li:after { + display: inline-block; padding: 0 5px; color: #ccc; + content: "\00a0 /"; } - .breadcrumb .active { + .breadcrumb > .active { color: #999999; } @@@ -4579,66 -5354,66 +4588,6 @@@ content: ""; } --.popover { -- /* -- &.top .arrow { - bottom: -@popover-arrow-width; - bottom: -@popoverArrowWidth; -- left: 50%; - margin-left: -@popover-arrow-width; - border-width: @popover-arrow-width @popover-arrow-width 0; - //border-top-color: @popover-arrow-color; - margin-left: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth 0; - //border-top-color: @popoverArrowColor; -- border-top-color: blue; -- &:after { - border-width: @popover-arrow-outer-width @popover-arrow-outer-width 0; - //border-top-color: @popover-arrow-outer-color; - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - //border-top-color: @popoverArrowOuterColor; -- border-top-color: red; - top: -@popover-arrow-width; - top: -@popoverArrowWidth; -- //bottom: -1px; - left: -@popover-arrow-outer-width; - left: -@popoverArrowOuterWidth; -- } -- } -- &.right .arrow { -- top: 50%; - left: -@popover-arrow-width; - margin-top: -@popover-arrow-width; - border-width: @popover-arrow-width @popover-arrow-width @popover-arrow-width 0; - border-right-color: @popover-arrow-color; - left: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; - border-right-color: @popoverArrowColor; -- &:after { - border-width: @popover-arrow-outer-width @popover-arrow-outer-width @popover-arrow-outer-width 0; - border-right-color: @popover-arrow-outer-color; - bottom: -@popover-arrow-outer-width; - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-right-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; -- left: -1px; -- } -- } -- &.bottom .arrow { - top: -@popover-arrow-width; - top: -@popoverArrowWidth; -- left: 50%; - margin-left: -@popover-arrow-width; - border-width: 0 @popover-arrow-width @popover-arrow-width; - border-bottom-color: @popover-arrow-color; - margin-left: -@popoverArrowWidth; - border-width: 0 @popoverArrowWidth @popoverArrowWidth; - border-bottom-color: @popoverArrowColor; -- &:after { - border-width: 0 @popover-arrow-outer-width @popover-arrow-outer-width; - border-bottom-color: @popover-arrow-outer-color; - border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-bottom-color: @popoverArrowOuterColor; -- top: -1px; - left: -@popover-arrow-outer-width; - left: -@popoverArrowOuterWidth; -- } -- } -- &.left .arrow { -- top: 50%; - right: -@popover-arrow-width; - margin-top: -@popover-arrow-width; - border-width: @popover-arrow-width 0 @popover-arrow-width @popover-arrow-width; - border-left-color: @popover-arrow-color; - right: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; - border-left-color: @popoverArrowColor; -- &:after { - border-width: @popover-arrow-outer-width 0 @popover-arrow-outer-width @popover-arrow-outer-width; - border-left-color: @popover-arrow-outer-color; - bottom: -@popover-arrow-outer-width; - border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-left-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; -- right: -1px; -- } -- }*/ -- --} -- .popover.top .arrow { bottom: -11px; left: 50%; @@@ -4922,11 -5733,14 +4871,11 @@@ a.badge:hover background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } diff --cc docs/assets/js/bootstrap.js index a44e4d3515,7431e97772..39637a6329 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@@ -1322,11 -1323,12 +1323,12 @@@ placement: 'right' , trigger: 'click' , content: '' - , template: '

' + , template: '

' }) - }(window.jQuery);/* ============================================================= + }(window.jQuery); + /* ============================================================= - * bootstrap-scrollspy.js v2.2.2 + * bootstrap-scrollspy.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. diff --cc docs/gallery.html index 4675591c1d,0000000000..8f1f230233 mode 100644,000000..100644 --- a/docs/gallery.html +++ b/docs/gallery.html @@@ -1,200 -1,0 +1,200 @@@ + + + + + Gallery · Bootstrap + + + + + + + + + + + + + - + + - - ++ ++ ++ + + + + + + +
+
+ + Bootstrap +
+ +
+
+
+ + +
+
+

Gallery

+

Showcase of sites using Bootstrap.

+
+
+ + +
+ +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --cc less/alerts.less index b8a74a8177,0116b191b3..34a830ce20 --- a/less/alerts.less +++ b/less/alerts.less @@@ -36,21 -36,31 +36,31 @@@ // ------------------------- .alert-success { - background-color: @successBackground; - border-color: @successBorder; - color: @successText; + background-color: @state-success-background; + border-color: @state-success-border; + color: @state-success-text; } + .alert-success h4 { - color: @successText; ++ color: @state-success-text; + } .alert-danger, .alert-error { - background-color: @errorBackground; - border-color: @errorBorder; - color: @errorText; + background-color: @state-error-background; + border-color: @state-error-border; + color: @state-error-text; } + .alert-danger h4, + .alert-error h4 { - color: @errorText; ++ color: @state-error-text; + } .alert-info { - background-color: @infoBackground; - border-color: @infoBorder; - color: @infoText; + background-color: @state-info-background; + border-color: @state-info-border; + color: @state-info-text; } + .alert-info h4 { - color: @infoText; ++ color: @state-info-text; + } // Block alerts diff --cc less/breadcrumbs.less index 9d2dd5a5fb,4c7c9a4a36..dea69138e7 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@@ -5,21 -5,20 +5,21 @@@ .breadcrumb { padding: 8px 15px; - margin: 0 0 @baseLineHeight; + margin: 0 0 @line-height-base; list-style: none; background-color: #f5f5f5; - .border-radius(@baseBorderRadius); + border-radius: @border-radius-base; - li { + > li { display: inline-block; - .ie7-inline-block(); - text-shadow: 0 1px 0 @white; - } - > .divider { - padding: 0 5px; - color: #ccc; + text-shadow: 0 1px 0 #fff; + &:after { + display: inline-block; + content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space + padding: 0 5px; + color: #ccc; + } } - .active { + > .active { color: @grayLight; } } diff --cc less/mixins.less index ab63757f68,b734bab2dc..63be2318ca --- a/less/mixins.less +++ b/less/mixins.less @@@ -133,7 -161,7 +133,7 @@@ // Mixin for form field states - .formFieldState(@text-color: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { ++.formFieldState(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) { // Set the text color .control-label, .help-block, @@@ -151,20 -179,20 +151,20 @@@ input, select, textarea { -- border-color: @borderColor; ++ border-color: @border-color; .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work &:focus { -- border-color: darken(@borderColor, 10%); -- @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); ++ border-color: darken(@border-color, 10%); ++ @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); .box-shadow(@shadow); } } // Give a small background color for input-prepend/-append .input-prepend .add-on, .input-append .add-on { - color: @textColor; - background-color: @backgroundColor; - border-color: @textColor; + color: @text-color; - background-color: @backgroundColor; ++ background-color: @background-color; + border-color: @text-color; } } @@@ -297,13 -357,13 +297,13 @@@ } // CSS3 Content Columns - .content-columns(@columnCount, @columnGap: @grid-gutter-width) { -.content-columns(@columnCount, @columnGap: @gridGutterWidth) { -- -webkit-column-count: @columnCount; -- -moz-column-count: @columnCount; -- column-count: @columnCount; -- -webkit-column-gap: @columnGap; -- -moz-column-gap: @columnGap; -- column-gap: @columnGap; ++.content-columns(@column-count, @column-gap: @grid-gutter-width) { ++ -webkit-column-count: @column-count; ++ -moz-column-count: @column-count; ++ column-count: @column-count; ++ -webkit-column-gap: @column-gap; ++ -moz-column-gap: @column-gap; ++ column-gap: @column-gap; } // Optional hyphenation @@@ -433,8 -517,8 +433,8 @@@ // ------------------------- // Vertically center elements in the navbar. // Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin. --.navbarVerticalAlign(@elementHeight) { - margin-top: (@navbar-height - @elementHeight) / 2; - margin-top: (@navbarHeight - @elementHeight) / 2; ++.navbarVerticalAlign(@element-height) { ++ margin-top: (@navbar-height - @element-height) / 2; } diff --cc less/popovers.less index 61b3f12833,4a23fad0f1..89c1721843 --- a/less/popovers.less +++ b/less/popovers.less @@@ -11,7 -11,8 +11,8 @@@ display: none; width: 236px; padding: 1px; + text-align: left; // Reset given new insertion method - background-color: @popoverBackground; + background-color: @popover-background; -webkit-background-clip: padding-box; -moz-background-clip: padding; background-clip: padding-box; @@@ -128,62 -126,62 +126,4 @@@ } } -- -- --/* -- &.top .arrow { - bottom: -@popover-arrow-width; - bottom: -@popoverArrowWidth; -- left: 50%; - margin-left: -@popover-arrow-width; - border-width: @popover-arrow-width @popover-arrow-width 0; - //border-top-color: @popover-arrow-color; - margin-left: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth 0; - //border-top-color: @popoverArrowColor; -- border-top-color: blue; -- &:after { - border-width: @popover-arrow-outer-width @popover-arrow-outer-width 0; - //border-top-color: @popover-arrow-outer-color; - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - //border-top-color: @popoverArrowOuterColor; -- border-top-color: red; - top: -@popover-arrow-width; - top: -@popoverArrowWidth; -- //bottom: -1px; - left: -@popover-arrow-outer-width; - left: -@popoverArrowOuterWidth; -- } -- } -- &.right .arrow { -- top: 50%; - left: -@popover-arrow-width; - margin-top: -@popover-arrow-width; - border-width: @popover-arrow-width @popover-arrow-width @popover-arrow-width 0; - border-right-color: @popover-arrow-color; - left: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; - border-right-color: @popoverArrowColor; -- &:after { - border-width: @popover-arrow-outer-width @popover-arrow-outer-width @popover-arrow-outer-width 0; - border-right-color: @popover-arrow-outer-color; - bottom: -@popover-arrow-outer-width; - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-right-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; -- left: -1px; -- } -- } -- &.bottom .arrow { - top: -@popover-arrow-width; - top: -@popoverArrowWidth; -- left: 50%; - margin-left: -@popover-arrow-width; - border-width: 0 @popover-arrow-width @popover-arrow-width; - border-bottom-color: @popover-arrow-color; - margin-left: -@popoverArrowWidth; - border-width: 0 @popoverArrowWidth @popoverArrowWidth; - border-bottom-color: @popoverArrowColor; -- &:after { - border-width: 0 @popover-arrow-outer-width @popover-arrow-outer-width; - border-bottom-color: @popover-arrow-outer-color; - border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-bottom-color: @popoverArrowOuterColor; -- top: -1px; - left: -@popover-arrow-outer-width; - left: -@popoverArrowOuterWidth; -- } -- } -- &.left .arrow { -- top: 50%; - right: -@popover-arrow-width; - margin-top: -@popover-arrow-width; - border-width: @popover-arrow-width 0 @popover-arrow-width @popover-arrow-width; - border-left-color: @popover-arrow-color; - right: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; - border-left-color: @popoverArrowColor; -- &:after { - border-width: @popover-arrow-outer-width 0 @popover-arrow-outer-width @popover-arrow-outer-width; - border-left-color: @popover-arrow-outer-color; - bottom: -@popover-arrow-outer-width; - border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-left-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; -- right: -1px; -- } -- }*/ }