diff --git a/gulp/styles.coffee b/gulp/styles.coffee index 6143b4b6..d6fe331f 100644 --- a/gulp/styles.coffee +++ b/gulp/styles.coffee @@ -1,4 +1,4 @@ g = require 'gulp' g.task 'styles', -> - g.css 'styles/site.scss', 'site.css' + g.css 'styles/site.sass', 'site.css' diff --git a/gulp/vendor.coffee b/gulp/vendor.coffee index 4d7fb8fb..19c8a358 100644 --- a/gulp/vendor.coffee +++ b/gulp/vendor.coffee @@ -4,7 +4,7 @@ g.task 'vendor', -> g.start 'vendor-styles', 'vendor-scripts' g.task 'vendor-styles', -> g.css [ - 'styles/vendor.scss', + 'styles/vendor.sass', 'vendor/bower/font-awesome/css/font-awesome.css' ], 'vendor.css' diff --git a/styles/_base.scss b/styles/_base.sass similarity index 71% rename from styles/_base.scss rename to styles/_base.sass index d72d219f..98126fdc 100644 --- a/styles/_base.scss +++ b/styles/_base.sass @@ -1,15 +1,11 @@ -body { +body padding-top: 60px; -} -main { +main a:link, - a:hover { + a:hover border-bottom: 1px solid; text-decoration: none; - } - img { + img @extend .img-responsive; - } -} diff --git a/styles/components/_badges.scss b/styles/components/_badges.sass similarity index 56% rename from styles/components/_badges.scss rename to styles/components/_badges.sass index 02bbad54..a0ead980 100644 --- a/styles/components/_badges.scss +++ b/styles/components/_badges.sass @@ -1,15 +1,11 @@ -.badges { - > a { +.badges + > a display: block; margin: 0 0 10px; text-align: center; - &:last-child { + &:last-child margin-bottom: 0; - } - &[class$="da-member"] img { + &[class$="da-member"] img max-width: 175px; - } - } -} diff --git a/styles/components/_footer.scss b/styles/components/_footer.sass similarity index 83% rename from styles/components/_footer.scss rename to styles/components/_footer.sass index cfa56cbb..1c9f04da 100644 --- a/styles/components/_footer.scss +++ b/styles/components/_footer.sass @@ -1,5 +1,4 @@ -.copyright { +.copyright border-top: 1px solid #CCC; margin-top: 1em; padding-top: 1em; -} diff --git a/styles/components/_meetups.scss b/styles/components/_meetups.sass similarity index 77% rename from styles/components/_meetups.scss rename to styles/components/_meetups.sass index b69cda21..d94d6d4e 100644 --- a/styles/components/_meetups.scss +++ b/styles/components/_meetups.sass @@ -1,24 +1,19 @@ -.meetups { +.meetups @include clearfix; - ul { + ul list-style: none; padding-left: 0; margin-left: 0; - } - li { + li display: inline-block; padding: 5px 0; margin: 0 5px 5px 0; - } - a { + a display: block; - } - img { + img max-height: 40px; width: auto; - } -} diff --git a/styles/components/_testimonials.scss b/styles/components/_testimonials.sass similarity index 69% rename from styles/components/_testimonials.scss rename to styles/components/_testimonials.sass index aa9aa08e..a9b33782 100644 --- a/styles/components/_testimonials.scss +++ b/styles/components/_testimonials.sass @@ -1,17 +1,14 @@ -.testimonial { +.testimonial @include clearfix; margin-bottom: 10px; - .testimonial__image { + .testimonial__image @extend .img-circle; @extend .pull-right; height: 75px; margin: 0 0 10px 10px; width: 75px; - @include breakpoint($screen-sm) { + @include breakpoint($screen-sm) height: 90px; width: 90px; - } - } -} diff --git a/styles/pages/_blog-list.scss b/styles/pages/_blog-list.sass similarity index 76% rename from styles/pages/_blog-list.scss rename to styles/pages/_blog-list.sass index 90def66d..9349a3ab 100644 --- a/styles/pages/_blog-list.scss +++ b/styles/pages/_blog-list.sass @@ -1,14 +1,11 @@ -.page--blog__list { - ul.posts { +.page--blog__list + ul.posts list-style: none; margin-bottom: 2em; padding-left: 0; - } - .post { + .post @include clearfix; border-bottom: 1px solid #CCC; margin-bottom: 1em; padding-bottom: 2em; - } -} diff --git a/styles/pages/_blog-post.scss b/styles/pages/_blog-post.sass similarity index 68% rename from styles/pages/_blog-post.scss rename to styles/pages/_blog-post.sass index 65051486..24d3d87b 100644 --- a/styles/pages/_blog-post.scss +++ b/styles/pages/_blog-post.sass @@ -1,8 +1,6 @@ -.about-author { +.about-author @include clearfix; - img { + img float: left; margin: 0 1em 1em 0; - } -} diff --git a/styles/pages/_experience.scss b/styles/pages/_experience.sass similarity index 69% rename from styles/pages/_experience.scss rename to styles/pages/_experience.sass index 837f2a94..ed1e66f2 100644 --- a/styles/pages/_experience.scss +++ b/styles/pages/_experience.sass @@ -1,14 +1,11 @@ -.experience { +.experience @include clearfix; - .experience__logo { + .experience__logo @extend .pull-right; margin: 0 0 10px 10px; max-width: 25%; - } - .role-wrapper { + .role-wrapper font-style: italic; margin-bottom: 10px; - } -} diff --git a/styles/pages/_portfolio.scss b/styles/pages/_portfolio.sass similarity index 65% rename from styles/pages/_portfolio.scss rename to styles/pages/_portfolio.sass index eb5abfb6..4d0d9985 100644 --- a/styles/pages/_portfolio.scss +++ b/styles/pages/_portfolio.sass @@ -1,28 +1,21 @@ -.project--skills { - ul { +.project--skills + ul list-style: none; margin-left: 0; padding-left: 0; - } - li { + li display: inline-block; margin-right: 5px; - } - img { + img max-height: 30px; - } -} -.project--company__has-logo { +.project--company__has-logo a:link, - a:hover { + a:hover border-bottom: 0; display: block; - } - img { + img max-height: 50px; - } -} diff --git a/styles/site.scss b/styles/site.sass similarity index 100% rename from styles/site.scss rename to styles/site.sass diff --git a/styles/vendor.scss b/styles/vendor.sass similarity index 100% rename from styles/vendor.scss rename to styles/vendor.sass