summaryrefslogtreecommitdiffstats
path: root/sass/base
diff options
context:
space:
mode:
Diffstat (limited to 'sass/base')
-rw-r--r--sass/base/_color.scss14
-rw-r--r--sass/base/_font.scss19
-rw-r--r--sass/base/_layout.scss14
-rw-r--r--sass/base/_utilities.scss2
4 files changed, 31 insertions, 18 deletions
diff --git a/sass/base/_color.scss b/sass/base/_color.scss
index 7dbee46..ec6ed3b 100644
--- a/sass/base/_color.scss
+++ b/sass/base/_color.scss
@@ -1,7 +1,7 @@
-$background: #eee;
-$main: #258fb8;
-$gray01: #666;
-$gray02: #999;
-$gray03: #ccc;
-$gray04: #ddd;
-$gray05: #fff; \ No newline at end of file
+$color-background: #eee;
+$color-main: #258fb8;
+$color-gray01: #666;
+$color-gray02: #999;
+$color-gray03: #ccc;
+$color-gray04: #ddd;
+$color-gray05: #fff; \ No newline at end of file
diff --git a/sass/base/_font.scss b/sass/base/_font.scss
index 7f61fb6..907e406 100644
--- a/sass/base/_font.scss
+++ b/sass/base/_font.scss
@@ -1,4 +1,17 @@
-$default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-$monospace: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
+$font-default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
-$meta-size: 0.9em; \ No newline at end of file
+$font-icon: FontAwesome;
+$font-icon-path: "/font/fontawesome-webfont";
+
+@font-face {
+ font-family: 'FontAwesome';
+ src: url('#{$font-icon-path}.eot');
+ src: url('#{$font-icon-path}.eot?#iefix') format('embedded-opentype'),
+ url('#{$font-icon-path}.woff') format('woff'),
+ url('#{$font-icon-path}.ttf') format('truetype'),
+ url('#{$font-icon-path}.svgz#FontAwesomeRegular') format('svg'),
+ url('#{$font-icon-path}.svg#FontAwesomeRegular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+} \ No newline at end of file
diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss
index b50dcbb..22e5804 100644
--- a/sass/base/_layout.scss
+++ b/sass/base/_layout.scss
@@ -5,11 +5,11 @@ $max-width: 1000px;
padding: 0;
}
body{
- font-family: $default;
+ font-family: $font-default;
font-weight: 300;
font-size: 14px;
- background: $background;
- color: $gray01;
+ background: $color-background;
+ color: $color-gray01;
@media screen and (max-width: 1040px){
margin: 0 20px;
}
@@ -29,15 +29,15 @@ h3{
a{
text-decoration: none;
outline-width: 0;
- color: $main;
+ color: $color-main;
}
-.left{
+.alignleft{
float: left;
}
-.right{
+.alignright{
float: right;
}
-.clear{
+.clearfix{
@include pie-clearfix;
}
.inner{
diff --git a/sass/base/_utilities.scss b/sass/base/_utilities.scss
index 1a3ed2f..63aae7a 100644
--- a/sass/base/_utilities.scss
+++ b/sass/base/_utilities.scss
@@ -9,7 +9,7 @@
-o-user-select: $select;
user-select: $select;
}
-@mixin border-shadow($top: $gray05, $bottom: $gray04){
+@mixin border-shadow($top: $color-gray05, $bottom: $color-gray04){
border-top: 1px solid $top;
border-bottom: 1px solid $bottom;
}