summaryrefslogtreecommitdiff
path: root/_sass
diff options
context:
space:
mode:
Diffstat (limited to '_sass')
-rw-r--r--_sass/960-responsive.scss8
-rw-r--r--_sass/fonts.scss12
-rw-r--r--_sass/global.scss9
3 files changed, 20 insertions, 9 deletions
diff --git a/_sass/960-responsive.scss b/_sass/960-responsive.scss
index 0dbbca3..16fcd10 100644
--- a/_sass/960-responsive.scss
+++ b/_sass/960-responsive.scss
@@ -10,6 +10,7 @@ body {
}
.grid_blob,
+.grid_half,
.grid_wide {
display: inline;
float: left;
@@ -21,6 +22,10 @@ body {
width: 220px;
}
+.container .grid_half {
+ width: 440px;
+}
+
.container .grid_wide {
width: 940px;
}
@@ -57,6 +62,7 @@ body {
}
.container .grid_blob { width: 172px; }
+ .container .grid_half { width: 344px; }
.container .grid_wide { width: 748px; }
}
@@ -72,6 +78,7 @@ body {
}
.container .grid_blob,
+ .container .grid_half,
.container .grid_wide {
margin: 0;
width: 300px;
@@ -91,6 +98,7 @@ body {
}
.container .grid_blob,
+ .container .grid_half,
.container .grid_wide {
margin: 0;
width: 420px;
diff --git a/_sass/fonts.scss b/_sass/fonts.scss
index 74eb9bf..fd4e871 100644
--- a/_sass/fonts.scss
+++ b/_sass/fonts.scss
@@ -11,12 +11,12 @@
@font-face {
font-family: 'open_sans';
- src: url('/assets/fonts/OpenSans-Semibold.eot');
- src: url('/assets/fonts/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
- url('/assets/fonts/OpenSans-Semibold.woff') format('woff'),
- url('/assets/fonts/OpenSans-Semibold.ttf') format('truetype'),
- url('/assets/fonts/OpenSans-Semibold.svg#open_sanssemibold') format('svg');
- font-weight: 600;
+ src: url('/assets/fonts/OpenSans-Light.eot');
+ src: url('/assets/fonts/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
+ url('/assets/fonts/OpenSans-Light.woff') format('woff'),
+ url('/assets/fonts/OpenSans-Light.ttf') format('truetype'),
+ url('/assets/fonts/OpenSans-Light.svg#open_sanslight') format('svg');
+ font-weight: 200;
font-style: normal;
}
diff --git a/_sass/global.scss b/_sass/global.scss
index 9da4a39..d0bfa42 100644
--- a/_sass/global.scss
+++ b/_sass/global.scss
@@ -14,6 +14,8 @@ $violet: #6c71c4;
$blue: #268bd2;
$cyan: #2aa198;
$green: #859900;
+$black: #000000;
+$white: #ffffff;
$googleplus-color: #DD4B39;
$facebook-color: #3b5998;
@@ -25,6 +27,9 @@ $sans: 'open_sans', sans-serif;
$serif: 'crimson_text', serif;
$monospace: 'source_code_pro', monospace;
+$link-fade-time: 0.4s;
+$link-darken-amount: 20%;
+
// Mixin to deal with cross-browser transitions
@mixin transition ($param, $time, $type) {
-webkit-transition: $param $time $type;
@@ -36,10 +41,8 @@ $monospace: 'source_code_pro', monospace;
@mixin nav_button($c) {
background-color: $c;
- border-color: $c;
- @include transition(all, 0.25s, linear);
+
&:hover {
background-color: darken($c, 15%);
- border-color: darken($c, 15%);
}
}