From f5d5de72b0a988cfdb06f847cbeb1cc5969f6734 Mon Sep 17 00:00:00 2001
From: frntz <frantzy@gmail.com>
Date: Fri, 10 Aug 2012 11:18:49 +0300
Subject: [PATCH 1/2] Update less/progress-bars.less
---
less/progress-bars.less | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 3b47e64828..32e43ba8ae 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -53,6 +53,7 @@
// Bar of progress
.progress .bar {
width: 0%;
+ float: left;
height: 18px;
color: @white;
font-size: 12px;
@@ -85,33 +86,33 @@
// ------
// Danger (red)
-.progress-danger .bar {
+.progress .bar-danger {
#gradient > .vertical(#ee5f5b, #c43c35);
}
-.progress-danger.progress-striped .bar {
+.progress.progress-striped .bar-danger {
#gradient > .striped(#ee5f5b);
}
// Success (green)
-.progress-success .bar {
+.progress .bar-success {
#gradient > .vertical(#62c462, #57a957);
}
-.progress-success.progress-striped .bar {
+.progress.progress-striped .bar-success {
#gradient > .striped(#62c462);
}
// Info (teal)
-.progress-info .bar {
+.progress .bar-info {
#gradient > .vertical(#5bc0de, #339bb9);
}
-.progress-info.progress-striped .bar {
+.progress.progress-striped .bar-info {
#gradient > .striped(#5bc0de);
}
// Warning (orange)
-.progress-warning .bar {
+.progress .bar-warning {
#gradient > .vertical(lighten(@orange, 15%), @orange);
}
-.progress-warning.progress-striped .bar {
+.progress.progress-striped .bar-warning {
#gradient > .striped(lighten(@orange, 15%));
}
--
GitLab
From 87177fecdbbcd1a8e005a82207250d356f32c4a0 Mon Sep 17 00:00:00 2001
From: frntz <frantzy@gmail.com>
Date: Fri, 10 Aug 2012 11:42:39 +0300
Subject: [PATCH 2/2] Update docs/components.html
---
docs/components.html | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/docs/components.html b/docs/components.html
index 55eb2e4a13..0c5352475d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1815,33 +1815,41 @@
<div class="span3">
<h3>Additional colors</h3>
<p>Progress bars use some of the same button and alert classes for consistent styles.</p>
- <div class="progress progress-info" style="margin-bottom: 9px;">
- <div class="bar" style="width: 20%"></div>
+ <div class="progress" style="margin-bottom: 9px;">
+ <div class="bar-info" style="width: 20%"></div>
</div>
- <div class="progress progress-success" style="margin-bottom: 9px;">
- <div class="bar" style="width: 40%"></div>
+ <div class="progress" style="margin-bottom: 9px;">
+ <div class="bar-success" style="width: 40%"></div>
</div>
- <div class="progress progress-warning" style="margin-bottom: 9px;">
- <div class="bar" style="width: 60%"></div>
+ <div class="progress" style="margin-bottom: 9px;">
+ <div class="bar-warning" style="width: 60%"></div>
</div>
- <div class="progress progress-danger" style="margin-bottom: 9px;">
- <div class="bar" style="width: 80%"></div>
+ <div class="progress" style="margin-bottom: 9px;">
+ <div class="bar-danger" style="width: 80%"></div>
+ </div>
+ <div class="progress" style="margin-bottom: 9px;">
+ <div class="bar-danger" style="width: 20%"></div>
+ <div class="bar" style="width: 50%"></div>
</div>
</div>
<div class="span3">
<h3>Striped bars</h3>
<p>Similar to the solid colors, we have varied striped progress bars.</p>
- <div class="progress progress-info progress-striped" style="margin-bottom: 9px;">
- <div class="bar" style="width: 20%"></div>
+ <div class="progress progress-striped" style="margin-bottom: 9px;">
+ <div class="bar-info" style="width: 20%"></div>
+ </div>
+ <div class="progress progress-striped" style="margin-bottom: 9px;">
+ <div class="bar-success" style="width: 40%"></div>
</div>
- <div class="progress progress-success progress-striped" style="margin-bottom: 9px;">
- <div class="bar" style="width: 40%"></div>
+ <div class="progress progress-striped" style="margin-bottom: 9px;">
+ <div class="bar-warning" style="width: 60%"></div>
</div>
- <div class="progress progress-warning progress-striped" style="margin-bottom: 9px;">
- <div class="bar" style="width: 60%"></div>
+ <div class="progress progress-striped" style="margin-bottom: 9px;">
+ <div class="bar-danger" style="width: 80%"></div>
</div>
- <div class="progress progress-danger progress-striped" style="margin-bottom: 9px;">
- <div class="bar" style="width: 80%"></div>
+ <div class="progress progress-striped" style="margin-bottom: 9px;">
+ <div class="bar-danger" style="width: 20%"></div>
+ <div class="bar" style="width: 50%"></div>
</div>
</div>
<div class="span3">
--
GitLab