From 27d92f45a58861231a2e33e2a78764d16c7881e2 Mon Sep 17 00:00:00 2001 From: "Max F. Albrecht" <1@178.is> Date: Wed, 21 Aug 2013 14:08:43 +0200 Subject: code.less: also set default monospace font for `` and `` --- less/code.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index d6661d2b9..8b0371871 100644 --- a/less/code.less +++ b/less/code.less @@ -5,7 +5,9 @@ // Inline and block code styles code, -pre { +kdb, +pre, +samp { font-family: @font-family-monospace; } -- cgit v1.2.3 From afb6cf1d01c28bd0a1c6803f727eb7408b70c16e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Sep 2013 16:58:56 -0700 Subject: Match order of vars to order of components; darken some alert borders --- less/variables.less | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index d0f921481..26f2ed17a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -373,14 +373,6 @@ // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #468847; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -389,6 +381,14 @@ @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #c09853; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(spin(@state-warning-bg, -10), 5%); + +@state-danger-text: #b94a48; +@state-danger-bg: #f2dede; +@state-danger-border: darken(spin(@state-danger-bg, -10), 5%); + // Tooltips // ------------------------- -- cgit v1.2.3 From fff5e540f5fb29ea3c2de713c0d6b10642c90e75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Sep 2013 20:03:52 -0700 Subject: fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally --- less/tables.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index ace7e4ba1..35291750a 100644 --- a/less/tables.less +++ b/less/tables.less @@ -194,7 +194,6 @@ table { // Tighten up spacing and give a background color > .table { margin-bottom: 0; - background-color: #fff; // Ensure the content doesn't wrap > thead, -- cgit v1.2.3 From 886e7037f6cfa5e63ae190ee1a9a63fb7f07dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 10 Sep 2013 23:27:04 +0200 Subject: Remove display: block from address
is already displayed as block in all browsers (UAs). --- less/type.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 2f154516c..9a6656b63 100644 --- a/less/type.less +++ b/less/type.less @@ -264,7 +264,6 @@ blockquote:after { // Addresses address { - display: block; margin-bottom: @line-height-computed; font-style: normal; line-height: @line-height-base; -- cgit v1.2.3 From 52516ecebaaa8efcc5bde1a48b81c8a95c961a82 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 10 Sep 2013 16:20:36 -0700 Subject: add missing comma in carousel.less; fixes #10562 --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 9fff41e73..c66745c0b 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -195,7 +195,7 @@ // Scale up the controls a smidge .carousel-control { .glyphicons-chevron-left, - .glyphicons-chevron-right + .glyphicons-chevron-right, .icon-prev, .icon-next { width: 30px; -- cgit v1.2.3 From 2b5d7d23d0e6de93cd0ba8b1d4eee480e4cb504d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 10 Sep 2013 19:21:44 -0700 Subject: generate CSS banners via Gruntfile; fixes #10101 --- less/bootstrap.less | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'less') diff --git a/less/bootstrap.less b/less/bootstrap.less index 1344b462f..b368b8710 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,13 +1,3 @@ -/*! - * Bootstrap v3.0.0 - * - * Copyright 2013 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - // Core variables and mixins @import "variables.less"; @import "mixins.less"; -- cgit v1.2.3 From c10238c95f24b42c6caea9052ebd2a85c5650fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Sep 2013 09:54:38 +0200 Subject: Use @screen-sm-min in forms --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 32391942b..cb9d30a37 100644 --- a/less/forms.less +++ b/less/forms.less @@ -355,7 +355,7 @@ input[type="checkbox"], } // Only right align form labels here when the columns stop stacking - @media (min-width: @screen-sm) { + @media (min-width: @screen-sm-min) { .control-label { text-align: right; } -- cgit v1.2.3 From b8a33eb1e075d10fbf06546b19034d4217f6bb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Sep 2013 10:29:15 +0200 Subject: Eagle eye --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index c66745c0b..59e4fadf7 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -190,7 +190,7 @@ // Scale up controls for tablets and up -@media screen and (min-width: @screen-sm) { +@media screen and (min-width: @screen-sm-min) { // Scale up the controls a smidge .carousel-control { -- cgit v1.2.3 From e2e1c80d1a5f8949f699f2286c3a959353ed4913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Sep 2013 10:32:08 +0200 Subject: Another fixup --- less/grid.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index a1ec1b298..39f1049b6 100644 --- a/less/grid.less +++ b/less/grid.less @@ -114,7 +114,7 @@ // Note that `.col-sm-12` doesn't get floated on purpose--there's no need since // it's full-width. -@media (min-width: @screen-sm) { +@media (min-width: @screen-sm-min) { .container { width: @container-sm; } @@ -192,7 +192,7 @@ // Note that `.col-md-12` doesn't get floated on purpose--there's no need since // it's full-width. -@media (min-width: @screen-md) { +@media (min-width: @screen-md-min) { .container { width: @container-md; } -- cgit v1.2.3 From a0653ef018bd588d3c6bfb2468c9f3f6ad29fcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Sep 2013 10:33:30 +0200 Subject: Rumbo Jumbo --- less/jumbotron.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 53289fb2c..3a2365f05 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -24,7 +24,7 @@ border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container } - @media screen and (min-width: @screen-sm) { + @media screen and (min-width: @screen-sm-min) { padding-top: (@jumbotron-padding * 1.6); padding-bottom: (@jumbotron-padding * 1.6); -- cgit v1.2.3 From d9613268b00093d319a14be121c6bd608b02d176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Sep 2013 10:35:12 +0200 Subject: Again? --- less/modals.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index f886fb25c..624ba1ea5 100644 --- a/less/modals.less +++ b/less/modals.less @@ -125,7 +125,7 @@ } // Scale up the modal -@media screen and (min-width: @screen-sm) { +@media screen and (min-width: @screen-sm-min) { .modal-dialog { left: 50%; -- cgit v1.2.3 From 50fcaba24f1836aea26bd928156ec9ab0740bff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Sep 2013 10:38:42 +0200 Subject: The last --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 9a6656b63..5ad6a4669 100644 --- a/less/type.less +++ b/less/type.less @@ -15,7 +15,7 @@ p { font-weight: 200; line-height: 1.4; - @media (min-width: @screen-sm) { + @media (min-width: @screen-sm-min) { font-size: (@font-size-base * 1.5); } } -- cgit v1.2.3 From d8202dd62618d086c3cf334f90ba55379f1fd0b1 Mon Sep 17 00:00:00 2001 From: gribelu Date: Wed, 11 Sep 2013 16:47:13 +0300 Subject: Fixed hardcoded tooltip arrow positioning Tooltip Arrow positioning was hardcoded to 5px instead of using @tooltip-arrow-width. --- less/tooltip.less | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/tooltip.less b/less/tooltip.less index 5a95b8462..ce793cb93 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -14,10 +14,10 @@ .opacity(0); &.in { .opacity(.9); } - &.top { margin-top: -3px; padding: 5px 0; } - &.right { margin-left: 3px; padding: 0 5px; } - &.bottom { margin-top: 3px; padding: 5px 0; } - &.left { margin-left: -3px; padding: 0 5px; } + &.top { margin-top: -3px; padding: @tooltip-arrow-width 0; } + &.right { margin-left: 3px; padding: 0 @tooltip-arrow-width; } + &.bottom { margin-top: 3px; padding: @tooltip-arrow-width 0; } + &.left { margin-left: -3px; padding: 0 @tooltip-arrow-width; } } // Wrapper for the tooltip content @@ -49,13 +49,13 @@ } &.top-left .tooltip-arrow { bottom: 0; - left: 5px; + left: @tooltip-arrow-width; border-width: @tooltip-arrow-width @tooltip-arrow-width 0; border-top-color: @tooltip-arrow-color; } &.top-right .tooltip-arrow { bottom: 0; - right: 5px; + right: @tooltip-arrow-width; border-width: @tooltip-arrow-width @tooltip-arrow-width 0; border-top-color: @tooltip-arrow-color; } @@ -82,13 +82,13 @@ } &.bottom-left .tooltip-arrow { top: 0; - left: 5px; + left: @tooltip-arrow-width; border-width: 0 @tooltip-arrow-width @tooltip-arrow-width; border-bottom-color: @tooltip-arrow-color; } &.bottom-right .tooltip-arrow { top: 0; - right: 5px; + right: @tooltip-arrow-width; border-width: 0 @tooltip-arrow-width @tooltip-arrow-width; border-bottom-color: @tooltip-arrow-color; } -- cgit v1.2.3 From 5d1707a25c0ee68644a182196439a86be1beafbd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 11:09:50 -0700 Subject: Remove old and unused .prettyprint styles in code.less (per #10566) --- less/code.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index d6661d2b9..f1cc4f570 100644 --- a/less/code.less +++ b/less/code.less @@ -33,11 +33,6 @@ pre { border: 1px solid @pre-border-color; border-radius: @border-radius-base; - // Make prettyprint styles more spaced out for readability - &.prettyprint { - margin-bottom: @line-height-computed; - } - // Account for some code outputs that place code tags in pre tags code { padding: 0; -- cgit v1.2.3 From 2dc7ab4bbb70abfcdb0aa179935c72ddbb3e66e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 14:46:31 -0700 Subject: fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs --- less/responsive-utilities.less | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'less') diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 02bb39bfb..a56c02887 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -3,36 +3,34 @@ // -------------------------------------------------- -// IE10 Metro responsive -// Required for Windows 8 Metro split-screen snapping with IE10 +// IE10 in Windows (Phone) 8 // +// Support for responsive views via media queries is kind of borked in IE10, for +// both Surface/desktop in split view and Windows Phone 8. This particular fix +// must be accompanied by a snippet of JavaScript to sniff the user agent and +// apply some condtional CSS to *only* the Surface/desktop Windows 8. Look at +// our Getting Started page for more information on this bug. +// +// For more information, see the following: +// +// Issue: https://github.com/twbs/bootstrap/issues/10497 // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ -@-ms-viewport{ + +@-ms-viewport { width: device-width; } -// IE10 on Windows Phone 8 -// IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In -// other words, say on a Lumia, you'll get 768px as the device width, -// meaning users will see the tablet styles and not phone styles. -// -// Alternatively you can override this with JS (see source below), but -// we won't be doing that here given our limited scope. -// -// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ -@media screen and (max-width: 400px) { - @-ms-viewport{ - width: 320px; - } -} // Hide from screenreaders and browsers +// // Credit: HTML5 Boilerplate + .hidden { display: none !important; visibility: hidden !important; } + // Visibility utilities .visible-xs { -- cgit v1.2.3 From 6e064894db4a67ed2c1180212426a076a494d300 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 14:56:02 -0700 Subject: remove unnecessary right and left properties on .modal-dialog --- less/modals.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index f886fb25c..0ba896525 100644 --- a/less/modals.less +++ b/less/modals.less @@ -128,8 +128,6 @@ @media screen and (min-width: @screen-sm) { .modal-dialog { - left: 50%; - right: auto; width: 600px; padding-top: 30px; padding-bottom: 30px; -- cgit v1.2.3 From 6519303549732d61de9e2905916f64a7d5b76910 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 14:46:31 -0700 Subject: fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs --- less/responsive-utilities.less | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'less') diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 02bb39bfb..138562eb8 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -3,36 +3,34 @@ // -------------------------------------------------- -// IE10 Metro responsive -// Required for Windows 8 Metro split-screen snapping with IE10 +// IE10 in Windows (Phone) 8 // +// Support for responsive views via media queries is kind of borked in IE10, for +// both Surface/desktop in split view and for Windows Phone 8. This particular fix +// must be accompanied by a snippet of JavaScript to sniff the user agent and +// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at +// our Getting Started page for more information on this bug. +// +// For more information, see the following: +// +// Issue: https://github.com/twbs/bootstrap/issues/10497 // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ -@-ms-viewport{ + +@-ms-viewport { width: device-width; } -// IE10 on Windows Phone 8 -// IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In -// other words, say on a Lumia, you'll get 768px as the device width, -// meaning users will see the tablet styles and not phone styles. -// -// Alternatively you can override this with JS (see source below), but -// we won't be doing that here given our limited scope. -// -// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ -@media screen and (max-width: 400px) { - @-ms-viewport{ - width: 320px; - } -} // Hide from screenreaders and browsers +// // Credit: HTML5 Boilerplate + .hidden { display: none !important; visibility: hidden !important; } + // Visibility utilities .visible-xs { -- cgit v1.2.3 From 725e2b9ccf66cd54e64ff5d15bf8b2744b5122cd Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 11 Sep 2013 16:24:03 -0700 Subject: re-fix typo in comment --- less/responsive-utilities.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 6cacabec7..6b4566266 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -8,7 +8,7 @@ // Support for responsive views via media queries is kind of borked in IE10, for // Surface/desktop in split view and for Windows Phone 8. This particular fix // must be accompanied by a snippet of JavaScript to sniff the user agent and -// apply some condtional CSS to *only* the Surface/desktop Windows 8. Look at +// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at // our Getting Started page for more information on this bug. // // For more information, see the following: -- cgit v1.2.3 From 291a23aa4fc62e7593d4471af2b438aa1017a86a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 21:14:10 -0700 Subject: Massive customizer audit and overhaul MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I probably missed a few things and screwed up a few others, but this takes the place of much of #9910. I haven't added many variables—that should be reserved for v3.1—but I have rejiggered the layout, added missing ones, corrected wrong values, etc. /cc @cvrebert @juthilo @saas786 --- less/variables.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 26f2ed17a..4fffe52bb 100644 --- a/less/variables.less +++ b/less/variables.less @@ -256,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #777; -@navbar-default-bg: #f8f8f8; -@navbar-default-border: darken(@navbar-default-bg, 6.5%); @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: #777; +@navbar-default-bg: #f8f8f8; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #777; @navbar-default-link-hover-color: #333; @@ -585,8 +586,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; -- cgit v1.2.3 From 28e5572bf4de4e98b62421dc7d33e8b353fff382 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 23:11:18 -0700 Subject: Fixes #10492: Account for responsive tables in panels --- less/panels.less | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index adf463216..bdbeb5c07 100644 --- a/less/panels.less +++ b/less/panels.less @@ -56,13 +56,16 @@ // watch it go full width. .panel { - > .table { + > .table, + > .table-responsive { margin-bottom: 0; } - > .panel-body + .table { + > .panel-body + .table, + > .panel-body + .table-responsive { border-top: 1px solid @table-border-color; } - > .table-bordered { + > .table-bordered, + > .table-responsive > .table-bordered { border: 0; > thead, > tbody, -- cgit v1.2.3 From 5caf7800814b0384297bfd69f83308985f510ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 12 Sep 2013 09:52:33 +0200 Subject: @grid-float-breakpoint need to be @screen-sm-min :smile: --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 4fffe52bb..b84584395 100644 --- a/less/variables.less +++ b/less/variables.less @@ -247,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-sm; +@grid-float-breakpoint: @screen-sm-min; // Navbar -- cgit v1.2.3 From 4d4976fdcc3f2e88408a7993854a7cfbafd0c6ec Mon Sep 17 00:00:00 2001 From: Jake Buob Date: Fri, 13 Sep 2013 15:56:30 -0400 Subject: Make nav pills border-radius border-radius-base --- less/navs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index bdab92606..4c514fd1a 100644 --- a/less/navs.less +++ b/less/navs.less @@ -120,7 +120,7 @@ // Links rendered as pills > a { - border-radius: 5px; + border-radius: @border-radius-base; } + li { margin-left: 2px; -- cgit v1.2.3 From 2381ab088bda18b4fa3fa041cc3f42ae4c959502 Mon Sep 17 00:00:00 2001 From: Jake Buob Date: Fri, 13 Sep 2013 15:39:27 -0400 Subject: Add nav-pills-border-radius variable --- less/navs.less | 2 +- less/variables.less | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 4c514fd1a..e60f9f8f0 100644 --- a/less/navs.less +++ b/less/navs.less @@ -120,7 +120,7 @@ // Links rendered as pills > a { - border-radius: @border-radius-base; + border-radius: @nav-pills-border-radius; } + li { margin-left: 2px; diff --git a/less/variables.less b/less/variables.less index b84584395..1a998b946 100644 --- a/less/variables.less +++ b/less/variables.less @@ -336,6 +336,7 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; @nav-pills-active-link-hover-color: @component-active-color; -- cgit v1.2.3 From bff23ee1fef96ba97ec15d2bbe2b81b4f852e1e1 Mon Sep 17 00:00:00 2001 From: Soheil Behnezhad Date: Mon, 16 Sep 2013 13:47:48 +0430 Subject: Remove unnecessary semicolons --- less/theme.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 71d1d1e6b..9c1856bde 100644 --- a/less/theme.less +++ b/less/theme.less @@ -31,7 +31,7 @@ } // Mixin for generating new styles -.btn-styles(@btn-color: #555;) { +.btn-styles(@btn-color: #555) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); background-repeat: repeat-x; border-color: darken(@btn-color, 14%); @@ -59,7 +59,7 @@ } // Apply the mixin to the buttons -.btn-default { .btn-styles(@btn-default-bg;); text-shadow: 0 1px 0 #fff; border-color: #ccc; } +.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; } .btn-primary { .btn-styles(@btn-primary-bg); } .btn-success { .btn-styles(@btn-success-bg); } .btn-warning { .btn-styles(@btn-warning-bg); } -- cgit v1.2.3 From 0c39045222f5fcea5cddb9b1bbd1c17d53731cdb Mon Sep 17 00:00:00 2001 From: Soheil Behnezhad Date: Mon, 16 Sep 2013 16:25:53 +0430 Subject: Remove some more unnecessary semicolons --- less/theme.less | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 9c1856bde..adc5a1db1 100644 --- a/less/theme.less +++ b/less/theme.less @@ -31,7 +31,7 @@ } // Mixin for generating new styles -.btn-styles(@btn-color: #555) { +.btn-styles(@btn-color: #555;) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); background-repeat: repeat-x; border-color: darken(@btn-color, 14%); @@ -59,7 +59,7 @@ } // Apply the mixin to the buttons -.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; } +.btn-default { .btn-styles(@btn-default-bg;); text-shadow: 0 1px 0 #fff; border-color: #ccc; } .btn-primary { .btn-styles(@btn-primary-bg); } .btn-success { .btn-styles(@btn-success-bg); } .btn-warning { .btn-styles(@btn-warning-bg); } @@ -103,13 +103,13 @@ // Default navbar .navbar-default { - #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;); + #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg); border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); .navbar-nav > .active > a { - #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%);); + #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%)); .box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); } } @@ -120,10 +120,10 @@ // Inverted navbar .navbar-inverse { - #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg;); + #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg); .navbar-nav > .active > a { - #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%);); + #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); .box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); } @@ -173,7 +173,7 @@ // Give the progress background some depth .progress { - #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg;) + #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg) } // Mixin for generating new styles @@ -237,7 +237,7 @@ // -------------------------------------------------- .well { - #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg;); + #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg); border-color: darken(@well-bg, 10%); @shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1); .box-shadow(@shadow); -- cgit v1.2.3 From cc6991133544e1ae23f3a14b086c5ef103f14dd6 Mon Sep 17 00:00:00 2001 From: Soheil Behnezhad Date: Mon, 16 Sep 2013 16:37:03 +0430 Subject: Derp, there were more --- less/theme.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index adc5a1db1..b510b7a8d 100644 --- a/less/theme.less +++ b/less/theme.less @@ -31,7 +31,7 @@ } // Mixin for generating new styles -.btn-styles(@btn-color: #555;) { +.btn-styles(@btn-color: #555) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); background-repeat: repeat-x; border-color: darken(@btn-color, 14%); @@ -59,7 +59,7 @@ } // Apply the mixin to the buttons -.btn-default { .btn-styles(@btn-default-bg;); text-shadow: 0 1px 0 #fff; border-color: #ccc; } +.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; } .btn-primary { .btn-styles(@btn-primary-bg); } .btn-success { .btn-styles(@btn-success-bg); } .btn-warning { .btn-styles(@btn-warning-bg); } -- cgit v1.2.3 From ae3a9169e077a74baa1e2702ccdd06f8a4c91e3e Mon Sep 17 00:00:00 2001 From: Steve S Date: Mon, 16 Sep 2013 09:16:53 -0500 Subject: Simplified CSS responsive-invisibility mixin --- less/mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 42523c2aa..74e7177cd 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -559,8 +559,8 @@ } .responsive-invisibility() { - display: none !important; - tr& { display: none !important; } + &, + tr&, th&, td& { display: none !important; } } -- cgit v1.2.3 From a6e2a93febb0d87e9bb916651474d168b158d4f3 Mon Sep 17 00:00:00 2001 From: Lipis Date: Mon, 16 Sep 2013 19:36:39 +0200 Subject: Changed the border-color of .navbar-form to @navbar-default-border --- less/navbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 351e20417..d054b400d 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -408,7 +408,7 @@ .navbar-collapse, .navbar-form { - border-color: darken(@navbar-default-bg, 7%); + border-color: @navbar-default-border; } // Dropdown menu items and carets -- cgit v1.2.3 From b1208f380a6ea005e7936b50f67d1e3085d77c1d Mon Sep 17 00:00:00 2001 From: Frederico Carvalho Date: Wed, 18 Sep 2013 14:31:52 +1000 Subject: fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue --- less/navs.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index e60f9f8f0..4528e051f 100644 --- a/less/navs.less +++ b/less/navs.less @@ -133,6 +133,11 @@ &:focus { color: @nav-pills-active-link-hover-color; background-color: @nav-pills-active-link-hover-bg; + + .caret { + border-top-color: @nav-pills-active-link-hover-color; + border-bottom-color: @nav-pills-active-link-hover-color; + } } } } -- cgit v1.2.3 From 29f24f746c9990f1d588bab0a0a8a89dcde940bf Mon Sep 17 00:00:00 2001 From: Frederico Carvalho Date: Wed, 18 Sep 2013 14:45:56 +1000 Subject: corrected caret colour when a nav dropdown is open --- less/navs.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 4528e051f..3b6a43a7d 100644 --- a/less/navs.less +++ b/less/navs.less @@ -48,6 +48,11 @@ &:focus { background-color: @nav-link-hover-bg; border-color: @link-color; + + .caret { + border-top-color: @link-hover-color; + border-bottom-color: @link-hover-color; + } } } -- cgit v1.2.3 From 0cd6d35058e76deebcd5063cbc22cb33658c827f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 17 Sep 2013 18:30:36 +0300 Subject: Update normalize to v2.1.3. --- less/normalize.less | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/normalize.less b/less/normalize.less index a2e9c6485..42a393fc0 100644 --- a/less/normalize.less +++ b/less/normalize.less @@ -1,4 +1,4 @@ -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ // ========================================================================== // HTML5 display definitions @@ -44,10 +44,12 @@ audio:not([controls]) { } // -// Address styling not present in IE 8/9. +// Address `[hidden]` styling not present in IE 8/9. +// Hide the `template` element in IE, Safari, and Firefox < 22. // -[hidden] { +[hidden], +template { display: none; } @@ -63,8 +65,8 @@ audio:not([controls]) { html { font-family: sans-serif; // 1 - -webkit-text-size-adjust: 100%; // 2 -ms-text-size-adjust: 100%; // 2 + -webkit-text-size-adjust: 100%; // 2 } // @@ -79,6 +81,14 @@ body { // Links // ========================================================================== +// +// Remove the gray background color from active links in IE 10. +// + +a { + background: transparent; +} + // // Address `outline` inconsistency between Chrome and other browsers. // @@ -329,8 +339,8 @@ html input[disabled] { } // -// 1. Address box sizing set to `content-box` in IE 8/9. -// 2. Remove excess padding in IE 8/9. +// 1. Address box sizing set to `content-box` in IE 8/9/10. +// 2. Remove excess padding in IE 8/9/10. // input[type="checkbox"], -- cgit v1.2.3 From 60afea85b4103634950586e651aeff6b29940b42 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 08:14:19 +0300 Subject: less/mixins.less: tabs to spaces. --- less/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 74e7177cd..6e0e399af 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -559,7 +559,7 @@ } .responsive-invisibility() { - &, + &, tr&, th&, td& { display: none !important; } -- cgit v1.2.3 From ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Sep 2013 22:56:17 -0500 Subject: Fixes #10694: Remove unnecessary `content` property from `.caret` --- less/dropdowns.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 96af127a5..e6bd18779 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -16,7 +16,6 @@ // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed, // we can just straight up remove this. border-bottom: 0 dotted; - content: ""; } // The dropdown wrapper (div) -- cgit v1.2.3 From 2304ba6a256b55f79772ace77a04466790bcb161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 20 Sep 2013 18:06:48 +0200 Subject: Avoid LESS nesting if isn't needed --- less/tables.less | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 35291750a..f9f0041e4 100644 --- a/less/tables.less +++ b/less/tables.less @@ -91,12 +91,10 @@ th { } } } - > thead { - > tr { - > th, - > td { - border-bottom-width: 2px; - } + > thead > tr { + > th, + > td { + border-bottom-width: 2px; } } } @@ -106,14 +104,10 @@ th { // // Default zebra-stripe styles (alternating gray and transparent backgrounds) -.table-striped { - > tbody { - > tr:nth-child(odd) { - > td, - > th { - background-color: @table-bg-accent; - } - } +.table-striped > tbody > tr:nth-child(odd) { + > td, + > th { + background-color: @table-bg-accent; } } @@ -122,14 +116,10 @@ th { // // Placed here since it has to come after the potential zebra striping -.table-hover { - > tbody { - > tr:hover { - > td, - > th { - background-color: @table-bg-hover; - } - } +.table-hover > tbody > tr:hover { + > td, + > th { + background-color: @table-bg-hover; } } @@ -191,7 +181,7 @@ table { border: 1px solid @table-border-color; -webkit-overflow-scrolling: touch; - // Tighten up spacing and give a background color + // Tighten up spacing > .table { margin-bottom: 0; -- cgit v1.2.3 From dc3d16648c806f54e73d83fdc132abf77f1bf6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 21 Sep 2013 14:19:11 +0200 Subject: =?UTF-8?q?@headingsColor=20=E2=86=92=20@headings-color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- less/alerts.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index be09d18d0..3eab06629 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -15,7 +15,7 @@ // Headings for larger alerts h4 { margin-top: 0; - // Specified for the h4 to prevent conflicts of changing @headingsColor + // Specified for the h4 to prevent conflicts of changing @headings-color color: inherit; } // Provide class for links that match alerts -- cgit v1.2.3 From 000b445a042cc97d21d743ef917a35c23dde2a3e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 22 Sep 2013 09:19:37 -0500 Subject: Fixes #10755: Don't remove quotes around q element by default --- less/type.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 5ad6a4669..1e4ff9d18 100644 --- a/less/type.less +++ b/less/type.less @@ -255,8 +255,6 @@ blockquote { } // Quotes -q:before, -q:after, blockquote:before, blockquote:after { content: ""; -- cgit v1.2.3 From c4e7e3c933db27bf82b4190ed9c522bd1850c82f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 12:46:57 -0700 Subject: deprecate .hide; fixes #10446 --- less/utilities.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/utilities.less b/less/utilities.less index fa2d004ae..ae2ae4be2 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -23,6 +23,7 @@ // Toggling content // ------------------------- +// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1 .hide { display: none !important; } -- cgit v1.2.3 From b160e61451493bfa48085a6e0e6209f4e4f6d561 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 22:06:11 -0700 Subject: Update affected .glyphicon-* CSS classes to use new codepoints .glyphicon-briefcase: U+1F4BC -> U+E139 .glyphicon-calendar: U+1F4C5 -> U+E109 .glyphicon-pushpin: U+1F4CC -> U+E146 .glyphicon-paperclip: U+1F4CE -> U+E142 .glyphicon-camera: U+1F4F7 -> U+E046 .glyphicon-lock: U+1F512 -> U+E033 .glyphicon-bell: U+1F514 -> U+E123 .glyphicon-bookmark: U+1F516 -> U+E044 .glyphicon-fire: U+1F525 -> U+E104 .glyphicon-wrench: U+1F527 -> U+E136 --- less/glyphicons.less | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 7b66e6ba1..010226541 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -224,13 +224,13 @@ .glyphicon-cloud-upload { &:before { content: "\e198"; } } .glyphicon-tree-conifer { &:before { content: "\e199"; } } .glyphicon-tree-deciduous { &:before { content: "\e200"; } } -.glyphicon-briefcase { &:before { content: "\1f4bc"; } } -.glyphicon-calendar { &:before { content: "\1f4c5"; } } -.glyphicon-pushpin { &:before { content: "\1f4cc"; } } -.glyphicon-paperclip { &:before { content: "\1f4ce"; } } -.glyphicon-camera { &:before { content: "\1f4f7"; } } -.glyphicon-lock { &:before { content: "\1f512"; } } -.glyphicon-bell { &:before { content: "\1f514"; } } -.glyphicon-bookmark { &:before { content: "\1f516"; } } -.glyphicon-fire { &:before { content: "\1f525"; } } -.glyphicon-wrench { &:before { content: "\1f527"; } } +.glyphicon-briefcase { &:before { content: "\e139"; } } +.glyphicon-calendar { &:before { content: "\e109"; } } +.glyphicon-pushpin { &:before { content: "\e146"; } } +.glyphicon-paperclip { &:before { content: "\e142"; } } +.glyphicon-camera { &:before { content: "\e046"; } } +.glyphicon-lock { &:before { content: "\e033"; } } +.glyphicon-bell { &:before { content: "\e123"; } } +.glyphicon-bookmark { &:before { content: "\e044"; } } +.glyphicon-fire { &:before { content: "\e104"; } } +.glyphicon-wrench { &:before { content: "\e136"; } } -- cgit v1.2.3 From 2d0f5565abd2d30db1f83442efff4e0b2bf60a60 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 22:30:59 -0700 Subject: re-sort affected .glyphicon-* classes by new codepoints --- less/glyphicons.less | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 010226541..89aad0b35 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -72,6 +72,7 @@ .glyphicon-repeat { &:before { content: "\e030"; } } .glyphicon-refresh { &:before { content: "\e031"; } } .glyphicon-list-alt { &:before { content: "\e032"; } } +.glyphicon-lock { &:before { content: "\e033"; } } .glyphicon-flag { &:before { content: "\e034"; } } .glyphicon-headphones { &:before { content: "\e035"; } } .glyphicon-volume-off { &:before { content: "\e036"; } } @@ -82,7 +83,9 @@ .glyphicon-tag { &:before { content: "\e041"; } } .glyphicon-tags { &:before { content: "\e042"; } } .glyphicon-book { &:before { content: "\e043"; } } +.glyphicon-bookmark { &:before { content: "\e044"; } } .glyphicon-print { &:before { content: "\e045"; } } +.glyphicon-camera { &:before { content: "\e046"; } } .glyphicon-font { &:before { content: "\e047"; } } .glyphicon-bold { &:before { content: "\e048"; } } .glyphicon-italic { &:before { content: "\e049"; } } @@ -136,10 +139,12 @@ .glyphicon-exclamation-sign { &:before { content: "\e101"; } } .glyphicon-gift { &:before { content: "\e102"; } } .glyphicon-leaf { &:before { content: "\e103"; } } +.glyphicon-fire { &:before { content: "\e104"; } } .glyphicon-eye-open { &:before { content: "\e105"; } } .glyphicon-eye-close { &:before { content: "\e106"; } } .glyphicon-warning-sign { &:before { content: "\e107"; } } .glyphicon-plane { &:before { content: "\e108"; } } +.glyphicon-calendar { &:before { content: "\e109"; } } .glyphicon-random { &:before { content: "\e110"; } } .glyphicon-comment { &:before { content: "\e111"; } } .glyphicon-magnet { &:before { content: "\e112"; } } @@ -153,6 +158,7 @@ .glyphicon-resize-horizontal { &:before { content: "\e120"; } } .glyphicon-hdd { &:before { content: "\e121"; } } .glyphicon-bullhorn { &:before { content: "\e122"; } } +.glyphicon-bell { &:before { content: "\e123"; } } .glyphicon-certificate { &:before { content: "\e124"; } } .glyphicon-thumbs-up { &:before { content: "\e125"; } } .glyphicon-thumbs-down { &:before { content: "\e126"; } } @@ -165,13 +171,17 @@ .glyphicon-circle-arrow-up { &:before { content: "\e133"; } } .glyphicon-circle-arrow-down { &:before { content: "\e134"; } } .glyphicon-globe { &:before { content: "\e135"; } } +.glyphicon-wrench { &:before { content: "\e136"; } } .glyphicon-tasks { &:before { content: "\e137"; } } .glyphicon-filter { &:before { content: "\e138"; } } +.glyphicon-briefcase { &:before { content: "\e139"; } } .glyphicon-fullscreen { &:before { content: "\e140"; } } .glyphicon-dashboard { &:before { content: "\e141"; } } +.glyphicon-paperclip { &:before { content: "\e142"; } } .glyphicon-heart-empty { &:before { content: "\e143"; } } .glyphicon-link { &:before { content: "\e144"; } } .glyphicon-phone { &:before { content: "\e145"; } } +.glyphicon-pushpin { &:before { content: "\e146"; } } .glyphicon-usd { &:before { content: "\e148"; } } .glyphicon-gbp { &:before { content: "\e149"; } } .glyphicon-sort { &:before { content: "\e150"; } } @@ -224,13 +234,3 @@ .glyphicon-cloud-upload { &:before { content: "\e198"; } } .glyphicon-tree-conifer { &:before { content: "\e199"; } } .glyphicon-tree-deciduous { &:before { content: "\e200"; } } -.glyphicon-briefcase { &:before { content: "\e139"; } } -.glyphicon-calendar { &:before { content: "\e109"; } } -.glyphicon-pushpin { &:before { content: "\e146"; } } -.glyphicon-paperclip { &:before { content: "\e142"; } } -.glyphicon-camera { &:before { content: "\e046"; } } -.glyphicon-lock { &:before { content: "\e033"; } } -.glyphicon-bell { &:before { content: "\e123"; } } -.glyphicon-bookmark { &:before { content: "\e044"; } } -.glyphicon-fire { &:before { content: "\e104"; } } -.glyphicon-wrench { &:before { content: "\e136"; } } -- cgit v1.2.3 From 70453c2327c3ebcf704e485f8f9e34140f6a099e Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 12 Sep 2013 10:45:15 +0200 Subject: unify button sizing, use mixin ".button-size" also for the base sized button --- less/buttons.less | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 40511ab96..a0909606f 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -9,18 +9,15 @@ // Core styles .btn { display: inline-block; - padding: @padding-base-vertical @padding-base-horizontal; margin-bottom: 0; // For input.btn - font-size: @font-size-base; font-weight: @btn-font-weight; - line-height: @line-height-base; text-align: center; vertical-align: middle; cursor: pointer; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; - border-radius: @border-radius-base; white-space: nowrap; + .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base); .user-select(none); &:focus { -- cgit v1.2.3 From 6f9d980139a38c7bd09dfc9d339f7ac809b5a3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 3 Oct 2013 23:15:49 +0200 Subject: Change border to border-radius Border isn't set, but border-radius is. --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index 88bcde552..e12835401 100644 --- a/less/code.less +++ b/less/code.less @@ -42,7 +42,7 @@ pre { color: inherit; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } } -- cgit v1.2.3 From 38941881e9a04c2de61be86fd05e5840c93dd1fb Mon Sep 17 00:00:00 2001 From: Steven Black Date: Fri, 4 Oct 2013 21:43:31 -0400 Subject: Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. --- less/jumbotron.less | 2 +- less/variables.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 3a2365f05..aadb4acf5 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -6,7 +6,7 @@ .jumbotron { padding: @jumbotron-padding; margin-bottom: @jumbotron-padding; - font-size: (@font-size-base * 1.5); + font-size: @font-size-jumbotron; font-weight: 200; line-height: (@line-height-base * 1.5); color: @jumbotron-color; diff --git a/less/variables.less b/less/variables.less index 1a998b946..e611c3a02 100644 --- a/less/variables.less +++ b/less/variables.less @@ -368,8 +368,8 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@font-size-jumbotron: ceil(@font-size-base * 1.50); // Form states and alerts -- cgit v1.2.3 From b1cc07fa1525f0900d32bdcbdf7b38a616971acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 5 Oct 2013 20:14:19 +0200 Subject: Insert comma to fix validation warning BS doesn't support IE6/IE7, so comma can be inserted. --- less/scaffolding.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/scaffolding.less b/less/scaffolding.less index 046eb774a..976b4e3c2 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -114,6 +114,6 @@ hr { margin: -1px; padding: 0; overflow: hidden; - clip: rect(0 0 0 0); + clip: rect(0,0,0,0); border: 0; } -- cgit v1.2.3 From 4b27c087836018b639c08788d452892c59e6e297 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sat, 5 Oct 2013 18:37:53 -0400 Subject: The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme. --- less/jumbotron.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index aadb4acf5..22c29780a 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -6,7 +6,7 @@ .jumbotron { padding: @jumbotron-padding; margin-bottom: @jumbotron-padding; - font-size: @font-size-jumbotron; + font-size: @jumbotron-font-size; font-weight: 200; line-height: (@line-height-base * 1.5); color: @jumbotron-color; -- cgit v1.2.3 From 0740d01b4ccbce54b9e852df63bdf891b532baa2 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sat, 5 Oct 2013 20:48:28 -0400 Subject: Good catch by @juthilo - omitted the modified in a prior commit. --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index e611c3a02..aede11bac 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,7 +369,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@font-size-jumbotron: ceil(@font-size-base * 1.50); +@jumbotron-font-size: ceil(@font-size-base * 1.50); // Form states and alerts -- cgit v1.2.3 From 1adbe2043a0ab6adad95e823397f6444730dfb83 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:32:23 -0500 Subject: Fixes #10959: round the .lead values down to nearest pixel via floor() --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 1e4ff9d18..55e5e1d77 100644 --- a/less/type.less +++ b/less/type.less @@ -11,7 +11,7 @@ p { } .lead { margin-bottom: @line-height-computed; - font-size: (@font-size-base * 1.15); + font-size: floor(@font-size-base * 1.15); font-weight: 200; line-height: 1.4; -- cgit v1.2.3 From 352532cd63a2d8e03ba7db806aa3bd110c023532 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:39:11 -0500 Subject: Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere --- less/modals.less | 8 -------- 1 file changed, 8 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 4f2cf9468..776073d57 100644 --- a/less/modals.less +++ b/less/modals.less @@ -10,14 +10,6 @@ // Kill the scroll on the body .modal-open { overflow: hidden; - - - // Account for hiding of scrollbar - body&, - .navbar-fixed-top, - .navbar-fixed-bottom { - margin-right: 15px - } } // Container that the modal scrolls within -- cgit v1.2.3 From c814ad18333d7deefd3bff5446b02d6933f49f02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Oct 2013 22:00:37 -0700 Subject: Combine separate efforts for grid mixins into one, cleanup and reorganize --- less/grid.less | 297 +++++-------------------------------------------------- less/mixins.less | 75 ++++++++++++++ 2 files changed, 97 insertions(+), 275 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 39f1049b6..67e78f760 100644 --- a/less/grid.less +++ b/less/grid.less @@ -2,7 +2,6 @@ // Grid system // -------------------------------------------------- - // Set the container width, and override it for fixed navbars in media queries .container { .container-fixed(); @@ -14,61 +13,7 @@ } // Common styles for small and large grid columns -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, -.col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, -.col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, -.col-lg-1, -.col-lg-2, -.col-lg-3, -.col-lg-4, -.col-lg-5, -.col-lg-6, -.col-lg-7, -.col-lg-8, -.col-lg-9, -.col-lg-10, -.col-lg-11, -.col-lg-12 { - position: relative; - // Prevent columns from collapsing when empty - min-height: 1px; - // Inner gutter via padding - padding-left: (@grid-gutter-width / 2); - padding-right: (@grid-gutter-width / 2); -} +.make-grid-columns(); // Extra small grid @@ -79,31 +24,11 @@ // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since // it's full-width. -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11 { - float: left; -} -.col-xs-1 { width: percentage((1 / @grid-columns)); } -.col-xs-2 { width: percentage((2 / @grid-columns)); } -.col-xs-3 { width: percentage((3 / @grid-columns)); } -.col-xs-4 { width: percentage((4 / @grid-columns)); } -.col-xs-5 { width: percentage((5 / @grid-columns)); } -.col-xs-6 { width: percentage((6 / @grid-columns)); } -.col-xs-7 { width: percentage((7 / @grid-columns)); } -.col-xs-8 { width: percentage((8 / @grid-columns)); } -.col-xs-9 { width: percentage((9 / @grid-columns)); } -.col-xs-10 { width: percentage((10/ @grid-columns)); } -.col-xs-11 { width: percentage((11/ @grid-columns)); } -.col-xs-12 { width: 100%; } +.make-grid-columns-float(xs); +.make-grid(@grid-columns, xs, width); +.make-grid(@grid-columns, xs, pull); +.make-grid(@grid-columns, xs, push); +.make-grid(@grid-columns, xs, offset); // Small grid @@ -119,69 +44,11 @@ width: @container-sm; } - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11 { - float: left; - } - .col-sm-1 { width: percentage((1 / @grid-columns)); } - .col-sm-2 { width: percentage((2 / @grid-columns)); } - .col-sm-3 { width: percentage((3 / @grid-columns)); } - .col-sm-4 { width: percentage((4 / @grid-columns)); } - .col-sm-5 { width: percentage((5 / @grid-columns)); } - .col-sm-6 { width: percentage((6 / @grid-columns)); } - .col-sm-7 { width: percentage((7 / @grid-columns)); } - .col-sm-8 { width: percentage((8 / @grid-columns)); } - .col-sm-9 { width: percentage((9 / @grid-columns)); } - .col-sm-10 { width: percentage((10/ @grid-columns)); } - .col-sm-11 { width: percentage((11/ @grid-columns)); } - .col-sm-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-sm-push-1 { left: percentage((1 / @grid-columns)); } - .col-sm-push-2 { left: percentage((2 / @grid-columns)); } - .col-sm-push-3 { left: percentage((3 / @grid-columns)); } - .col-sm-push-4 { left: percentage((4 / @grid-columns)); } - .col-sm-push-5 { left: percentage((5 / @grid-columns)); } - .col-sm-push-6 { left: percentage((6 / @grid-columns)); } - .col-sm-push-7 { left: percentage((7 / @grid-columns)); } - .col-sm-push-8 { left: percentage((8 / @grid-columns)); } - .col-sm-push-9 { left: percentage((9 / @grid-columns)); } - .col-sm-push-10 { left: percentage((10/ @grid-columns)); } - .col-sm-push-11 { left: percentage((11/ @grid-columns)); } - - .col-sm-pull-1 { right: percentage((1 / @grid-columns)); } - .col-sm-pull-2 { right: percentage((2 / @grid-columns)); } - .col-sm-pull-3 { right: percentage((3 / @grid-columns)); } - .col-sm-pull-4 { right: percentage((4 / @grid-columns)); } - .col-sm-pull-5 { right: percentage((5 / @grid-columns)); } - .col-sm-pull-6 { right: percentage((6 / @grid-columns)); } - .col-sm-pull-7 { right: percentage((7 / @grid-columns)); } - .col-sm-pull-8 { right: percentage((8 / @grid-columns)); } - .col-sm-pull-9 { right: percentage((9 / @grid-columns)); } - .col-sm-pull-10 { right: percentage((10/ @grid-columns)); } - .col-sm-pull-11 { right: percentage((11/ @grid-columns)); } - - // Offsets - .col-sm-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-sm-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-sm-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-sm-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-sm-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-sm-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-sm-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-sm-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-sm-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-sm-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-sm-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .make-grid-columns-float(sm); + .make-grid(@grid-columns, sm, width); + .make-grid(@grid-columns, sm, pull); + .make-grid(@grid-columns, sm, push); + .make-grid(@grid-columns, sm, offset); } @@ -196,72 +63,12 @@ .container { width: @container-md; } - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11 { - float: left; - } - .col-md-1 { width: percentage((1 / @grid-columns)); } - .col-md-2 { width: percentage((2 / @grid-columns)); } - .col-md-3 { width: percentage((3 / @grid-columns)); } - .col-md-4 { width: percentage((4 / @grid-columns)); } - .col-md-5 { width: percentage((5 / @grid-columns)); } - .col-md-6 { width: percentage((6 / @grid-columns)); } - .col-md-7 { width: percentage((7 / @grid-columns)); } - .col-md-8 { width: percentage((8 / @grid-columns)); } - .col-md-9 { width: percentage((9 / @grid-columns)); } - .col-md-10 { width: percentage((10/ @grid-columns)); } - .col-md-11 { width: percentage((11/ @grid-columns)); } - .col-md-12 { width: 100%; } - // Push and pull columns for source order changes - .col-md-push-0 { left: auto; } - .col-md-push-1 { left: percentage((1 / @grid-columns)); } - .col-md-push-2 { left: percentage((2 / @grid-columns)); } - .col-md-push-3 { left: percentage((3 / @grid-columns)); } - .col-md-push-4 { left: percentage((4 / @grid-columns)); } - .col-md-push-5 { left: percentage((5 / @grid-columns)); } - .col-md-push-6 { left: percentage((6 / @grid-columns)); } - .col-md-push-7 { left: percentage((7 / @grid-columns)); } - .col-md-push-8 { left: percentage((8 / @grid-columns)); } - .col-md-push-9 { left: percentage((9 / @grid-columns)); } - .col-md-push-10 { left: percentage((10/ @grid-columns)); } - .col-md-push-11 { left: percentage((11/ @grid-columns)); } - - .col-md-pull-0 { right: auto; } - .col-md-pull-1 { right: percentage((1 / @grid-columns)); } - .col-md-pull-2 { right: percentage((2 / @grid-columns)); } - .col-md-pull-3 { right: percentage((3 / @grid-columns)); } - .col-md-pull-4 { right: percentage((4 / @grid-columns)); } - .col-md-pull-5 { right: percentage((5 / @grid-columns)); } - .col-md-pull-6 { right: percentage((6 / @grid-columns)); } - .col-md-pull-7 { right: percentage((7 / @grid-columns)); } - .col-md-pull-8 { right: percentage((8 / @grid-columns)); } - .col-md-pull-9 { right: percentage((9 / @grid-columns)); } - .col-md-pull-10 { right: percentage((10/ @grid-columns)); } - .col-md-pull-11 { right: percentage((11/ @grid-columns)); } - - // Offsets - .col-md-offset-0 { margin-left: 0; } - .col-md-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-md-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-md-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-md-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-md-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-md-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-md-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-md-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-md-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .make-grid-columns-float(md); + .make-grid(@grid-columns, md, width); + .make-grid(@grid-columns, md, pull); + .make-grid(@grid-columns, md, push); + .make-grid(@grid-columns, md, offset); } @@ -277,70 +84,10 @@ width: @container-lg; } - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11 { - float: left; - } - .col-lg-1 { width: percentage((1 / @grid-columns)); } - .col-lg-2 { width: percentage((2 / @grid-columns)); } - .col-lg-3 { width: percentage((3 / @grid-columns)); } - .col-lg-4 { width: percentage((4 / @grid-columns)); } - .col-lg-5 { width: percentage((5 / @grid-columns)); } - .col-lg-6 { width: percentage((6 / @grid-columns)); } - .col-lg-7 { width: percentage((7 / @grid-columns)); } - .col-lg-8 { width: percentage((8 / @grid-columns)); } - .col-lg-9 { width: percentage((9 / @grid-columns)); } - .col-lg-10 { width: percentage((10/ @grid-columns)); } - .col-lg-11 { width: percentage((11/ @grid-columns)); } - .col-lg-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-lg-push-0 { left: auto; } - .col-lg-push-1 { left: percentage((1 / @grid-columns)); } - .col-lg-push-2 { left: percentage((2 / @grid-columns)); } - .col-lg-push-3 { left: percentage((3 / @grid-columns)); } - .col-lg-push-4 { left: percentage((4 / @grid-columns)); } - .col-lg-push-5 { left: percentage((5 / @grid-columns)); } - .col-lg-push-6 { left: percentage((6 / @grid-columns)); } - .col-lg-push-7 { left: percentage((7 / @grid-columns)); } - .col-lg-push-8 { left: percentage((8 / @grid-columns)); } - .col-lg-push-9 { left: percentage((9 / @grid-columns)); } - .col-lg-push-10 { left: percentage((10/ @grid-columns)); } - .col-lg-push-11 { left: percentage((11/ @grid-columns)); } - - .col-lg-pull-0 { right: auto; } - .col-lg-pull-1 { right: percentage((1 / @grid-columns)); } - .col-lg-pull-2 { right: percentage((2 / @grid-columns)); } - .col-lg-pull-3 { right: percentage((3 / @grid-columns)); } - .col-lg-pull-4 { right: percentage((4 / @grid-columns)); } - .col-lg-pull-5 { right: percentage((5 / @grid-columns)); } - .col-lg-pull-6 { right: percentage((6 / @grid-columns)); } - .col-lg-pull-7 { right: percentage((7 / @grid-columns)); } - .col-lg-pull-8 { right: percentage((8 / @grid-columns)); } - .col-lg-pull-9 { right: percentage((9 / @grid-columns)); } - .col-lg-pull-10 { right: percentage((10/ @grid-columns)); } - .col-lg-pull-11 { right: percentage((11/ @grid-columns)); } - - // Offsets - .col-lg-offset-0 { margin-left: 0; } - .col-lg-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-lg-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-lg-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-lg-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-lg-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-lg-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-lg-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-lg-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-lg-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-lg-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-lg-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .make-grid-columns-float(lg); + .make-grid(@grid-columns, lg, width); + .make-grid(@grid-columns, lg, pull); + .make-grid(@grid-columns, lg, push); + .make-grid(@grid-columns, lg, offset); } + diff --git a/less/mixins.less b/less/mixins.less index 6e0e399af..654215b54 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -565,6 +565,7 @@ td& { display: none !important; } } + // Grid System // ----------- @@ -696,6 +697,80 @@ } +// Framework grid generation +// +// Used only by Bootstrap to generate the correct number of grid classes given +// any value of `@grid-columns`. + +.make-grid-columns() { + // Common styles for all sizes of grid columns, widths 1-12 + .col(@index) when (@index = 1) { // initial + @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; + .col(@index + 1, @item); + } + .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo + @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; + .col(@index + 1, ~"@{list}, @{item}"); + } + .col(@index, @list) when (@index > @grid-columns) { // terminal + @{list} { + position: relative; + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: (@grid-gutter-width / 2); + padding-right: (@grid-gutter-width / 2); + } + } + .col(1); // kickstart it +} + +.make-grid-columns-float(@class) { + .col(@index) when (@index = 1) { // initial + @item: ~".col-@{class}-@{index}"; + .col(@index + 1, @item); + } + .col(@index, @list) when (@index < @grid-columns) { // general + @item: ~".col-@{class}-@{index}"; + .col(@index + 1, ~"@{list}, @{item}"); + } + .col(@index, @list) when (@index = @grid-columns) { // terminal + @{list} { + float: left; + } + } + .col(1); // kickstart it +} + +.calc-grid(@index, @class, @type) when (@type = width) { + .col-@{class}-@{index} { + width: percentage((@index / @grid-columns)); + } +} +.calc-grid(@index, @class, @type) when (@type = push) { + .col-@{class}-push-@{index} { + left: percentage((@index / @grid-columns)); + } +} +.calc-grid(@index, @class, @type) when (@type = pull) { + .col-@{class}-pull-@{index} { + right: percentage((@index / @grid-columns)); + } +} +.calc-grid(@index, @class, @type) when (@type = offset) { + .col-@{class}-offset-@{index} { + margin-left: percentage((@index / @grid-columns)); + } +} + +// Basic looping in LESS +.make-grid(@index, @class, @type) when (@index > 0) { + .calc-grid(@index, @class, @type); + // next iteration + .make-grid(@index - 1, @class, @type); +} + + // Form validation states // // Used in forms.less to generate the form validation CSS for warnings, errors, -- cgit v1.2.3 From 8098f4e5ba36814030304867092aa268aaf370f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 12 Oct 2013 23:28:50 +0200 Subject: Add more functionality to .small --- less/type.less | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 55e5e1d77..e5544ab3e 100644 --- a/less/type.less +++ b/less/type.less @@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6, line-height: @headings-line-height; color: @headings-color; - small { + small, + .small { font-weight: normal; line-height: 1; color: @headings-small-color; @@ -95,7 +96,8 @@ h3 { margin-top: @line-height-computed; margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 65%; } } @@ -105,7 +107,8 @@ h6 { margin-top: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 75%; } } @@ -240,10 +243,12 @@ blockquote { border-right: 5px solid @blockquote-border-color; border-left: 0; p, - small { + small, + .small { text-align: right; } - small { + small, + .small { &:before { content: ''; } -- cgit v1.2.3 From 590975b4077ae6a2d5cba7d01403bbc09484bd6c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 15:55:13 -0700 Subject: remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 --- less/navs.less | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 3b6a43a7d..b1d4fcd23 100644 --- a/less/navs.less +++ b/less/navs.less @@ -227,13 +227,11 @@ .clearfix(); } -// Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content, -.pill-content { +// Hide tabbable panes to start, show them when `.active` +.tab-content { + > .tab-pane { + display: none; + } > .active { display: block; } -- cgit v1.2.3 From 6085973e258a50e829405b1c6cca743f7782017d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 18:56:31 -0700 Subject: drop .tabbable since it's unused and undocumented /cc #10102 --- less/navs.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index b1d4fcd23..90aacd7ea 100644 --- a/less/navs.less +++ b/less/navs.less @@ -222,11 +222,6 @@ // Tabbable tabs // ------------------------- -// Clear any floats -.tabbable { - .clearfix(); -} - // Hide tabbable panes to start, show them when `.active` .tab-content { > .tab-pane { -- cgit v1.2.3 From 6351c30782a87fe03d5c27e75f2287cc657ba06d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 18:58:09 -0700 Subject: comment and spacing --- less/navs.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 90aacd7ea..bebb63311 100644 --- a/less/navs.less +++ b/less/navs.less @@ -190,6 +190,8 @@ } // Move borders to anchors instead of bottom of list +// +// Mixin for adding on top the shared `.nav-justified` styles for our tabs .nav-tabs-justified { border-bottom: 0; @@ -233,7 +235,6 @@ } - // Dropdowns // ------------------------- -- cgit v1.2.3 From f946ff5d254d0d8383200101f19b64bcd8ba2c58 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 19:57:14 -0700 Subject: fix #10257 --- less/theme.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index b510b7a8d..38e5e7f84 100644 --- a/less/theme.less +++ b/less/theme.less @@ -104,6 +104,7 @@ // Default navbar .navbar-default { #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg); + .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); @@ -121,6 +122,7 @@ // Inverted navbar .navbar-inverse { #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg); + .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered .navbar-nav > .active > a { #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); -- cgit v1.2.3 From 44b32a30366440b2127b343fbd1990fe15e88185 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 19:59:42 -0700 Subject: move .hidden to utilities; fixes #10997 --- less/responsive-utilities.less | 10 ---------- less/utilities.less | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 6b4566266..df53e479d 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -22,16 +22,6 @@ } -// Hide from screenreaders and browsers -// -// Credit: HTML5 Boilerplate - -.hidden { - display: none !important; - visibility: hidden !important; -} - - // Visibility utilities .visible-xs { diff --git a/less/utilities.less b/less/utilities.less index ae2ae4be2..a26031214 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -38,6 +38,16 @@ } +// Hide from screenreaders and browsers +// +// Credit: HTML5 Boilerplate + +.hidden { + display: none !important; + visibility: hidden !important; +} + + // For Affix plugin // ------------------------- -- cgit v1.2.3 From be4e951b7dc254dac08a5d2c6b88be0cda6e420f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 20:02:24 -0700 Subject: scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 --- less/forms.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index cb9d30a37..f6bbce596 100644 --- a/less/forms.less +++ b/less/forms.less @@ -267,7 +267,6 @@ input[type="checkbox"], .form-control-static { margin-bottom: 0; // Remove default margin from `p` - padding-top: (@padding-base-vertical + 1); } @@ -354,6 +353,10 @@ input[type="checkbox"], .make-row(); } + .form-control-static { + padding-top: (@padding-base-vertical + 1); + } + // Only right align form labels here when the columns stop stacking @media (min-width: @screen-sm-min) { .control-label { -- cgit v1.2.3 From e7379f75bdeba88868dd4d4f169122a932e73822 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 20:04:28 -0700 Subject: no trailing decimal place --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index aede11bac..9b55f13b6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,7 +369,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@jumbotron-font-size: ceil(@font-size-base * 1.50); +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts -- cgit v1.2.3 From b3c04c95d3d378f8473e76169e40e044895ec849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 14 Oct 2013 15:06:58 +0200 Subject: Nuke trailing zeros --- less/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 9b55f13b6..e596215d0 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,9 +48,9 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px -@font-size-h1: floor(@font-size-base * 2.60); // ~36px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px @font-size-h2: floor(@font-size-base * 2.15); // ~30px -@font-size-h3: ceil(@font-size-base * 1.70); // ~24px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px @font-size-h4: ceil(@font-size-base * 1.25); // ~18px @font-size-h5: @font-size-base; @font-size-h6: ceil(@font-size-base * 0.85); // ~12px -- cgit v1.2.3 From 4ce1b08c32013cca8094c71463f088c9b406c5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 14 Oct 2013 18:22:31 +0200 Subject: Unhardcode .table-responsive bottom margin --- less/tables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index f9f0041e4..6ca19ad58 100644 --- a/less/tables.less +++ b/less/tables.less @@ -174,7 +174,7 @@ table { @media (max-width: @screen-sm-min) { .table-responsive { width: 100%; - margin-bottom: 15px; + margin-bottom: (@line-height-computed * 0.75); overflow-y: hidden; overflow-x: scroll; -ms-overflow-style: -ms-autohiding-scrollbar; -- cgit v1.2.3 From 5c64ef393caf1331129e2360e1b7f3aaf1e5150e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 10:58:12 -0700 Subject: fix .table-responsive media query; refs #11067 --- less/tables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index f9f0041e4..1e4a4d14e 100644 --- a/less/tables.less +++ b/less/tables.less @@ -171,7 +171,7 @@ table { // by enabling horizontal scrolling. Only applies <768px. Everything above that // will display normally. -@media (max-width: @screen-sm-min) { +@media (max-width: @screen-xs-max) { .table-responsive { width: 100%; margin-bottom: 15px; -- cgit v1.2.3 From 710071157751dc9aac1b531d283c1ae756a3c902 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 14 Oct 2013 13:45:32 -0700 Subject: unnest the list-group-item link variation for #11085 and #11088 --- less/list-group.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index 46cda4085..2cee52973 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -39,21 +39,21 @@ > .badge + .badge { margin-right: 5px; } +} - // Linked list items - a& { - color: @list-group-link-color; +// Linked list items +a.list-group-item { + color: @list-group-link-color; - .list-group-item-heading { - color: @list-group-link-heading-color; - } + .list-group-item-heading { + color: @list-group-link-heading-color; + } - // Hover state - &:hover, - &:focus { - text-decoration: none; - background-color: @list-group-hover-bg; - } + // Hover state + &:hover, + &:focus { + text-decoration: none; + background-color: @list-group-hover-bg; } // Active class on item itself, not parent -- cgit v1.2.3 From e20b02ad0b1253c8e3d9703409a256927f55ede8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Yokomizo?= Date: Mon, 14 Oct 2013 20:10:49 -0300 Subject: extended hover state of linked versions of .thumbnail --- less/thumbnails.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index a210cac72..df46fbdc2 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -17,7 +17,8 @@ // Add a hover state for linked versions only a.thumbnail:hover, -a.thumbnail:focus { +a.thumbnail:focus, +a.thumbnail.active { border-color: @link-color; } -- cgit v1.2.3 From a28d9539c76e4ba4b3dba3df6137a8400840974d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 20:45:43 -0700 Subject: fix #10952 --- less/glyphicons.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 89aad0b35..709d31865 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -14,7 +14,7 @@ src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), - url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg'); + url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg'); } // Catchall baseclass -- cgit v1.2.3 From 042363561415939fb046092705c9624fd8008177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 15 Oct 2013 17:35:11 +0200 Subject: Ditch `&`, as `+ ...` is enought --- less/breadcrumbs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index aded518ce..60b33ea72 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -11,7 +11,7 @@ border-radius: @border-radius-base; > li { display: inline-block; - &+li:before { + + li:before { content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: @breadcrumb-color; -- cgit v1.2.3 From 976f6dfdad663e43237a3da07cb64a41932f264e Mon Sep 17 00:00:00 2001 From: jeonghwan Date: Wed, 16 Oct 2013 23:20:34 +0900 Subject: Fixes issue #11122 -- navbar-fixed-bottom border Enable border-top in .navbar-fixed-bottom --- less/navbar.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index d054b400d..cc3e1f213 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -128,7 +128,6 @@ position: fixed; right: 0; left: 0; - border-width: 0 0 1px; // Undo the rounded corners @media (min-width: @grid-float-breakpoint) { @@ -138,10 +137,12 @@ .navbar-fixed-top { z-index: @zindex-navbar-fixed; top: 0; + border-width: 0 0 1px; } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; // override .navbar defaults + border-width: 1px 0 0; } -- cgit v1.2.3 From 5f79354dbea3ec5b0d99d2b6cd2376f3e4ee268e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 17 Oct 2013 21:25:08 +0200 Subject: FIx invalid element selector `kbd` (keyboard) is right, not `kdb`. :P --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index e12835401..54ab46ac8 100644 --- a/less/code.less +++ b/less/code.less @@ -5,7 +5,7 @@ // Inline and block code styles code, -kdb, +kbd, pre, samp { font-family: @font-family-monospace; -- cgit v1.2.3 From 6a93a6b88a4b874fba5a1d1edd817cbd91ccfacc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 16:46:38 -0700 Subject: Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it --- less/carousel.less | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 59e4fadf7..d0d90736f 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -160,6 +160,17 @@ border: 1px solid @carousel-indicator-border-color; border-radius: 10px; cursor: pointer; + + // IE8-9 hack for event handling + // + // Internet Explorer 8-9 does not support clicks on elements without a set + // `background-color`. We cannot use `filter` since that's not viewed as a + // background color by the browser. Thus, a hack is needed. + // + // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we + // set alpha transparency for the best results possible. + background-color: #000 \9; // IE8 + background-color: rgba(0,0,0,0); // IE9 } .active { margin: 0; -- cgit v1.2.3 From f45c05a97a4dda6a657ff89fcbfa283308d0b329 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 17:40:19 -0700 Subject: fixes #11151: remove unused h5bp class from print CSS --- less/print.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/print.less b/less/print.less index 1e4bffe3f..2a5b154fe 100644 --- a/less/print.less +++ b/less/print.less @@ -26,7 +26,6 @@ } // Don't show links for images, or javascript/internal links - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; -- cgit v1.2.3 From 23a85d6a7af6fdfdf59756515a760d332f51aa95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 17:59:15 -0700 Subject: fixes #11126: remove box-shadow from open dropdown toggle with .btn-link --- less/button-groups.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 43ada11d9..d236dcb8d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -150,6 +150,11 @@ // Remove the gradient and set the same inset shadow as the :active state .btn-group.open .dropdown-toggle { .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + + // Show no shadow for `.btn-link` since it has no other button styles. + &.btn-link { + .box-shadow(none); + } } -- cgit v1.2.3 From dd34102cb6bb601c3103f2c74804d2382271c0e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 19:54:22 -0700 Subject: Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline --- less/mixins.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 654215b54..5c9672bcb 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -779,7 +779,11 @@ .form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { // Color the label and help text .help-block, - .control-label { + .control-label, + .radio, + .checkbox, + .radio-inline, + .checkbox-inline { color: @text-color; } // Set the border and box shadow on specific inputs to match -- cgit v1.2.3 From 5aa4c5cb0c1b8bed3a4bb6b6a867f48b4a59f2fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:04:10 -0700 Subject: fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect --- less/modals.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 776073d57..99cf76469 100644 --- a/less/modals.less +++ b/less/modals.less @@ -34,6 +34,7 @@ // Shell div to position the modal with bottom padding .modal-dialog { + position: relative; margin-left: auto; margin-right: auto; width: auto; -- cgit v1.2.3 From e486bb4f39e79dd55b3c68af134a4624b2fa4c08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:30:16 -0700 Subject: Fixes #10433: Navbar z-index refactor * Resets the default navbar z-index to auto at a certain breakpoint * Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar) --- less/navbar.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index cc3e1f213..a6f7b40f6 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -19,6 +19,7 @@ .clearfix(); @media (min-width: @grid-float-breakpoint) { + z-index: auto; border-radius: @navbar-border-radius; } } @@ -128,6 +129,7 @@ position: fixed; right: 0; left: 0; + z-index: @zindex-navbar-fixed; // Undo the rounded corners @media (min-width: @grid-float-breakpoint) { @@ -135,7 +137,6 @@ } } .navbar-fixed-top { - z-index: @zindex-navbar-fixed; top: 0; border-width: 0 0 1px; } @@ -153,6 +154,7 @@ padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; line-height: @line-height-computed; + &:hover, &:focus { text-decoration: none; -- cgit v1.2.3 From 76baacf2c94bec03273639ef0ed966dad87cf37a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 21:12:09 -0700 Subject: Remove default z-index on navbar and only set on static and fixed variants --- less/navbar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index a6f7b40f6..577e20ed5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -10,7 +10,6 @@ .navbar { position: relative; - z-index: @zindex-navbar; min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) margin-bottom: @navbar-margin-bottom; border: 1px solid transparent; @@ -19,7 +18,6 @@ .clearfix(); @media (min-width: @grid-float-breakpoint) { - z-index: auto; border-radius: @navbar-border-radius; } } @@ -117,7 +115,9 @@ // Static top (unfixed, but 100% wide) navbar .navbar-static-top { + z-index: @zindex-navbar; border-width: 0 0 1px; + @media (min-width: @grid-float-breakpoint) { border-radius: 0; } -- cgit v1.2.3 From d8fab5aa6e828567feaa4cb3a171255e29f42165 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 22:41:57 -0700 Subject: Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners --- less/theme.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 38e5e7f84..0addce3f2 100644 --- a/less/theme.less +++ b/less/theme.less @@ -33,6 +33,7 @@ // Mixin for generating new styles .btn-styles(@btn-color: #555) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); + .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners background-repeat: repeat-x; border-color: darken(@btn-color, 14%); -- cgit v1.2.3 From 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 22:46:21 -0700 Subject: spacing --- less/mixins.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 5c9672bcb..e892b88db 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -389,10 +389,12 @@ // ------------------------- .panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) { border-color: @border; + & > .panel-heading { color: @heading-text-color; background-color: @heading-bg-color; border-color: @heading-border; + + .panel-collapse .panel-body { border-top-color: @border; } @@ -410,6 +412,7 @@ background-color: @background; border-color: @border; color: @text-color; + hr { border-top-color: darken(@border, 5%); } -- cgit v1.2.3