diff --git a/_includes/footer.html b/_includes/footer.html index be3976f7..9944f68a 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -11,43 +11,6 @@
  • {{ site.email }}
  • - - - - diff --git a/_includes/header.html b/_includes/header.html deleted file mode 100644 index cfe381f7..00000000 --- a/_includes/header.html +++ /dev/null @@ -1,27 +0,0 @@ - diff --git a/_layouts/default.html b/_layouts/default.html index e4ab96fb..8c8758fe 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -5,12 +5,8 @@ - {% include header.html %} - -
    -
    - {{ content }} -
    +
    + {{ content }}
    {% include footer.html %} diff --git a/_sass/_base.scss b/_sass/_base.scss index e5fd0fd8..29b16d0a 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -8,8 +8,6 @@ dl, dd, ol, ul, figure { padding: 0; } - - /** * Basic styling */ @@ -23,8 +21,6 @@ body { -webkit-text-size-adjust: 100%; } - - /** * Set `margin-bottom` to maintain vertical rhythm */ @@ -35,8 +31,6 @@ ul, ol, dl, figure, margin-bottom: $spacing-unit / 2; } - - /** * Images */ @@ -45,8 +39,6 @@ img { vertical-align: middle; } - - /** * Figures */ @@ -58,8 +50,6 @@ figcaption { font-size: $small-font-size; } - - /** * Lists */ @@ -74,8 +64,6 @@ li { } } - - /** * Headings */ @@ -83,8 +71,6 @@ h1, h2, h3, h4, h5, h6 { font-weight: 300; } - - /** * Links */ @@ -153,6 +139,8 @@ pre { /** * Wrapper */ + + /* .wrapper { max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2)); max-width: calc(#{$content-width} - (#{$spacing-unit} * 2)); @@ -170,35 +158,15 @@ pre { } } - +*/ /** * Clearfix */ %clearfix { - &:after { content: ""; display: table; clear: both; } } - - - -/** - * Icons - */ -.icon { - - > svg { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; - - path { - fill: $grey-color; - } - } -} diff --git a/_sass/_layout.scss b/_sass/_layout.scss deleted file mode 100644 index def56f89..00000000 --- a/_sass/_layout.scss +++ /dev/null @@ -1,236 +0,0 @@ -/** - * Site header - */ -.site-header { - border-top: 5px solid $grey-color-dark; - border-bottom: 1px solid $grey-color-light; - min-height: 56px; - - // Positioning context for the mobile navigation icon - position: relative; -} - -.site-title { - font-size: 26px; - line-height: 56px; - letter-spacing: -1px; - margin-bottom: 0; - float: left; - - &, - &:visited { - color: $grey-color-dark; - } -} - -.site-nav { - float: right; - line-height: 56px; - - .menu-icon { - display: none; - } - - .page-link { - color: $text-color; - line-height: $base-line-height; - - // Gaps between nav items, but not on the first one - &:not(:first-child) { - margin-left: 20px; - } - } - - @include media-query($on-palm) { - position: absolute; - top: 9px; - right: 30px; - background-color: $background-color; - border: 1px solid $grey-color-light; - border-radius: 5px; - text-align: right; - - .menu-icon { - display: block; - float: right; - width: 36px; - height: 26px; - line-height: 0; - padding-top: 10px; - text-align: center; - - > svg { - width: 18px; - height: 15px; - - path { - fill: $grey-color-dark; - } - } - } - - .trigger { - clear: both; - display: none; - } - - &:hover .trigger { - display: block; - padding-bottom: 5px; - } - - .page-link { - display: block; - padding: 5px 10px; - } - } -} - - - -/** - * Site footer - */ -.site-footer { - border-top: 1px solid $grey-color-light; - padding: $spacing-unit 0; -} - -.footer-heading { - font-size: 18px; - margin-bottom: $spacing-unit / 2; -} - -.contact-list, -.social-media-list { - list-style: none; - margin-left: 0; -} - -.footer-col-wrapper { - font-size: 15px; - color: $grey-color; - margin-left: -$spacing-unit / 2; - @extend %clearfix; -} - -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - -.footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); -} - -.footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); -} - -.footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); -} - -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (#{$spacing-unit} / 2)); - width: calc(50% - (#{$spacing-unit} / 2)); - } - - .footer-col-3 { - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - -@include media-query($on-palm) { - .footer-col { - float: none; - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - - - -/** - * Page content - */ -.page-content { - padding: $spacing-unit 0; -} - -.page-heading { - font-size: 20px; -} - -.post-list { - margin-left: 0; - list-style: none; - - > li { - margin-bottom: $spacing-unit; - } -} - -.post-meta { - font-size: $small-font-size; - color: $grey-color; -} - -.post-link { - display: block; - font-size: 24px; -} - - - -/** - * Posts - */ -.post-header { - margin-bottom: $spacing-unit; -} - -.post-title { - font-size: 42px; - letter-spacing: -1px; - line-height: 1; - - @include media-query($on-laptop) { - font-size: 36px; - } -} - -.post-content { - margin-bottom: $spacing-unit; - - h2 { - font-size: 32px; - - @include media-query($on-laptop) { - font-size: 28px; - } - } - - h3 { - font-size: 26px; - - @include media-query($on-laptop) { - font-size: 22px; - } - } - - h4 { - font-size: 20px; - - @include media-query($on-laptop) { - font-size: 18px; - } - } -} diff --git a/css/main.scss b/css/main.scss index beee4e3d..a86c5682 100755 --- a/css/main.scss +++ b/css/main.scss @@ -27,8 +27,6 @@ $content-width: 800px; $on-palm: 600px; $on-laptop: 800px; - - // Using media queries with like this: // @include media-query($on-palm) { // .wrapper { @@ -42,11 +40,10 @@ $on-laptop: 800px; } } - - // Import partials from `sass_dir` (defaults to `_sass`) @import "base", - "layout", "syntax-highlighting" ; + +