From cd2d82150cc27c1f81d2394a22efbf2dbec0e7be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 21:46:45 -0700 Subject: standardize top level file comments --- less/progress-bars.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'less/progress-bars.less') diff --git a/less/progress-bars.less b/less/progress-bars.less index 3b47e6482..abcbe8761 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -1,5 +1,6 @@ -// PROGRESS BARS -// ------------- +// +// Progress bars +// -------------------------------------------------- // ANIMATIONS -- cgit v1.2.3 From 26dad5f56defc9efab0be87afc5c9c18d6d844a5 Mon Sep 17 00:00:00 2001 From: Dave DeSandro Date: Mon, 2 Jul 2012 17:21:26 -0400 Subject: .progress .bar { height: 100% } --- less/progress-bars.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/progress-bars.less') diff --git a/less/progress-bars.less b/less/progress-bars.less index abcbe8761..768f55ad9 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -54,7 +54,7 @@ // Bar of progress .progress .bar { width: 0%; - height: 18px; + height: 100%; color: @white; font-size: 12px; text-align: center; -- cgit v1.2.3 From a1951ed7c08bbaad37e323b460f440d9598d364e Mon Sep 17 00:00:00 2001 From: Jonas Pommerening Date: Mon, 20 Aug 2012 10:12:03 +0200 Subject: stack mutliple progress bars --- less/progress-bars.less | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'less/progress-bars.less') diff --git a/less/progress-bars.less b/less/progress-bars.less index 768f55ad9..c3de308eb 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -56,6 +56,7 @@ width: 0%; height: 100%; color: @white; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0,0,0,.25); @@ -86,33 +87,33 @@ // ------ // Danger (red) -.progress-danger .bar { +.progress-danger .bar, .progress .bar-danger { #gradient > .vertical(#ee5f5b, #c43c35); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, .progress-striped .bar-danger { #gradient > .striped(#ee5f5b); } // Success (green) -.progress-success .bar { +.progress-success .bar, .progress .bar-success { #gradient > .vertical(#62c462, #57a957); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, .progress-striped .bar-success { #gradient > .striped(#62c462); } // Info (teal) -.progress-info .bar { +.progress-info .bar, .progress .bar-info { #gradient > .vertical(#5bc0de, #339bb9); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, .progress-striped .bar-info { #gradient > .striped(#5bc0de); } // Warning (orange) -.progress-warning .bar { +.progress-warning .bar, .progress .bar-warning { #gradient > .vertical(lighten(@orange, 15%), @orange); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, .progress-striped .bar-warning { #gradient > .striped(lighten(@orange, 15%)); } -- cgit v1.2.3 From 2fda6a45aa762f66e573a81c279f79e362f3593f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Aug 2012 11:22:37 -0700 Subject: bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work --- less/progress-bars.less | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'less/progress-bars.less') diff --git a/less/progress-bars.less b/less/progress-bars.less index c3de308eb..36744d89c 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -44,8 +44,8 @@ // Outer container .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: @baseLineHeight; + margin-bottom: @baseLineHeight; #gradient > .vertical(#f5f5f5, #f9f9f9); .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); .border-radius(4px); @@ -65,6 +65,9 @@ .box-sizing(border-box); .transition(width .6s ease); } +.progress .bar + .bar { + .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)"); +} // Striped bars .progress-striped .bar { -- cgit v1.2.3