From 321190535f09b41683589c7e255a087b4671d36a Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Wed, 26 Jun 2013 01:05:45 +0200 Subject: Update mixins.less Add a the function .make-small-column. See also http://stackoverflow.com/a/17308128/1596547 --- less/mixins.less | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 879836a8c..78574b368 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -474,7 +474,21 @@ } } - +// Generate the small columns +.make-small-column(@columns) { + position: relative; + float: left; + // 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); + @max : (@grid-float-breakpoint - 1 ); + // Calculate width based on number of columns available + @media (max-width: @max) { + width: percentage((@columns / @grid-columns)); + } +} // Framework mixins // -------------------------------------------------- -- cgit v1.2.3 From 2d56997c613ed77d2e7a85409e9a36289260bc76 Mon Sep 17 00:00:00 2001 From: Joey Baker Date: Wed, 3 Jul 2013 08:11:28 -0700 Subject: Remove unneeded prefixes Per caniuse, prefixes for transitions and transforms can be reduced to just `-webkit` and `-ms`. http://caniuse.com/#search=transform http://caniuse.com/#search=transition --- less/mixins.less | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index eb05623ac..81293ab6e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -110,56 +110,40 @@ // Transitions .transition(@transition) { -webkit-transition: @transition; - -moz-transition: @transition; - -o-transition: @transition; transition: @transition; } .transition-delay(@transition-delay) { -webkit-transition-delay: @transition-delay; - -moz-transition-delay: @transition-delay; - -o-transition-delay: @transition-delay; transition-delay: @transition-delay; } .transition-duration(@transition-duration) { -webkit-transition-duration: @transition-duration; - -moz-transition-duration: @transition-duration; - -o-transition-duration: @transition-duration; transition-duration: @transition-duration; } // Transformations .rotate(@degrees) { -webkit-transform: rotate(@degrees); - -moz-transform: rotate(@degrees); -ms-transform: rotate(@degrees); - -o-transform: rotate(@degrees); transform: rotate(@degrees); } .scale(@ratio) { -webkit-transform: scale(@ratio); - -moz-transform: scale(@ratio); -ms-transform: scale(@ratio); - -o-transform: scale(@ratio); transform: scale(@ratio); } .translate(@x, @y) { -webkit-transform: translate(@x, @y); - -moz-transform: translate(@x, @y); -ms-transform: translate(@x, @y); - -o-transform: translate(@x, @y); transform: translate(@x, @y); } .skew(@x, @y) { -webkit-transform: skew(@x, @y); - -moz-transform: skew(@x, @y); -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 - -o-transform: skew(@x, @y); transform: skew(@x, @y); } .translate3d(@x, @y, @z) { -webkit-transform: translate3d(@x, @y, @z); - -moz-transform: translate3d(@x, @y, @z); - -o-transform: translate3d(@x, @y, @z); transform: translate3d(@x, @y, @z); } @@ -175,16 +159,11 @@ // Background clipping .background-clip(@clip) { - -webkit-background-clip: @clip; - -moz-background-clip: @clip; background-clip: @clip; } // Background sizing .background-size(@size) { - -webkit-background-size: @size; - -moz-background-size: @size; - -o-background-size: @size; background-size: @size; } -- cgit v1.2.3 From 8a84da6341e19011ce8f8e518d7b1cb7f0931da5 Mon Sep 17 00:00:00 2001 From: Maurice Wahba Date: Sat, 6 Jul 2013 22:20:56 +0400 Subject: Carousel no longer dependent on glyphicons Used laquo/raquo for control buttons Updated docs --- less/carousel.less | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 8834c6f7b..d41fc07ad 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -99,7 +99,7 @@ } // Toggles - .glyphicon { + .glyphicon, .icon-prev, .icon-next { position: absolute; top: 50%; left: 50%; @@ -110,6 +110,17 @@ margin-top: -10px; margin-left: -10px; } + // Non-glyphicon toggles + .icon-prev { + &:before { + content: '\00ab'; + } + } + .icon-next { + &:before { + content: '\00bb'; + } + } } // Optional indicator pips @@ -167,7 +178,9 @@ @media screen and (min-width: @screen-tablet) { // Scale up the controls a smidge - .carousel-control .glyphicon { + .carousel-control .glyphicon, + .carousel-control .icon-prev, + .carousel-control .icon-next { width: 30px; height: 30px; margin-top: -15px; -- cgit v1.2.3 From 3604b868064f6e48e1301b1148779a8a819200fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 23:41:05 -0700 Subject: fixes #8477: use var for rounded image border-radius --- 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 8fc3a2360..b6128dc5d 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -71,7 +71,7 @@ img { // Rounded corners .img-rounded { - border-radius: 6px; + border-radius: @border-radius-large; } // Image thumbnails -- cgit v1.2.3 From e57758cbb453602549742360120653e08863671f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 23:54:09 -0700 Subject: Drop `.nav-header` for `.dropdown-header` * Since we no longer have `.nav-list`, I've nuked the `.nav-header` * However, dropdowns can still have section headings, so I've kept that around with the addition of `.dropdown-header` * Restyled it a smidge as well --- less/dropdowns.less | 19 +++++++++++-------- less/navs.less | 16 ---------------- 2 files changed, 11 insertions(+), 24 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 8ae9dbba1..7e35d4287 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -120,6 +120,17 @@ } } +// Dropdown section headers +// --------------------------- +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: @font-size-small; + line-height: @line-height-base; + color: @gray-light; +} + + // Backdrop to catch body clicks on mobile, etc. // --------------------------- @@ -158,11 +169,3 @@ margin-bottom: 1px; } } - -// Tweak nav headers -// --------------------------- -// Increase padding from 15px to 20px on sides -.dropdown .dropdown-menu .nav-header { - padding-left: 20px; - padding-right: 20px; -} diff --git a/less/navs.less b/less/navs.less index 87780a156..9f671643a 100644 --- a/less/navs.less +++ b/less/navs.less @@ -195,22 +195,6 @@ -// Nav headers (for dropdowns and lists) -// ------------------------- - -.nav-header { - display: block; - padding: 3px 15px; - font-size: @font-size-mini; - font-weight: bold; - line-height: @line-height-base; - color: @gray-light; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - text-transform: uppercase; -} - - - // Tabbable tabs // ------------------------- -- cgit v1.2.3 From bc79f8a399a01a8dc1c814a48103aadb11457ee6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 23:55:58 -0700 Subject: Bump tooltips to use `@font-size-small` (11px to 12px) --- less/tooltip.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tooltip.less b/less/tooltip.less index 790eb1cd3..fef430900 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -9,7 +9,7 @@ z-index: @zindex-tooltip; display: block; visibility: visible; - font-size: @font-size-mini; + font-size: @font-size-small; line-height: 1.4; .opacity(0); -- cgit v1.2.3 From e5bfd8c00b906b5be8030e2871399fe3634bf6e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 23:56:20 -0700 Subject: Fixes #8441: remove `@font-size-mini` --- less/variables.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index fdd5929db..33db5fd64 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,7 +48,6 @@ @font-size-base: 14px; @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px -@font-size-mini: ceil(@font-size-base * 0.75); // ~11px @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -- cgit v1.2.3 From 79a10feb7aaebfb8714f1b8abb0bcbb44eb53d65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 00:10:22 -0700 Subject: Fixes #8452: adds `.active` to table classes --- less/tables.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 3a546917c..b742897c1 100644 --- a/less/tables.less +++ b/less/tables.less @@ -219,6 +219,11 @@ table { // Exact selectors below required to override .table-striped .table > tbody > tr { + > td.active, + > th.active, + &.active > td { + background-color: @table-bg-hover; + } > td.success, > th.success, &.success > td { -- cgit v1.2.3 From e7bc9e1c3d60c2ac748896fcc0e31855f63590ef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 00:23:35 -0700 Subject: Vurrriables and shit --- less/variables.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 33db5fd64..daeccb4b7 100644 --- a/less/variables.less +++ b/less/variables.less @@ -85,7 +85,8 @@ @table-bg: transparent; // overall background-color @table-bg-accent: #f9f9f9; // for striping -@table-bg-hover: #f5f5f5; // for hover +@table-bg-hover: #f5f5f5; +@table-bg-active: @table-bg-hover; @table-border-color: #ddd; // table and cell border -- cgit v1.2.3 From 8dc7807dcdd67881280ea8d7d3f58bc7ce5b31ca Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 00:48:02 -0700 Subject: change characters --- less/carousel.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index d41fc07ad..40d7e277e 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -99,7 +99,9 @@ } // Toggles - .glyphicon, .icon-prev, .icon-next { + .glyphicon, + .icon-prev, + .icon-next { position: absolute; top: 50%; left: 50%; @@ -113,12 +115,12 @@ // Non-glyphicon toggles .icon-prev { &:before { - content: '\00ab'; + content: '\2039'; } } .icon-next { &:before { - content: '\00bb'; + content: '\203a'; } } } -- cgit v1.2.3 From d87431a29e6ca3e58df50209ba5f6d487cd1c780 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 00:56:36 -0700 Subject: spacing and local var rename --- less/mixins.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 18e9a5c8f..4dbfa83ef 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -442,8 +442,6 @@ .clearfix(); } -// Make a grid - // Creates a wrapper for a series of columns .make-row() { // Then clear the floated columns @@ -460,6 +458,7 @@ margin-right: (@grid-gutter-width / -2); } } + // Generate the columns .make-column(@columns) { position: relative; @@ -475,6 +474,7 @@ width: percentage((@columns / @grid-columns)); } } + // Generate the column offsets .make-column-offset(@columns) { @media (min-width: @grid-float-breakpoint) { @@ -501,9 +501,10 @@ // Inner gutter via padding padding-left: (@grid-gutter-width / 2); padding-right: (@grid-gutter-width / 2); - @max : (@grid-float-breakpoint - 1 ); + @max-width: (@grid-float-breakpoint - 1); + // Calculate width based on number of columns available - @media (max-width: @max) { + @media (max-width: @max-width) { width: percentage((@columns / @grid-columns)); } } -- cgit v1.2.3 From 181b27677492050adceaa52fe972115515759f07 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jul 2013 01:04:54 -0700 Subject: Fixes #8397: better navbar padding with grid gutter stuff --- less/navbar.less | 8 ++++---- less/variables.less | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 7a6e80488..181849057 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -6,8 +6,8 @@ .navbar { position: relative; margin-bottom: 20px; - padding-left: @navbar-padding; - padding-right: @navbar-padding; + padding-left: @navbar-padding-horizontal; + padding-right: @navbar-padding-horizontal; background-color: @navbar-bg; border-radius: @border-radius-base; @@ -100,7 +100,7 @@ max-width: 200px; margin-left: auto; margin-right: auto; - padding: @navbar-padding; + padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; font-weight: 500; line-height: @line-height-computed; @@ -298,7 +298,7 @@ .navbar-brand { float: left; - margin-left: -(@navbar-padding); + margin-left: -(@navbar-padding-horizontal); margin-right: 5px; } .navbar-nav { diff --git a/less/variables.less b/less/variables.less index daeccb4b7..b28d33091 100644 --- a/less/variables.less +++ b/less/variables.less @@ -176,7 +176,8 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; -@navbar-padding: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-vertical: 15px; // Navbar links @navbar-link-color: #777; -- cgit v1.2.3