Use sass rather than scss

This commit is contained in:
Oliver Davies 2016-03-10 21:30:15 +00:00
parent c723c31161
commit 583dab907b
13 changed files with 34 additions and 66 deletions

View file

@ -1,4 +1,4 @@
g = require 'gulp' g = require 'gulp'
g.task 'styles', -> g.task 'styles', ->
g.css 'styles/site.scss', 'site.css' g.css 'styles/site.sass', 'site.css'

View file

@ -4,7 +4,7 @@ g.task 'vendor', -> g.start 'vendor-styles', 'vendor-scripts'
g.task 'vendor-styles', -> g.task 'vendor-styles', ->
g.css [ g.css [
'styles/vendor.scss', 'styles/vendor.sass',
'vendor/bower/font-awesome/css/font-awesome.css' 'vendor/bower/font-awesome/css/font-awesome.css'
], 'vendor.css' ], 'vendor.css'

View file

@ -1,15 +1,11 @@
body { body
padding-top: 60px; padding-top: 60px;
}
main { main
a:link, a:link,
a:hover { a:hover
border-bottom: 1px solid; border-bottom: 1px solid;
text-decoration: none; text-decoration: none;
}
img { img
@extend .img-responsive; @extend .img-responsive;
}
}

View file

@ -1,15 +1,11 @@
.badges { .badges
> a { > a
display: block; display: block;
margin: 0 0 10px; margin: 0 0 10px;
text-align: center; text-align: center;
&:last-child { &:last-child
margin-bottom: 0; margin-bottom: 0;
}
&[class$="da-member"] img { &[class$="da-member"] img
max-width: 175px; max-width: 175px;
}
}
}

View file

@ -1,5 +1,4 @@
.copyright { .copyright
border-top: 1px solid #CCC; border-top: 1px solid #CCC;
margin-top: 1em; margin-top: 1em;
padding-top: 1em; padding-top: 1em;
}

View file

@ -1,24 +1,19 @@
.meetups { .meetups
@include clearfix; @include clearfix;
ul { ul
list-style: none; list-style: none;
padding-left: 0; padding-left: 0;
margin-left: 0; margin-left: 0;
}
li { li
display: inline-block; display: inline-block;
padding: 5px 0; padding: 5px 0;
margin: 0 5px 5px 0; margin: 0 5px 5px 0;
}
a { a
display: block; display: block;
}
img { img
max-height: 40px; max-height: 40px;
width: auto; width: auto;
}
}

View file

@ -1,17 +1,14 @@
.testimonial { .testimonial
@include clearfix; @include clearfix;
margin-bottom: 10px; margin-bottom: 10px;
.testimonial__image { .testimonial__image
@extend .img-circle; @extend .img-circle;
@extend .pull-right; @extend .pull-right;
height: 75px; height: 75px;
margin: 0 0 10px 10px; margin: 0 0 10px 10px;
width: 75px; width: 75px;
@include breakpoint($screen-sm) { @include breakpoint($screen-sm)
height: 90px; height: 90px;
width: 90px; width: 90px;
}
}
}

View file

@ -1,14 +1,11 @@
.page--blog__list { .page--blog__list
ul.posts { ul.posts
list-style: none; list-style: none;
margin-bottom: 2em; margin-bottom: 2em;
padding-left: 0; padding-left: 0;
}
.post { .post
@include clearfix; @include clearfix;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC;
margin-bottom: 1em; margin-bottom: 1em;
padding-bottom: 2em; padding-bottom: 2em;
}
}

View file

@ -1,8 +1,6 @@
.about-author { .about-author
@include clearfix; @include clearfix;
img { img
float: left; float: left;
margin: 0 1em 1em 0; margin: 0 1em 1em 0;
}
}

View file

@ -1,14 +1,11 @@
.experience { .experience
@include clearfix; @include clearfix;
.experience__logo { .experience__logo
@extend .pull-right; @extend .pull-right;
margin: 0 0 10px 10px; margin: 0 0 10px 10px;
max-width: 25%; max-width: 25%;
}
.role-wrapper { .role-wrapper
font-style: italic; font-style: italic;
margin-bottom: 10px; margin-bottom: 10px;
}
}

View file

@ -1,28 +1,21 @@
.project--skills { .project--skills
ul { ul
list-style: none; list-style: none;
margin-left: 0; margin-left: 0;
padding-left: 0; padding-left: 0;
}
li { li
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 5px;
}
img { img
max-height: 30px; max-height: 30px;
}
}
.project--company__has-logo { .project--company__has-logo
a:link, a:link,
a:hover { a:hover
border-bottom: 0; border-bottom: 0;
display: block; display: block;
}
img { img
max-height: 50px; max-height: 50px;
}
}