From efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8 Mon Sep 17 00:00:00 2001 From: liuyl Date: Sun, 28 Jul 2013 14:05:47 +0800 Subject: make pull-right !important --- less/navbar.less | 1 - less/navs.less | 6 ------ less/type.less | 1 - less/utilities.less | 4 ++-- 4 files changed, 2 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 653a8d6d9..05077827c 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -317,7 +317,6 @@ } &.pull-right { - float: right; width: auto; } } diff --git a/less/navs.less b/less/navs.less index 4cbc98766..8600a752e 100644 --- a/less/navs.less +++ b/less/navs.less @@ -56,12 +56,6 @@ } } - // Redeclare pull classes because of specificity - // Todo: consider making these utilities !important to avoid this bullshit - > .pull-right { - float: right; - } - // Dividers (basically an hr) within the dropdown .nav-divider { .nav-divider(); diff --git a/less/type.less b/less/type.less index 0acb7f35d..ba0a33692 100644 --- a/less/type.less +++ b/less/type.less @@ -195,7 +195,6 @@ blockquote { // Float right with text-align: right &.pull-right { - float: right; padding-right: 15px; padding-left: 0; border-right: 5px solid @blockquote-border-color; diff --git a/less/utilities.less b/less/utilities.less index d296b32c2..3d310e651 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -10,10 +10,10 @@ .clearfix(); } .pull-right { - float: right; + float: right !important; } .pull-left { - float: left; + float: left !important; } -- cgit v1.2.3 From 1aedb7862ccf93bb983652bc24c11cc9f01699d3 Mon Sep 17 00:00:00 2001 From: syed Date: Sun, 28 Jul 2013 17:32:08 +0500 Subject: move things around Moved alerts, badges, button groups, buttons, carousel, close to variables.less and customize.html --- less/alerts.less | 2 +- less/badges.less | 6 +++--- less/button-groups.less | 4 ++-- less/buttons.less | 6 +++--- less/carousel.less | 8 ++++---- less/close.less | 4 ++-- less/variables.less | 24 ++++++++++++++++++++++-- 7 files changed, 37 insertions(+), 17 deletions(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index 66aa6cf24..02ca8a201 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -26,7 +26,7 @@ } // Provide class for links that match alerts .alert-link { - font-weight: 500; + font-weight: @alert-link-font-weight; color: darken(@alert-text, 10%); } diff --git a/less/badges.less b/less/badges.less index 216d6014b..6e7ae08f9 100644 --- a/less/badges.less +++ b/less/badges.less @@ -9,14 +9,14 @@ min-width: 10px; padding: 3px 7px; font-size: @font-size-small; - font-weight: bold; + font-weight: @badge-font-weight; color: @badge-color; - line-height: 1; + line-height: @badge-line-height; vertical-align: middle; white-space: nowrap; text-align: center; background-color: @badge-bg; - border-radius: 10px; + border-radius: @badge-border-radius; // Empty labels/badges collapse &:empty { diff --git a/less/button-groups.less b/less/button-groups.less index f345f4e13..9fe96df92 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -117,11 +117,11 @@ } // Carets in other button sizes .btn-large .caret { - border-width: 5px; + border-width: @btn-large-caret-border-width; } // Upside down carets for .dropup .dropup .btn-large .caret { - border-bottom-width: 5px; + border-bottom-width: @btn-large-caret-border-width; } diff --git a/less/buttons.less b/less/buttons.less index b8bbfc6cf..9d6289518 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -12,7 +12,7 @@ padding: @padding-base-vertical @padding-base-horizontal; margin-bottom: 0; // For input.btn font-size: @font-size-base; - font-weight: 500; + font-weight: @font-weight-base; line-height: @line-height-base; text-align: center; vertical-align: middle; @@ -109,7 +109,7 @@ fieldset[disabled] & { &:hover, &:focus { - color: @gray-dark; + color: @btn-link-disabled-color; text-decoration: none; } } @@ -127,7 +127,7 @@ .btn-small { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; - line-height: 1.5; // ensure proper height of button next to small input + line-height: @btn-small-line-height; // ensure proper height of button next to small input border-radius: @border-radius-small; } diff --git a/less/carousel.less b/less/carousel.less index 3526089c2..98ce5916b 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -69,9 +69,9 @@ top: 0; left: 0; bottom: 0; - width: 15%; - .opacity(.5); - font-size: 20px; + width: @carousel-control-width; + .opacity(@carousel-control-opacity); + font-size: @carousel-control-font-size; color: @carousel-control-color; text-align: center; text-shadow: @carousel-text-shadow; @@ -133,7 +133,7 @@ bottom: 10px; left: 50%; z-index: 15; - width: 120px; + width: @carousel-indicators-width; margin-left: -60px; padding-left: 0; list-style: none; diff --git a/less/close.less b/less/close.less index f915667e5..a2936ec2f 100644 --- a/less/close.less +++ b/less/close.less @@ -6,8 +6,8 @@ .close { float: right; font-size: (@font-size-base * 1.5); - font-weight: bold; - line-height: 1; + font-weight: @close-font-weight; + line-height: @close-line-height; color: @close-color; text-shadow: @close-text-shadow; .opacity(.2); diff --git a/less/variables.less b/less/variables.less index 878725f6c..c97847d7d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,11 +48,13 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-weight-base: 500; + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; -@headings-font-weight: 500; +@headings-font-weight: @font-weight-base; @headings-line-height: 1.1; @@ -120,6 +122,11 @@ @btn-hover-color: @btn-default-color; +@btn-small-line-height: 1.5; +@btn-link-disabled-color: @gray-dark; +@btn-large-caret-border-width: 5px; + + // Forms // ------------------------- @@ -383,6 +390,8 @@ @alert-info-text: @state-info-text; @alert-info-border: @state-info-border; +@alert-link-font-weight: @font-weight-base; + // Progress bars // ------------------------- @@ -467,6 +476,10 @@ @badge-active-color: @link-color; @badge-active-bg: #fff; +@badge-font-weight: bold; +@badge-line-height: 1; +@badge-border-radius: 10px; + // Breadcrumbs // ------------------------- @@ -480,9 +493,13 @@ @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @carousel-control-color: #fff; +@carousel-control-width: 15%; +@carousel-control-opacity: .5; +@carousel-control-font-size: 20px; -@carousel-indicator-border-color: #fff; +@carousel-indicators-width: 120px; @carousel-indicator-active-bg: #fff; +@carousel-indicator-border-color: #fff; @carousel-caption-color: #fff; @@ -492,6 +509,9 @@ @close-color: #000; @close-text-shadow: 0 1px 0 #fff; +@close-font-weight: bold; +@close-line-height: 1; + // Code // ------------------------ -- cgit v1.2.3 From 8858ef4dae8587db7ad85930b7c4baa08d9a780d Mon Sep 17 00:00:00 2001 From: Nicholas Westlake Date: Sun, 28 Jul 2013 21:25:16 -0500 Subject: Format multiple badges in list-group-item --- less/list-group.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index ad6ac96ad..58207be6d 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -37,6 +37,9 @@ float: right; margin-right: -15px; } + > .badge + .badge { + margin-right: 0; + } } // Custom content options -- cgit v1.2.3 From 7cfcfdfe64159b4ea7b94606f9303ab567049198 Mon Sep 17 00:00:00 2001 From: liuyl Date: Tue, 30 Jul 2013 09:30:21 +0800 Subject: make navbar-text float left --- less/navbar.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 653a8d6d9..44e2d9f3f 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -354,6 +354,8 @@ // Add a class to make any element properly align itself vertically within the navbars. .navbar-text { + float: left; + padding: 0 @navbar-padding-horizontal; .navbar-vertical-align(@line-height-computed); } -- cgit v1.2.3 From b9f59428f99f11f687948afae4271704c1a429f5 Mon Sep 17 00:00:00 2001 From: Archan Luhar Date: Tue, 30 Jul 2013 19:30:24 -0700 Subject: Removed background color from #gradient mixins to support transparent gradients --- less/mixins.less | 7 ------- 1 file changed, 7 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 2fb9a8ff4..29ed4d8b2 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -236,7 +236,6 @@ // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9 and below. .horizontal(@start-color: #555; @start-percent: 0%; @end-color: #333; @end-percent: 100%) { - background-color: @end-color; background-image: -webkit-gradient(linear, @start-percent top, @end-percent top, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1+, Chrome 10+ background-image: -moz-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // FF 3.6+ @@ -250,7 +249,6 @@ // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9 and below. .vertical(@start-color: #555; @start-percent: 0%; @end-color: #333; @end-percent: 100%) { - background-color: @end-color; background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(top, @start-color, @start-percent, @end-color, @end-percent); // Safari 5.1+, Chrome 10+ background-image: -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+ @@ -260,14 +258,12 @@ } .directional(@start-color: #555, @end-color: #333, @deg: 45deg) { - background-color: @end-color; background-repeat: repeat-x; background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1+, Chrome 10+ background-image: -moz-linear-gradient(@deg, @start-color, @end-color); // FF 3.6+ background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10 } .horizontal-three-colors(@start-color: #00b3ee, @mid-color: #7a43b6, @color-stop: 50%, @end-color: #c3325f) { - background-color: mix(@mid-color, @end-color, 80%); background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color)); background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); background-image: -moz-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); @@ -277,7 +273,6 @@ } .vertical-three-colors(@start-color: #00b3ee, @mid-color: #7a43b6, @color-stop: 50%, @end-color: #c3325f) { - background-color: mix(@mid-color, @end-color, 80%); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color)); background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color); background-image: -moz-linear-gradient(top, @start-color, @mid-color @color-stop, @end-color); @@ -286,7 +281,6 @@ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback } .radial(@inner-color: #555, @outer-color: #333) { - background-color: @outer-color; background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@inner-color), to(@outer-color)); background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color); background-image: -moz-radial-gradient(circle, @inner-color, @outer-color); @@ -294,7 +288,6 @@ background-repeat: no-repeat; } .striped(@color: #555, @angle: 45deg) { - background-color: @color; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); -- cgit v1.2.3 From e9413315b55ec036a6de9846e4fb2fed1f910b7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 31 Jul 2013 18:06:20 -0700 Subject: fixes #8937: align the dropdown menus in input groups --- less/input-groups.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index fed7d5645..f717e59c0 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -5,6 +5,7 @@ // Base styles // ------------------------- .input-group { + position: relative; // For dropdowns display: table; border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table -- cgit v1.2.3 From 56aedcb71397c867396455b6860d627c1efe2707 Mon Sep 17 00:00:00 2001 From: liuyl Date: Thu, 1 Aug 2013 11:26:12 +0800 Subject: add table-layout --- less/button-groups.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index d78815c93..4ee5616f3 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -157,6 +157,7 @@ .btn-group-justified { display: table; width: 100%; + table-layout: fixed; .btn { float: none; display: table-cell; -- cgit v1.2.3 From 15b98a0bb1c7500eb0e9dc556247f5ea39af03ae Mon Sep 17 00:00:00 2001 From: leonardovcid Date: Thu, 1 Aug 2013 14:39:28 +0100 Subject: Correct comment which is showing a wrong mixin call example (mixins.less) I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo. Thanks --- 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 d359ce70f..a268786e2 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -405,7 +405,7 @@ // Navbar vertical align // ------------------------- // 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. +// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin. .navbar-vertical-align(@element-height) { margin-top: ((@navbar-height - @element-height) / 2); margin-bottom: ((@navbar-height - @element-height) / 2); -- cgit v1.2.3 From a5641b0cca0d179d063bbf13fc3b7702605b091b Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Thu, 1 Aug 2013 16:05:07 +0200 Subject: Update input-groups.less align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2) --- less/input-groups.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index f717e59c0..3586beef7 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -136,7 +136,9 @@ // -------------------------------------------------- // Horizontal forms are built on grid classes. -.form-horizontal .control-label { +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { padding-top: 9px; } -- cgit v1.2.3 From 1583dd55e9f05275ee054884720dce2be8e2f07a Mon Sep 17 00:00:00 2001 From: Jeff Tickle Date: Thu, 1 Aug 2013 11:49:16 -0400 Subject: Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset --- less/grid.less | 106 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 72 insertions(+), 34 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 12803f39a..dfaf4f970 100644 --- a/less/grid.less +++ b/less/grid.less @@ -125,29 +125,42 @@ .col-sm-12 { width: 100%; } // Push and pull columns for source order changes - .col-push-1 { left: percentage((1 / @grid-columns)); } - .col-push-2 { left: percentage((2 / @grid-columns)); } - .col-push-3 { left: percentage((3 / @grid-columns)); } - .col-push-4 { left: percentage((4 / @grid-columns)); } - .col-push-5 { left: percentage((5 / @grid-columns)); } - .col-push-6 { left: percentage((6 / @grid-columns)); } - .col-push-7 { left: percentage((7 / @grid-columns)); } - .col-push-8 { left: percentage((8 / @grid-columns)); } - .col-push-9 { left: percentage((9 / @grid-columns)); } - .col-push-10 { left: percentage((10/ @grid-columns)); } - .col-push-11 { left: percentage((11/ @grid-columns)); } - - .col-pull-1 { right: percentage((1 / @grid-columns)); } - .col-pull-2 { right: percentage((2 / @grid-columns)); } - .col-pull-3 { right: percentage((3 / @grid-columns)); } - .col-pull-4 { right: percentage((4 / @grid-columns)); } - .col-pull-5 { right: percentage((5 / @grid-columns)); } - .col-pull-6 { right: percentage((6 / @grid-columns)); } - .col-pull-7 { right: percentage((7 / @grid-columns)); } - .col-pull-8 { right: percentage((8 / @grid-columns)); } - .col-pull-9 { right: percentage((9 / @grid-columns)); } - .col-pull-10 { right: percentage((10/ @grid-columns)); } - .col-pull-11 { right: percentage((11/ @grid-columns)); } + .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)); } } // Medium and large device columns (desktop and up) @@ -182,18 +195,43 @@ .col-lg-11 { width: percentage((11/ @grid-columns)); } .col-lg-12 { width: 100%; } + // Push and pull columns for source order changes + .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-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-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .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)); } } // Large desktops and up -- cgit v1.2.3 From 824d5d5de486c7540f7357972d69dd169cfcfe1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Thu, 1 Aug 2013 20:07:34 +0200 Subject: Fix #8944 --- less/dropdowns.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 938e682f5..1cd76a070 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -17,6 +17,12 @@ content: ""; } +// The dropdown wrapper (div) +// -------------------------- +.dropdown { + position: relative; +} + // The dropdown menu (ul) // ---------------------- .dropdown-menu { -- cgit v1.2.3 From d0b94ead9a660adeca599b2cc49ce5134d432f2f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 09:32:58 -0700 Subject: Fix #9008: consolidate `.alert-block` styles into `.alert` --- less/alerts.less | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index 66aa6cf24..f7ba9ba1c 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -7,7 +7,7 @@ // ------------------------- .alert { - padding: 10px 35px 10px 15px; + padding: 15px 35px 15px 15px; margin-bottom: @line-height-computed; color: @alert-text; background-color: @alert-bg; @@ -37,6 +37,15 @@ right: -21px; color: inherit; } + + // Improve alignment and spacing of inner content + > p, + > ul { + margin-bottom: 0; + } + > p + p { + margin-top: 5px; + } } // Alternate styles @@ -51,19 +60,3 @@ .alert-info { .alert-variant(@alert-info-bg, @alert-info-border, @alert-info-text); } - -// Block alerts -// ------------------------- - -.alert-block { - padding-top: 15px; - padding-bottom: 15px; - - > p, - > ul { - margin-bottom: 0; - } - p + p { - margin-top: 5px; - } -} -- cgit v1.2.3 From 048e19b8921ff0cae8ade7ace7700f0563c1fb82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 09:42:50 -0700 Subject: Fixes #8996: shift placement of justified CSS for nav component --- less/navs.less | 67 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 340b63970..437052fc2 100644 --- a/less/navs.less +++ b/less/navs.less @@ -69,40 +69,6 @@ } - -// Nav variations -// -------------------------------------------------- - -// Justified nav links -// ------------------------- - -.nav-justified { - width: 100%; - > li { - float: none; - display: table-cell; - width: 1%; - > a { - text-align: center; - } - } -} - -// Move borders to anchors instead of bottom of list -.nav-tabs-justified { - border-bottom: 0; - > li > a { - border-bottom: 1px solid @nav-tabs-justified-link-border-color; - - // Override margin from .nav-tabs - margin-right: 0; - } - > .active > a { - border-bottom-color: @nav-tabs-justified-active-link-border-color; - } - -} - // Tabs // ------------------------- @@ -185,6 +151,39 @@ } +// Nav variations +// -------------------------------------------------- + +// Justified nav links +// ------------------------- + +.nav-justified { + width: 100%; + > li { + float: none; + display: table-cell; + width: 1%; + > a { + text-align: center; + } + } +} + +// Move borders to anchors instead of bottom of list +.nav-tabs-justified { + border-bottom: 0; + > li > a { + border-bottom: 1px solid @nav-tabs-justified-link-border-color; + + // Override margin from .nav-tabs + margin-right: 0; + } + > .active > a { + border-bottom-color: @nav-tabs-justified-active-link-border-color; + } +} + + // Tabbable tabs // ------------------------- -- cgit v1.2.3 From c017e19ed236c1e2f6d3818e080f2a03ef4f947b Mon Sep 17 00:00:00 2001 From: Jon Schlinkert Date: Fri, 2 Aug 2013 15:31:13 -0400 Subject: Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS. --- less/alerts.less | 6 +++--- less/buttons.less | 12 ++++++------ less/forms.less | 6 +++--- less/mixins.less | 30 +++++++++++++++--------------- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index f7ba9ba1c..09293d601 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -52,11 +52,11 @@ // ------------------------- .alert-success { - .alert-variant(@alert-success-bg, @alert-success-border, @alert-success-text); + .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text); } .alert-danger { - .alert-variant(@alert-danger-bg, @alert-danger-border, @alert-danger-text); + .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text); } .alert-info { - .alert-variant(@alert-info-bg, @alert-info-border, @alert-info-text); + .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text); } diff --git a/less/buttons.less b/less/buttons.less index 24ff6549e..d62242863 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -54,26 +54,26 @@ // -------------------------------------------------- .btn-default { - .btn-pseudo-states(@btn-default-color, @btn-default-bg, @btn-default-border); + .btn-pseudo-states(@btn-default-color; @btn-default-bg; @btn-default-border); } .btn-primary { - .btn-pseudo-states(@btn-primary-color, @btn-primary-bg, @btn-primary-border); + .btn-pseudo-states(@btn-primary-color; @btn-primary-bg; @btn-primary-border); } // Warning appears as orange .btn-warning { - .btn-pseudo-states(@btn-warning-color, @btn-warning-bg, @btn-warning-border); + .btn-pseudo-states(@btn-warning-color; @btn-warning-bg; @btn-warning-border); } // Danger and error appear as red .btn-danger { - .btn-pseudo-states(@btn-danger-color, @btn-danger-bg, @btn-danger-border); + .btn-pseudo-states(@btn-danger-color; @btn-danger-bg; @btn-danger-border); } // Success appears as green .btn-success { - .btn-pseudo-states(@btn-success-color, @btn-success-bg, @btn-success-border); + .btn-pseudo-states(@btn-success-color; @btn-success-bg; @btn-success-border); } // Info appears as blue-green .btn-info { - .btn-pseudo-states(@btn-info-color, @btn-info-bg, @btn-info-border); + .btn-pseudo-states(@btn-info-color; @btn-info-bg; @btn-info-border); } diff --git a/less/forms.less b/less/forms.less index f4e8c996d..fc5585928 100644 --- a/less/forms.less +++ b/less/forms.less @@ -255,15 +255,15 @@ textarea { // Warning .has-warning { - .form-control-validation(@state-warning-text, @state-warning-text, @state-warning-bg); + .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg); } // Error .has-error { - .form-control-validation(@state-danger-text, @state-danger-text, @state-danger-bg); + .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); } // Success .has-success { - .form-control-validation(@state-success-text, @state-success-text, @state-success-bg); + .form-control-validation(@state-success-text; @state-success-text; @state-success-bg); } diff --git a/less/mixins.less b/less/mixins.less index a268786e2..77ed5d512 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -44,12 +44,12 @@ } // Sizing shortcuts -.size(@width, @height) { +.size(@width; @height) { width: @width; height: @height; } .square(@size) { - .size(@size, @size); + .size(@size; @size); } // Placeholder text @@ -138,17 +138,17 @@ -ms-transform: scale(@ratio); transform: scale(@ratio); } -.translate(@x, @y) { +.translate(@x; @y) { -webkit-transform: translate(@x, @y); -ms-transform: translate(@x, @y); transform: translate(@x, @y); } -.skew(@x, @y) { +.skew(@x; @y) { -webkit-transform: skew(@x, @y); -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885 transform: skew(@x, @y); } -.translate3d(@x, @y, @z) { +.translate3d(@x; @y; @z) { -webkit-transform: translate3d(@x, @y, @z); transform: translate3d(@x, @y, @z); } @@ -197,7 +197,7 @@ } // CSS3 Content Columns -.content-columns(@column-count, @column-gap: @grid-gutter-width) { +.content-columns(@column-count; @column-gap: @grid-gutter-width) { -webkit-column-count: @column-count; -moz-column-count: @column-count; column-count: @column-count; @@ -259,14 +259,14 @@ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down } - .directional(@start-color: #555, @end-color: #333, @deg: 45deg) { + .directional(@start-color: #555; @end-color: #333; @deg: 45deg) { background-color: @end-color; background-repeat: repeat-x; background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1+, Chrome 10+ background-image: -moz-linear-gradient(@deg, @start-color, @end-color); // FF 3.6+ background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10 } - .horizontal-three-colors(@start-color: #00b3ee, @mid-color: #7a43b6, @color-stop: 50%, @end-color: #c3325f) { + .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { background-color: mix(@mid-color, @end-color, 80%); background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color)); background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); @@ -276,7 +276,7 @@ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback } - .vertical-three-colors(@start-color: #00b3ee, @mid-color: #7a43b6, @color-stop: 50%, @end-color: #c3325f) { + .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { background-color: mix(@mid-color, @end-color, 80%); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color)); background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color); @@ -285,7 +285,7 @@ background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback } - .radial(@inner-color: #555, @outer-color: #333) { + .radial(@inner-color: #555; @outer-color: #333) { background-color: @outer-color; background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@inner-color), to(@outer-color)); background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color); @@ -293,7 +293,7 @@ background-image: radial-gradient(circle, @inner-color, @outer-color); background-repeat: no-repeat; } - .striped(@color: #555, @angle: 45deg) { + .striped(@color: #555; @angle: 45deg) { background-color: @color; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); @@ -316,7 +316,7 @@ // -------------------------------------------------- // Short retina mixin for setting background-image and -size -.img-retina(@file-1x, @file-2x, @width-1x, @height-1x) { +.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) { background-image: url("@{file-1x}"); @media @@ -347,7 +347,7 @@ // Alerts // ------------------------- -.alert-variant(@background, @border, @text-color) { +.alert-variant(@background; @border; @text-color) { background-color: @background; border-color: @border; color: @text-color; @@ -363,7 +363,7 @@ // ------------------------- // Easily pump out default styles, as well as :hover, :focus, :active, // and disabled options for all buttons -.btn-pseudo-states(@color, @background, @border) { +.btn-pseudo-states(@color; @background; @border) { color: @color; background-color: @background; border-color: @border; @@ -520,7 +520,7 @@ // Used in forms.less to generate the form validation CSS for warnings, errors, // and successes. -.form-control-validation(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) { +.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { // Color the label and help text .help-block, .control-label { -- cgit v1.2.3 From d46e645a0f19b24280bf700f4d4fb56caadb4409 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 14:07:26 -0700 Subject: fixes #9015: bold links not semibold in alerts --- 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 09293d601..75e142d8f 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -26,7 +26,7 @@ } // Provide class for links that match alerts .alert-link { - font-weight: 500; + font-weight: bold; color: darken(@alert-text, 10%); } -- cgit v1.2.3 From 173dac4e54281312ebb7ff993df20caffbc56840 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 15:09:48 -0700 Subject: Tighten up buttons and form controls * Smaller padding on buttons and large buttons * Same with inputs and large inputs * Remove about 10px from height of large inputs/buttons and 4px from regular ones Fixes #8707 and #8700. (Also relevant: #8711) --- less/buttons.less | 1 + less/forms.less | 2 ++ less/variables.less | 11 +++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index d62242863..c206179df 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -123,6 +123,7 @@ .btn-large { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; + line-height: 1.33; // ensure even-numbered height of butotn next to large input border-radius: @border-radius-large; } .btn-small, diff --git a/less/forms.less b/less/forms.less index fc5585928..494d328c0 100644 --- a/less/forms.less +++ b/less/forms.less @@ -222,12 +222,14 @@ input[type="number"] { height: @input-height-large; padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; + line-height: @line-height-large; border-radius: @border-radius-large; } .input-small { height: @input-height-small; padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; + line-height: @line-height-small; border-radius: @border-radius-small; } diff --git a/less/variables.less b/less/variables.less index 71e813d32..a869ce960 100644 --- a/less/variables.less +++ b/less/variables.less @@ -60,15 +60,18 @@ // ------------------------- // Based on 14px font-size and 1.428 line-height (~20px to start) -@padding-base-vertical: 8px; +@padding-base-vertical: 6px; @padding-base-horizontal: 12px; -@padding-large-vertical: 14px; +@padding-large-vertical: 10px; @padding-large-horizontal: 16px; @padding-small-vertical: 5px; @padding-small-horizontal: 10px; +@line-height-large: 1.33; +@line-height-small: 1.5; + @border-radius-base: 4px; @border-radius-large: 6px; @border-radius-small: 3px; @@ -132,8 +135,8 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2); -@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2); +@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); +@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); @legend-border-color: #e5e5e5; -- cgit v1.2.3 From 0fefbbe65964cf4dae2f60b7651e77df9324d796 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 2 Aug 2013 16:36:54 -0700 Subject: fix typo in comment --- less/buttons.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index c206179df..8905ffa4a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -123,7 +123,7 @@ .btn-large { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; - line-height: 1.33; // ensure even-numbered height of butotn next to large input + line-height: 1.33; // ensure even-numbered height of button next to large input border-radius: @border-radius-large; } .btn-small, -- cgit v1.2.3 From 6b850132d056a136dc4734c4d68c9e1c23b7843e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 17:57:19 -0700 Subject: Remove requirement of `.list-group-flush` when list groups are in panels Fixes #8900 --- less/panels.less | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 691a15545..715ae1873 100644 --- a/less/panels.less +++ b/less/panels.less @@ -11,6 +11,24 @@ border: 1px solid @panel-border; border-radius: @panel-border-radius; .box-shadow(0 1px 1px rgba(0,0,0,.05)); + + // List groups in panels + .list-group { + margin: 15px -15px -15px; + + .list-group-item { + border-width: 1px 0; + + // Remove border radius for top one + &:first-child { + .border-top-radius(0); + } + // But keep it for the last one + &:last-child { + border-bottom: 0; + } + } + } } // Optional heading @@ -82,21 +100,3 @@ border-color: @panel-info-border; } } - -// List groups in panels -.list-group-flush { - margin: 15px -15px -15px; - - .list-group-item { - border-width: 1px 0; - - // Remove border radius for top one - &:first-child { - .border-top-radius(0); - } - // But keep it for the last one - &:last-child { - border-bottom: 0; - } - } -} -- cgit v1.2.3 From 9435991ff0ffa79c027f12c0a08aa13376c3b2fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 18:48:44 -0700 Subject: move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b) --- less/forms.less | 44 ++++++++++++++++++++++++++++++++++++++++++++ less/input-groups.less | 41 ----------------------------------------- 2 files changed, 44 insertions(+), 41 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 494d328c0..41d50a5e0 100644 --- a/less/forms.less +++ b/less/forms.less @@ -280,3 +280,47 @@ textarea { margin-bottom: 10px; color: lighten(@text-color, 25%); // lighten the text some for contrast } + + + +// Inline forms +// +// Make forms appear inline(-block). + +.form-inline { + .form-control, + .radio, + .checkbox { + display: inline-block; + } + .radio, + .checkbox { + margin-top: 0; + margin-bottom: 0; + } +} + + +// Horizontal forms +// +// Horizontal forms are built on grid classes and allow you to create forms with +// labels on the left and inputs on the right. + +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { + padding-top: 9px; +} + +.form-horizontal { + .form-group { + .make-row(); + } +} + +// Only right align form labels here when the columns stop stacking +@media (min-width: @screen-tablet) { + .form-horizontal .control-label { + text-align: right; + } +} diff --git a/less/input-groups.less b/less/input-groups.less index 3586beef7..1a6368831 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -113,44 +113,3 @@ z-index: 2; } } - - -// Inline forms -// -------------------------------------------------- - -.form-inline { - .form-control, - .radio, - .checkbox { - display: inline-block; - } - .radio, - .checkbox { - margin-top: 0; - margin-bottom: 0; - } -} - - -// Horizontal forms -// -------------------------------------------------- -// Horizontal forms are built on grid classes. - -.form-horizontal .control-label, -.form-horizontal .radio-inline, -.form-horizontal .checkbox-inline { - padding-top: 9px; -} - -.form-horizontal { - .form-group { - .make-row(); - } -} - -// Only right align form labels here when the columns stop stacking -@media (min-width: @screen-tablet) { - .form-horizontal .control-label { - text-align: right; - } -} -- cgit v1.2.3 From 2fd8689b08ecef4f2d1efa5d1e1edede21d2403f Mon Sep 17 00:00:00 2001 From: Elvis Ratzlaff Date: Sat, 3 Aug 2013 03:56:06 -0400 Subject: Change line-height value with variable for btn-large and btn-small --- less/buttons.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 8905ffa4a..e53b0132f 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -123,14 +123,14 @@ .btn-large { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; - line-height: 1.33; // ensure even-numbered height of button next to large input + line-height: @line-height-large; // ensure even-numbered height of button next to large input border-radius: @border-radius-large; } .btn-small, .btn-mini { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; - line-height: 1.5; // ensure proper height of button next to small input + line-height: @line-height-small; // ensure proper height of button next to small input border-radius: @border-radius-small; } .btn-mini { -- cgit v1.2.3 From 777ae911b6d5d290675b8d90d8262fa2d355cb9e Mon Sep 17 00:00:00 2001 From: Elvis Ratzlaff Date: Sat, 3 Aug 2013 03:59:37 -0400 Subject: Change value for padding on pagination to variables --- less/pagination.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/pagination.less b/less/pagination.less index 6720c6898..3441106c9 100644 --- a/less/pagination.less +++ b/less/pagination.less @@ -12,7 +12,7 @@ > a, > span { float: left; // Collapse white-space - padding: 4px 12px; + padding: @padding-base-vertical @padding-base-horizontal; line-height: @line-height-base; text-decoration: none; background-color: @pagination-bg; -- cgit v1.2.3 From 744b79a6662a82a01b87cccedc242b3aff6cfae9 Mon Sep 17 00:00:00 2001 From: James Holland Date: Sat, 3 Aug 2013 10:28:17 -0400 Subject: Update .navbar-toggle to match other navbar el In place of commit #9040, fix #8844 And sizing .navbar-toggle more like .btn elem + change `position:absolute` to `position:relative` + remove `right: 10px` in favor of `float:right` + change to `height: 34px` + remove `top:` in favor of `.navbar-vertical-align` basis new height + change `padding:` to match `.btn` el --- less/navbar.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 44e2d9f3f..37de0b4a2 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -116,12 +116,12 @@ // Collapsible navbar toggle .navbar-toggle { - position: absolute; - top: floor((@navbar-height - 32) / 2); - right: 10px; + position: relative; + float: right; + height: 34px; width: 48px; - height: 32px; - padding: 8px 12px; + .navbar-vertical-align(34px); + padding: @padding-base-vertical @padding-base-horizontal; background-color: transparent; border: 1px solid @navbar-toggle-border-color; border-radius: @border-radius-base; -- cgit v1.2.3 From bf0f3c7c1ca061616d8c6252b7024c8332248ffe Mon Sep 17 00:00:00 2001 From: Maurice Fonk Date: Sat, 3 Aug 2013 15:07:43 -0400 Subject: using @line-height-computed in .navbar-nav link When a user changed the @line-height-base/@line-height-computed var, the nav-bar items would not scale appropriately. --- 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 44e2d9f3f..8234fc099 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -28,7 +28,7 @@ padding-top: ((@navbar-height - @line-height-computed) / 2); padding-bottom: ((@navbar-height - @line-height-computed) / 2); color: @navbar-link-color; - line-height: 20px; + line-height: @line-height-computed; border-radius: @border-radius-base; &:hover, &:focus { -- cgit v1.2.3 From 4bbbf774a4b36ce5f36e4a35a2e7bed807dd640b Mon Sep 17 00:00:00 2001 From: liuyl Date: Sun, 4 Aug 2013 09:27:23 +0800 Subject: add line-height --- less/input-groups.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index 1a6368831..77be68d92 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -59,11 +59,13 @@ padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; + line-height: @line-height-small; } &.input-large { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; + line-height: @line-height-large; } // Nuke default margins from checkboxes and radios to vertically center within. -- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- less/button-groups.less | 6 +++--- less/buttons.less | 8 ++++---- less/forms.less | 12 ++++++------ less/grid.less | 2 +- less/input-groups.less | 4 ++-- less/pagination.less | 4 ++-- less/variables.less | 6 +++--- less/wells.less | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 4ee5616f3..d8eae0a50 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -100,7 +100,7 @@ padding-left: 8px; padding-right: 8px; } -.btn-group > .btn-large + .dropdown-toggle { +.btn-group > .btn-lg + .dropdown-toggle { padding-left: 12px; padding-right: 12px; } @@ -117,11 +117,11 @@ margin-left: 0; } // Carets in other button sizes -.btn-large .caret { +.btn-lg .caret { border-width: 5px; } // Upside down carets for .dropup -.dropup .btn-large .caret { +.dropup .btn-lg .caret { border-bottom-width: 5px; } diff --git a/less/buttons.less b/less/buttons.less index e53b0132f..8fad99cc8 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -120,20 +120,20 @@ // Button Sizes // -------------------------------------------------- -.btn-large { +.btn-lg { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; line-height: @line-height-large; // ensure even-numbered height of button next to large input border-radius: @border-radius-large; } -.btn-small, -.btn-mini { +.btn-sm, +.btn-xs { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; line-height: @line-height-small; // ensure proper height of button next to small input border-radius: @border-radius-small; } -.btn-mini { +.btn-xs { padding: 3px 5px; } diff --git a/less/forms.less b/less/forms.less index 41d50a5e0..127f6a67a 100644 --- a/less/forms.less +++ b/less/forms.less @@ -218,14 +218,14 @@ input[type="number"] { // horizontal sizing, wrap controls in the predefined grid classes. `` -// element gets special love because it's special, and that's a fact! - -.input-lg { - height: @input-height-large; - padding: @padding-large-vertical @padding-large-horizontal; - font-size: @font-size-large; - line-height: @line-height-large; - border-radius: @border-radius-large; -} .input-sm { - height: @input-height-small; - padding: @padding-small-vertical @padding-small-horizontal; - font-size: @font-size-small; - line-height: @line-height-small; - border-radius: @border-radius-small; + .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); } -select { - &.input-lg { - height: @input-height-large; - line-height: @input-height-large; - } - &.input-sm { - height: @input-height-small; - line-height: @input-height-small; - } -} -textarea { - &.input-lg, - &.input-sm { - height: auto; - } +.input-lg { + .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); } diff --git a/less/mixins.less b/less/mixins.less index 24bce6bbf..9d8ca0382 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -636,3 +636,26 @@ .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}"); } } + +// Form control sizing +// +// Relative text size, padding, and border-radii changes for form controls. For +// horizontal sizing, wrap controls in the predefined grid classes. `