Commit 9e8f1407 authored by Thomas Park's avatar Thomas Park
Browse files

spruce: fix pagination, form validation colors

parent 5419c295
This diff is collapsed.
This diff is collapsed.
......@@ -127,21 +127,6 @@ blockquote {
color: @white;
}
.nav > .open > a {
color: @yellow;
}
.nav > .open > .dropdown-menu {
background-color: @headingsColor;
color: @textColor;
border-color: transparent;
}
.nav > .open > .dropdown-menu a:hover {
background-color: darken(#90A38F, 10%);
color: @headingsColor;
}
.btn-navbar {
margin-top: 14px;
}
......@@ -358,14 +343,14 @@ div.subnav {
.pagination {
& > ul {
ul {
background-color: darken(#90A38F, 10%);
background-image: none;
border-color: transparent;
.box-shadow(none);
}
a {
ul > li > a {
color: @yellow;
border-color: transparent;
......@@ -375,13 +360,13 @@ div.subnav {
}
}
.active a {
ul > .active > a {
color: @headingsColor;
background-color: rgba(0, 0, 0, 0.1);
}
.disabled a,
.disabled a:hover {
ul > .disabled > a,
ul > .disabled > a:hover {
color: @blue;
}
}
......@@ -408,47 +393,17 @@ div.subnav {
// --------------------------------------------------
.btn {
.buttonBackground(lighten(@blueDark, 5%), @blueDark);
font-family: @headingsFontFamily;
font-weight: @headingsFontWeight;
color: @white;
text-shadow: none;
border-color: transparent;
.box-shadow(none);
&:hover {
color: @grayLighter;
}
}
.btn-large {
font-size: 18px;
}
.btn-primary {
.buttonBackground(lighten(@blue, 10%), lighten(@blue, 5%));
}
.btn-warning {
.buttonBackground(@orange, darken(@orange, 5%));
}
.btn-danger {
.buttonBackground(lighten(@red, 5%), @red);
}
.btn-success {
.buttonBackground(#62c462, #51a351);
}
.btn-info {
.buttonBackground(#5bc0de, #2f96b4);
}
.btn-inverse {
.buttonBackground(@yellow, darken(@yellow, 5%));
}
.btn-group .dropdown-toggle {
.box-shadow(none);
}
......@@ -522,6 +477,42 @@ legend {
.border-radius(4px);
}
.control-group.error {
label, .help-block, .help-inline {
color: lighten(@red, 30%);
}
input, select, textarea {
border: 2px solid lighten(@red, 30%);
color: @textColor;
}
}
.control-group.success {
label, .help-block, .help-inline {
color: lighten(#24C00B, 25%);
}
input, select, textarea {
border: 2px solid lighten(#24C00B, 25%);
color: @textColor;
}
}
.control-group.warning {
label, .help-block, .help-inline {
color: lighten(@orange, 25%);
}
input, select, textarea {
border: 2px solid lighten(@orange, 25%);
color: @textColor;
}
}
// ALERTS, LABELS, BADGES
// --------------------------------------------------
......
......@@ -74,23 +74,23 @@
@btnBackgroundHighlight: darken(@white, 10%);
@btnBorder: darken(@white, 20%);
@btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
@btnPrimaryBackground: lighten(@blueDark, 10%);
@btnPrimaryBackgroundHighlight: lighten(@blueDark, 5%);
@btnInfoBackground: #5bc0de;
@btnInfoBackgroundHighlight: #2f96b4;
@btnSuccessBackground: #62c462;
@btnSuccessBackgroundHighlight: #51a351;
@btnSuccessBackground: lighten(@blue, 10%);
@btnSuccessBackgroundHighlight: lighten(@blue, 5%);
@btnWarningBackground: lighten(@orange, 15%);
@btnWarningBackgroundHighlight: @orange;
@btnDangerBackground: #ee5f5b;
@btnDangerBackgroundHighlight: #bd362f;
@btnDangerBackground: lighten(@red, 5%);
@btnDangerBackgroundHighlight: @red;
@btnInverseBackground: @gray;
@btnInverseBackgroundHighlight: @grayDarker;
@btnInverseBackground: @yellow;
@btnInverseBackgroundHighlight: darken(@yellow, 5%);
// Forms
......@@ -103,7 +103,7 @@
// Dropdowns
// -------------------------
@dropdownBackground: @white;
@dropdownBackground: @headingsColor;
@dropdownBorder: rgba(0,0,0,.2);
@dropdownDividerTop: transparent;
@dropdownDividerBottom: @bodyBackground;
......@@ -111,7 +111,7 @@
@dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: rgba(0, 0, 0, 0.1);
@dropdownLinkBackgroundHover: darken(@bodyBackground, 10%);
@dropdownLinkColorActive: @dropdownLinkColorHover;
@dropdownLinkBackgroundActive: @dropdownLinkBackgroundHover;
......@@ -151,7 +151,7 @@
// Wells
// -------------------------
@wellBackground: darken(#90A38F, 10%);
@wellBackground: darken(@bodyBackground, 10%);
// Navbar
......@@ -194,14 +194,14 @@
// Pagination
// -------------------------
@paginationBackground: darken(#90A38F, 10%);
@paginationBackground: darken(@bodyBackground, 10%);
@paginationBorder: transparent;
@paginationActiveBackground: #A2CDB5;
// Hero unit
// -------------------------
@heroUnitBackground: darken(#90A38F, 10%);
@heroUnitBackground: darken(@bodyBackground, 10%);
@heroUnitHeadingColor: @headingsColor;
@heroUnitLeadColor: inherit;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment