diff options
Diffstat (limited to 'less')
| -rw-r--r-- | less/bootstrap.less | 6 | ||||
| -rw-r--r-- | less/button-groups.less | 6 | ||||
| -rw-r--r-- | less/carousel.less | 25 | ||||
| -rw-r--r-- | less/media.less | 4 | ||||
| -rw-r--r-- | less/navbar.less | 1 | ||||
| -rw-r--r-- | less/responsive-utilities.less | 7 |
6 files changed, 41 insertions, 8 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index 68d595c2c1..110147edd3 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -8,13 +8,13 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ -// CSS Reset -@import "reset.less"; - // Core variables and mixins @import "variables.less"; // Modify this for custom colors, font-sizes, etc @import "mixins.less"; +// CSS Reset +@import "reset.less"; + // Grid system and page structure @import "scaffolding.less"; @import "grid.less"; diff --git a/less/button-groups.less b/less/button-groups.less index f9bcd11625..04f3e5d72a 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -146,8 +146,6 @@ margin-left: 0; } // Carets in other button sizes -.btn-mini .caret, -.btn-small .caret, .btn-large .caret { margin-top: 6px; } @@ -156,6 +154,10 @@ border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} // Upside down carets for .dropup .dropup .btn-large .caret { border-bottom-width: 5px; diff --git a/less/carousel.less b/less/carousel.less index 264631fad2..e175f94775 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -119,6 +119,31 @@ } } +// Carousel indicator pips +// ----------------------------- +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; + + li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255,255,255,.25); + border-radius: 5px; + } + .active { + background-color: #fff; + } +} // Caption for text below images diff --git a/less/media.less b/less/media.less index e99a68b69e..21063eb2ba 100644 --- a/less/media.less +++ b/less/media.less @@ -36,10 +36,10 @@ // Media image alignment // ------------------------- -.media .pull-left { +.media > .pull-left { margin-right: 10px; } -.media .pull-right { +.media > .pull-right { margin-left: 10px; } diff --git a/less/navbar.less b/less/navbar.less index d63c5a8e9f..943400dfbb 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -222,7 +222,6 @@ } .navbar .nav .dropdown-toggle .caret { margin-top: 8px; - } // Hover diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 2c3f6c15fe..1ed1a13696 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -3,6 +3,13 @@ // -------------------------------------------------- +// IE10 Metro responsive +// Required for Windows 8 Metro split-screen snapping with IE10 +// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ +@-ms-viewport{ + width: device-width; +} + // Hide from screenreaders and browsers // Credit: HTML5 Boilerplate .hidden { |