aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-30 15:36:16 -0800
committerMark Otto <[email protected]>2012-11-30 15:36:16 -0800
commit0a93bc143d8b45a365ee983b05e64699081ddc5f (patch)
treea42b8c7c23715466d61259d78506a59f3c22c682
parent51c418d468e5fe1f26c95457b70f7a2ad6354646 (diff)
downloadbootstrap-0a93bc143d8b45a365ee983b05e64699081ddc5f.tar.xz
bootstrap-0a93bc143d8b45a365ee983b05e64699081ddc5f.zip
hero unit and pagination vars
-rw-r--r--docs/customize.html6
-rw-r--r--docs/templates/pages/customize.mustache6
-rw-r--r--less/hero-unit.less6
-rw-r--r--less/pagination.less6
-rw-r--r--less/variables.less16
5 files changed, 22 insertions, 18 deletions
diff --git a/docs/customize.html b/docs/customize.html
index aa02cfa2a..4c5cb4f79 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -310,11 +310,11 @@
<label>@border-radius-small</label>
<input type="text" class="span3" placeholder="3px">
- <label>@heroUnitBackground</label>
+ <label>@hero-background</label>
<input type="text" class="span3" placeholder="@grayLighter">
- <label>@heroUnitHeadingColor</label>
+ <label>@hero-heading-color</label>
<input type="text" class="span3" placeholder="inherit">
- <label>@heroUnitLeadColor</label>
+ <label>@hero-lead-color</label>
<input type="text" class="span3" placeholder="inherit">
<h3>Tables</h3>
diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index 768de2391..b2e21e71c 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -242,11 +242,11 @@
<label>@border-radius-small</label>
<input type="text" class="span3" placeholder="3px">
- <label>@heroUnitBackground</label>
+ <label>@hero-background</label>
<input type="text" class="span3" placeholder="@grayLighter">
- <label>@heroUnitHeadingColor</label>
+ <label>@hero-heading-color</label>
<input type="text" class="span3" placeholder="inherit">
- <label>@heroUnitLeadColor</label>
+ <label>@hero-lead-color</label>
<input type="text" class="span3" placeholder="inherit">
<h3>{{_i}}Tables{{/i}}</h3>
diff --git a/less/hero-unit.less b/less/hero-unit.less
index f771fad02..1e61033ad 100644
--- a/less/hero-unit.less
+++ b/less/hero-unit.less
@@ -9,14 +9,14 @@
font-size: 18px;
font-weight: 200;
line-height: @line-height-base * 1.5;
- color: @heroUnitLeadColor;
- background-color: @heroUnitBackground;
+ color: @hero-lead-color;
+ background-color: @hero-background;
border-radius: 6px;
h1 {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
- color: @heroUnitHeadingColor;
+ color: @hero-heading-color;
letter-spacing: -1px;
}
li {
diff --git a/less/pagination.less b/less/pagination.less
index 84ccf042d..cad430dab 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -26,14 +26,14 @@
padding: 4px 12px;
line-height: @line-height-base;
text-decoration: none;
- background-color: @paginationBackground;
- border: 1px solid @paginationBorder;
+ background-color: @pagination-background;
+ border: 1px solid @pagination-border;
border-left-width: 0;
}
.pagination ul > li > a:hover,
.pagination ul > .active > a,
.pagination ul > .active > span {
- background-color: @paginationActiveBackground;
+ background-color: @pagination-background-active;
}
.pagination ul > .active > a,
.pagination ul > .active > span {
diff --git a/less/variables.less b/less/variables.less
index 7b0cfe82a..6ef535951 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -192,20 +192,24 @@
// Pagination
// -------------------------
-@paginationBackground: #fff;
-@paginationBorder: #ddd;
-@paginationActiveBackground: #f5f5f5;
+
+@pagination-background: #fff;
+@pagination-background-active: #f5f5f5;
+
+@pagination-border: #ddd;
// Hero unit
// -------------------------
-@heroUnitBackground: @grayLighter;
-@heroUnitHeadingColor: inherit;
-@heroUnitLeadColor: inherit;
+
+@hero-background: @grayLighter;
+@hero-heading-color: inherit;
+@hero-lead-color: inherit;
// Form states and alerts
// -------------------------
+
@warningText: #c09853;
@warningBackground: #fcf8e3;
@warningBorder: darken(spin(@warningBackground, -10), 3%);