From b3967c83cbdba7f44c2ecef09d3e80801106ac81 Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Tue, 11 Aug 2015 22:56:34 -0400 Subject: Update to Tiny CSS --- _includes/fonts.scss | 40 ---- _includes/tiny.scss | 21 ++ _layouts/master.html | 54 +++-- _layouts/post.html | 67 +++--- _sass/_base.scss | 73 ------ _sass/_brand.scss | 98 -------- _sass/_mixins.scss | 20 -- _sass/_print.scss | 20 -- _sass/_respond.scss | 43 ---- _sass/_typography.scss | 40 ---- _sass/_utility.scss | 31 --- _sass/_variables.scss | 11 - _sass/font-awesome/_icons.scss | 10 +- _sass/font-awesome/_larger.scss | 6 +- _sass/font-awesome/font-awesome.scss | 2 +- _sass/tiny/_base.scss | 62 +++++ _sass/tiny/_fonts.scss | 30 +++ _sass/tiny/_layout.scss | 69 ++++++ _sass/tiny/_mixins.scss | 36 +++ _sass/tiny/_normalize.scss | 423 +++++++++++++++++++++++++++++++++++ _sass/tiny/_syntax.scss | 60 +++++ _sass/tiny/_type.scss | 12 + _sass/tiny/_utility.scss | 39 ++++ _sass/tiny/_variables.scss | 12 + assets/stylesheets/site.scss | 12 - index.html | 45 ++-- posts/index.html | 3 +- projects/index.html | 15 +- theatre/index.html | 18 +- 29 files changed, 872 insertions(+), 500 deletions(-) delete mode 100644 _includes/fonts.scss create mode 100644 _includes/tiny.scss delete mode 100644 _sass/_base.scss delete mode 100644 _sass/_brand.scss delete mode 100644 _sass/_mixins.scss delete mode 100644 _sass/_print.scss delete mode 100644 _sass/_respond.scss delete mode 100644 _sass/_typography.scss delete mode 100644 _sass/_utility.scss delete mode 100644 _sass/_variables.scss create mode 100644 _sass/tiny/_base.scss create mode 100644 _sass/tiny/_fonts.scss create mode 100644 _sass/tiny/_layout.scss create mode 100644 _sass/tiny/_mixins.scss create mode 100644 _sass/tiny/_normalize.scss create mode 100644 _sass/tiny/_syntax.scss create mode 100644 _sass/tiny/_type.scss create mode 100644 _sass/tiny/_utility.scss create mode 100644 _sass/tiny/_variables.scss delete mode 100644 assets/stylesheets/site.scss diff --git a/_includes/fonts.scss b/_includes/fonts.scss deleted file mode 100644 index bff4b44..0000000 --- a/_includes/fonts.scss +++ /dev/null @@ -1,40 +0,0 @@ -// Open Sans -@font-face { - font-family: 'open_sans'; - src: url('/assets/fonts/OpenSans-Light.eot'); - src: url('/assets/fonts/OpenSans-Light.woff') format('woff'), - url('/assets/fonts/OpenSans-Light.ttf') format('truetype'); - font-weight: 200; - font-style: normal; -} - -// Source Code Pro -@font-face { - font-family: 'source_code_pro'; - src: url('/assets/fonts/sourcecodepro-regular.eot'); - src: url('/assets/fonts/sourcecodepro-regular.woff') format('woff'), - url('/assets/fonts/sourcecodepro-regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -// Merriweather -@font-face { - font-family: 'merriweather_light'; - src: url('/assets/fonts/merriweather-lightitalic-webfont.eot'); - src: url('/assets/fonts/merriweather-lightitalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/fonts/merriweather-lightitalic-webfont.woff') format('woff'), - url('/assets/fonts/merriweather-lightitalic-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'merriweather_light'; - src: url('/assets/fonts/merriweather_light-webfont.eot'); - src: url('/assets/fonts/merriweather_light-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/fonts/merriweather_light-webfont.woff') format('woff'), - url('/assets/fonts/merriweather_light-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} \ No newline at end of file diff --git a/_includes/tiny.scss b/_includes/tiny.scss new file mode 100644 index 0000000..4b29cf2 --- /dev/null +++ b/_includes/tiny.scss @@ -0,0 +1,21 @@ +// Include fonts first so we can get them loading immediately +@import "tiny/fonts"; + +// These contain variables and mixins used throughout Tiny +@import "tiny/variables"; +@import "tiny/mixins"; + +// Normalize, of course +@import "tiny/normalize"; + +// General styles +@import "tiny/base"; +@import "tiny/layout"; +@import "tiny/type"; +// @import "tiny/syntax"; + +// Utility classes +@import "tiny/utility"; + +// Icon fonts +@import "font-awesome/font-awesome"; diff --git a/_layouts/master.html b/_layouts/master.html index c2b4754..46e629c 100644 --- a/_layouts/master.html +++ b/_layouts/master.html @@ -2,20 +2,12 @@ {{ page.title }} - - - - - - @@ -24,7 +16,6 @@ - {% if page.description %} @@ -32,7 +23,6 @@ {% endif %} - {% if page.description %} @@ -49,7 +39,6 @@ - @@ -65,29 +54,36 @@ {% endif %} - {% if page.chrome-webstore-item %} {% endif %} -