summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sass/base/_color.scss14
-rw-r--r--sass/base/_layout.scss6
-rw-r--r--sass/base/_utilities.scss2
-rw-r--r--sass/parts/_archive.scss12
-rw-r--r--sass/parts/_article.scss22
-rw-r--r--sass/parts/_footer.scss2
-rw-r--r--sass/parts/_header.scss20
-rw-r--r--sass/parts/_post.scss4
-rw-r--r--sass/parts/_syntax.scss8
-rw-r--r--sass/parts/_twitter.scss6
10 files changed, 48 insertions, 48 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/_layout.scss b/sass/base/_layout.scss
index b50dcbb..4ac1d55 100644
--- a/sass/base/_layout.scss
+++ b/sass/base/_layout.scss
@@ -8,8 +8,8 @@ body{
font-family: $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,7 +29,7 @@ h3{
a{
text-decoration: none;
outline-width: 0;
- color: $main;
+ color: $color-main;
}
.left{
float: left;
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;
}
diff --git a/sass/parts/_archive.scss b/sass/parts/_archive.scss
index 6b5ee75..4d06f08 100644
--- a/sass/parts/_archive.scss
+++ b/sass/parts/_archive.scss
@@ -1,7 +1,7 @@
section.archive{
position: relative;
&:first-of-type{
- border-top: 1px solid $gray05;
+ border-top: 1px solid $color-gray05;
article.archive{
border-top: none;
}
@@ -13,7 +13,7 @@ section.archive{
}
}
&:last-of-type{
- border-bottom: 1px solid $gray04;
+ border-bottom: 1px solid $color-gray04;
article.archive{
border-bottom: none;
}
@@ -30,7 +30,7 @@ section.archive{
position: absolute;
top: -2px;
width: 100%;
- border-top: 1px solid $gray04;
+ border-top: 1px solid $color-gray04;
}
@media screen and (max-width: 600px){
position: relative;
@@ -53,7 +53,7 @@ section.archive{
margin-bottom: 0;
}
.meta{
- color: $gray02;
+ color: $color-gray02;
line-height: 2;
margin-top: 15px;
@media screen and (max-width: 600px){
@@ -65,10 +65,10 @@ section.archive{
@include inline-block;
}
a{
- color: $gray02;
+ color: $color-gray02;
@include transition(0.3s);
&:hover{
- color: $gray01;
+ color: $color-gray01;
}
}
.date{
diff --git a/sass/parts/_article.scss b/sass/parts/_article.scss
index ba14807..1d9f0bd 100644
--- a/sass/parts/_article.scss
+++ b/sass/parts/_article.scss
@@ -1,6 +1,6 @@
article{
- border-bottom: 1px solid $gray04;
- border-top: 1px solid $gray05;
+ border-bottom: 1px solid $color-gray04;
+ border-top: 1px solid $color-gray05;
padding: 30px 0;
position: relative;
@media screen and (max-width: 800px){
@@ -14,7 +14,7 @@ article{
line-height: 35px;
margin-bottom: 20px;
a{
- color: $gray01;
+ color: $color-gray01;
}
}
.entry{
@@ -51,13 +51,13 @@ article{
}
h2{
font-weight: 300;
- border-bottom: 1px solid $gray04;
+ border-bottom: 1px solid $color-gray04;
position: relative;
&:before{
content: "";
position: absolute;
bottom: -2px;
- border-bottom: 1px solid $gray05;
+ border-bottom: 1px solid $color-gray05;
width: 100%;
}
}
@@ -66,8 +66,8 @@ article{
height: auto;
}
blockquote{
- background: $gray04;
- border-left: 5px solid $gray03;
+ background: $color-gray04;
+ border-left: 5px solid $color-gray03;
padding: 15px 20px;
margin-top: 10px;
& > p:first-of-type{
@@ -78,12 +78,12 @@ article{
border: none;
}
table{
- background: $gray04;
- border: 1px solid $gray03;
+ background: $color-gray04;
+ border: 1px solid $color-gray03;
border-spacing: 0;
margin-top: 10px;
th{
- background: $gray03;
+ background: $color-gray03;
padding: 0 15px;
}
td{
@@ -99,7 +99,7 @@ article{
background: image-url('caption.png') 0 4px no-repeat;
display: block;
font-size: $meta-size;
- color: $gray02;
+ color: $color-gray02;
padding-left: 25px;
}
.video-container{
diff --git a/sass/parts/_footer.scss b/sass/parts/_footer.scss
index 74f5e41..b005132 100644
--- a/sass/parts/_footer.scss
+++ b/sass/parts/_footer.scss
@@ -1,6 +1,6 @@
footer{
padding: 15px 0;
- border-top: 1px solid $gray05;
+ border-top: 1px solid $color-gray05;
text-align: center;
font-size: $meta-size;
} \ No newline at end of file
diff --git a/sass/parts/_header.scss b/sass/parts/_header.scss
index b22b1e0..ee36e61 100644
--- a/sass/parts/_header.scss
+++ b/sass/parts/_header.scss
@@ -1,8 +1,8 @@
header{
height: 30px;
padding: 30px 0;
- border-bottom: 1px solid $gray04;
line-height: 30px;
+ border-bottom: 1px solid $color-gray04;
@media screen and (max-width: 1040px){
height: auto;
position: relative;
@@ -50,7 +50,7 @@ header{
}
&:hover{
>a{
- color: $main;
+ color: $color-main;
}
}
>a{
@@ -76,8 +76,8 @@ header{
left: -15px;
z-index: 10;
white-space: nowrap;
- background: $gray04;
- border: 1px solid $gray03;
+ background: $color-gray04;
+ border: 1px solid $color-gray03;
list-style: none;
display: none;
@media screen and (max-width: 1040px){
@@ -89,7 +89,7 @@ header{
@include border-radius(0 5px 5px 5px);
}
li{
- @include border-shadow($background, $gray03);
+ @include border-shadow($color-background, $color-gray03);
&:hover{
background: #d5d5d5;
}
@@ -107,7 +107,7 @@ header{
display: block;
padding: 5px 30px 5px 15px;
&:hover{
- color: $gray01;
+ color: $color-gray01;
}
&:only-child{
background: none;
@@ -140,8 +140,8 @@ header{
.search{
input[type="text"]{
background: image-url('search.png') 10px center no-repeat #f2f2f2;
- color: $gray02;
- border: 1px solid $gray04;
+ color: $color-gray02;
+ border: 1px solid $color-gray04;
font: 13px $default;
padding: 6px 15px 6px 35px;
width: 100px;
@@ -153,8 +153,8 @@ header{
&:focus, &:active{
background: image-url('search.png') 10px center no-repeat #fff;
width: 150px;
- border-top: 1px solid $gray03;
- color: $gray01;
+ border-top: 1px solid $color-gray03;
+ color: $color-gray01;
outline: none;
@media screen and (max-width: 600px){
width: 100px;
diff --git a/sass/parts/_post.scss b/sass/parts/_post.scss
index de9c78c..059567e 100644
--- a/sass/parts/_post.scss
+++ b/sass/parts/_post.scss
@@ -10,7 +10,7 @@
top: 85px;
line-height: 2;
font-size: $meta-size;
- color: $gray02;
+ color: $color-gray02;
width: 170px;
@media screen and (max-width: 800px){
margin-top: 15px;
@@ -18,7 +18,7 @@
width: auto;
}
a{
- @include link-colors($gray02, $gray01);
+ @include link-colors($color-gray02, $color-gray01);
@include transition(0.3s);
}
.date, .tags, .comments{
diff --git a/sass/parts/_syntax.scss b/sass/parts/_syntax.scss
index 8777000..7f2e537 100644
--- a/sass/parts/_syntax.scss
+++ b/sass/parts/_syntax.scss
@@ -38,8 +38,8 @@ $solarized: light !default;
$base3: $_base03;
}
-$pre-bg: $gray04;
-$pre-border: $gray03;
+$pre-bg: $color-gray04;
+$pre-border: $color-gray03;
article{
code, pre{
@@ -126,7 +126,7 @@ figure.code{
}
.entry .gist{
background: $pre-bg;
- color: $gray01;
+ color: $color-gray01;
padding: 30px 15px 5px;
margin-top: 10px;
border: 1px solid $pre-border;
@@ -150,7 +150,7 @@ figure.code{
padding: 5px 15px;
@include background(linear-gradient(top, $pre-bg, $pre-border));
a{
- color: $main;
+ color: $color-main;
&:first-of-type{
position: absolute;
top: 5px;
diff --git a/sass/parts/_twitter.scss b/sass/parts/_twitter.scss
index e6a7736..6a8e6a1 100644
--- a/sass/parts/_twitter.scss
+++ b/sass/parts/_twitter.scss
@@ -1,5 +1,5 @@
#banner{
- color: $gray02;
+ color: $color-gray02;
padding: 30px 0;
line-height: 30px;
text-align: center;
@@ -8,11 +8,11 @@
@include border-shadow();
&:hover{
a{
- color: $main;
+ color: $color-main;
}
}
a{
- color: $gray02;
+ color: $color-gray02;
@include transition(0.3s);
&:hover{
text-decoration: underline;