Commit 5f3bb771 authored by Thomas Park's avatar Thomas Park
Browse files

spacelab: changed font to open sans, tweaked buttons, link color

parent 9567b2ce
This diff is collapsed.
This diff is collapsed.
......@@ -6,7 +6,7 @@
// TYPOGRAPHY
// -----------------------------------------------------
@import url('http://fonts.googleapis.com/css?family=Muli');
@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700');
// SCAFFOLDING
// -----------------------------------------------------
......@@ -17,8 +17,7 @@
.navbar {
.navbar-inner {
border-bottom: 1px solid #CACACA;
.box-shadow(0 1px 0 rgba(255,255,255,0.4)~", "0 0 10px rgba(0,0,0,0.1));
.box-shadow(0 1px 0 rgba(255,255,255,0.4)~", "0 1px 0 rgba(0,0,0,0.8));
}
.brand {
......@@ -26,19 +25,18 @@
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
&:hover {
color: @linkColor;
color: @navbarLinkColorHover;
}
}
.nav > li > a {
padding: 11px 10px 9px;
padding: 11px 10px 8px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
}
.navbar-text {
margin-top: 2px;
padding: 0 10px;
line-height: 38px;
padding: 11px 10px 8px;
line-height: inherit;
}
.navbar-search .search-query,
......@@ -122,10 +120,10 @@ div.subnav {
.nav > li > a {
color: @textColor;
color: @navbarLinkColor;
&:hover {
color: @linkColor;
color: @navbarLinkColorHover;
}
}
......@@ -177,63 +175,6 @@ div.subnav {
// BUTTONS
// -----------------------------------------------------
.btn {
&-info,
&-info:hover,
&-info.disabled {
color: @textColor;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
.caret {
border-top-color: @textColor;
border-bottom-color: @textColor;
}
}
}
/*.btn {
.buttonBackground(#F4F4F4, #ECECEC);
color: @textColor;
text-shadow: none;
&:hover,
&:active,
&.active,
&.disabled,
&[disabled] {
color: @grayDark;
}
}
.btn-primary {
.buttonBackground(#909090, #3F3F3F);
}
.btn-warning {
.buttonBackground(lighten(@yellow, 15%), @yellow);
}
.btn-danger {
.buttonBackground(lighten(#DA2D2D, 15%), #DA2D2D);
}
.btn-success {
.buttonBackground(#8ADD6D, #60B044);
}
.btn-info {
.buttonBackground(lighten(#4488BB, 15%), #4488BB);
}
.btn-inverse {
.buttonBackground(lighten(@purple, 5%), @purple);
}*/
// TABLES
// -----------------------------------------------------
......@@ -259,8 +200,14 @@ div.subnav {
// -----------------------------------------------------
.alert {
color: @white;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
h1, h2, h3, h4, h5, h6 {
color: @white;
font-weight: bold;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
}
.label, .badge {
......@@ -288,12 +235,12 @@ div.subnav {
// -----------------------------------------------------
.well {
background-color: @grayLighter;
.box-shadow(inset 1px 1px 0 rgba(0,0,0,.1));
}
.hero-unit {
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
border: 1px solid rgba(0,0,0,.05);
.box-shadow(inset 1px 1px 0 rgba(0,0,0,.1));
border: 1px solid rgba(0,0,0,.1);
}
// MEDIA QUERIES
......
......@@ -11,8 +11,8 @@
// -------------------------
@black: #000;
@grayDarker: #2D2D2D;
@grayDark: #333;
@gray: #777;
@grayDark: #434848;
@gray: #666;
@grayLight: #bbb;
@grayLighter: #eee;
@white: #fff;
......@@ -22,7 +22,7 @@
// -------------------------
@blue: #3399F3;
@blueDark: #405A6A;
@green: #819E37;
@green: #3CB521;
@red: #CD0200;
@yellow: #F4CA00;
@orange: #D47500;
......@@ -33,29 +33,29 @@
// Scaffolding
// -------------------------
@bodyBackground: @white;
@textColor: @grayDarker;
@textColor: @gray;
// Links
// -------------------------
@linkColor: #558BC4;
@linkColor: #09d;
@linkColorHover: @linkColor;
// Typography
// -------------------------
@sansFontFamily: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif;
@sansFontFamily: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
@baseFontSize: 14px;
@baseFontSize: 15px;
@baseFontFamily: @sansFontFamily;
@baseLineHeight: 21px;
@altFontFamily: @serifFontFamily;
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@headingsFontWeight: normal; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor
@headingsColor: @grayDarker; // empty to use BS default, @textColor
// Component sizing
......@@ -88,19 +88,19 @@
@btnBackgroundHighlight: @grayLighter;
@btnBorder: darken(@btnBackground, 20%);
@btnPrimaryBackground: lighten(@linkColor, 15%);
@btnPrimaryBackground: lighten(@linkColor, 10%);
@btnPrimaryBackgroundHighlight: @linkColor;
@btnInfoBackground: lighten(@grayLight, 15%);
@btnInfoBackgroundHighlight: @grayLight;
@btnInfoBackground: lighten(#3A5D83, 10%);
@btnInfoBackgroundHighlight: #3A5D83;
@btnSuccessBackground: lighten(@green, 15%);
@btnSuccessBackground: lighten(@green, 10%);
@btnSuccessBackgroundHighlight: @green;
@btnWarningBackground: lighten(@orange, 15%);
@btnWarningBackground: lighten(@orange, 10%);
@btnWarningBackgroundHighlight: @orange;
@btnDangerBackground: lighten(@red, 15%);
@btnDangerBackground: lighten(@red, 10%);
@btnDangerBackgroundHighlight: @red;
@btnInverseBackground: lighten(@navbarInverseBackground, 15%);
......@@ -172,7 +172,7 @@
// Wells
// -------------------------
@wellBackground: #f5f5f5;
@wellBackground: @grayLighter;
// Navbar
......@@ -181,18 +181,18 @@
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 40px;
@navbarBackgroundHighlight: #eee;
@navbarBackground: @grayLight;
@navbarBorder: darken(@navbarBackground, 5%);
@navbarBackgroundHighlight: @grayLighter;
@navbarBackground: lighten(@grayLight, 5%);
@navbarBorder: @grayLight;
@navbarText: @textColor;
@navbarLinkColor: @textColor;
@navbarLinkColorHover: @linkColor;
@navbarLinkColorActive: @textColor;
@navbarLinkColorHover: @black;
@navbarLinkColorActive: @black;
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: transparent;
@navbarBrandColor: @grayDark;
@navbarBrandColor: @navbarLinkColor;
// Inverted navbar
@navbarInverseBackground: #6C737E;
......@@ -224,7 +224,7 @@
// Hero unit
// -------------------------
@heroUnitBackground: @grayLighter;
@heroUnitHeadingColor: inherit;
@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