From 119f7fcafacf309e13e56962706ecbd05949e434 Mon Sep 17 00:00:00 2001 From: David Darnes Date: Sun, 19 Jun 2016 18:42:46 +0100 Subject: [PATCH] Stops using bourbon, too annoying to get started with. Changes to sasslines, adds more theme styles --- _includes/favicons.html | 18 - _includes/footer.html | 2 +- _includes/header.html | 34 +- _includes/nav.html | 14 - _includes/pagination.html | 28 +- _includes/posts.html | 4 +- _includes/scripts.js | 14 - _layouts/default.html | 5 + _layouts/front.html | 8 +- _layouts/page.html | 8 +- _layouts/post.html | 10 +- _sass/_sassline-base.scss | 7 + _sass/base/_base.scss | 14 - _sass/base/_buttons.scss | 35 -- _sass/base/_forms.scss | 83 ---- _sass/base/_layout.scss | 9 - _sass/base/_lists.scss | 19 - _sass/base/_media.scss | 9 - _sass/base/_tables.scss | 24 - _sass/base/_typography.scss | 42 -- _sass/base/_variables.scss | 46 -- _sass/bourbon/_bourbon.scss | 52 --- .../bourbon/helpers/_buttons-list.scss | 14 - _sass/bourbon/bourbon/helpers/_scales.scss | 27 -- .../bourbon/helpers/_text-inputs-list.scss | 26 -- .../bourbon/library/_border-color.scss | 25 -- .../bourbon/library/_border-radius.scss | 85 ---- .../bourbon/library/_border-style.scss | 24 - .../bourbon/library/_border-width.scss | 24 - _sass/bourbon/bourbon/library/_buttons.scss | 84 ---- _sass/bourbon/bourbon/library/_clearfix.scss | 25 -- .../bourbon/library/_contrast-switch.scss | 60 --- _sass/bourbon/bourbon/library/_ellipsis.scss | 37 -- _sass/bourbon/bourbon/library/_font-face.scss | 65 --- .../bourbon/bourbon/library/_font-stacks.scss | 87 ---- _sass/bourbon/bourbon/library/_hide-text.scss | 24 - .../bourbon/library/_hide-visually.scss | 65 --- _sass/bourbon/bourbon/library/_margin.scss | 34 -- .../bourbon/library/_modular-scale.scss | 113 ----- _sass/bourbon/bourbon/library/_padding.scss | 34 -- _sass/bourbon/bourbon/library/_position.scss | 54 --- _sass/bourbon/bourbon/library/_prefixer.scss | 38 -- _sass/bourbon/bourbon/library/_shade.scss | 33 -- _sass/bourbon/bourbon/library/_size.scss | 49 -- .../bourbon/bourbon/library/_strip-unit.scss | 17 - .../bourbon/bourbon/library/_text-inputs.scss | 163 ------- .../bourbon/library/_timing-functions.scss | 38 -- _sass/bourbon/bourbon/library/_tint.scss | 33 -- _sass/bourbon/bourbon/library/_triangle.scss | 82 ---- .../bourbon/library/_value-prefixer.scss | 38 -- _sass/bourbon/bourbon/library/_word-wrap.scss | 29 -- _sass/bourbon/bourbon/settings/_settings.scss | 51 --- .../bourbon/utilities/_assign-inputs.scss | 29 -- .../utilities/_collapse-directionals.scss | 51 --- .../utilities/_directional-values.scss | 58 --- .../utilities/_font-source-declaration.scss | 52 --- .../utilities/_retrieve-bourbon-setting.scss | 16 - _sass/bourbon/bourbon/utilities/_unpack.scss | 29 -- .../bourbon/validators/_contains-falsy.scss | 20 - .../bourbon/bourbon/validators/_contains.scss | 27 -- .../bourbon/bourbon/validators/_is-color.scss | 13 - .../bourbon/validators/_is-length.scss | 15 - .../bourbon/bourbon/validators/_is-light.scss | 23 - .../bourbon/validators/_is-number.scss | 15 - .../bourbon/bourbon/validators/_is-size.scss | 18 - _sass/neat/_neat-helpers.scss | 8 - _sass/neat/_neat.scss | 23 - _sass/neat/functions/_new-breakpoint.scss | 49 -- _sass/neat/functions/_private.scss | 114 ----- _sass/neat/grid/_box-sizing.scss | 15 - _sass/neat/grid/_direction-context.scss | 33 -- _sass/neat/grid/_display-context.scss | 28 -- _sass/neat/grid/_fill-parent.scss | 22 - _sass/neat/grid/_media.scss | 92 ---- _sass/neat/grid/_omega.scss | 87 ---- _sass/neat/grid/_outer-container.scss | 38 -- _sass/neat/grid/_pad.scss | 25 -- _sass/neat/grid/_private.scss | 35 -- _sass/neat/grid/_row.scss | 52 --- _sass/neat/grid/_shift.scss | 50 --- _sass/neat/grid/_span-columns.scss | 94 ---- _sass/neat/grid/_to-deprecate.scss | 97 ---- _sass/neat/grid/_visual-grid.scss | 42 -- _sass/neat/settings/_disable-warnings.scss | 13 - _sass/neat/settings/_grid.scss | 51 --- _sass/neat/settings/_visual-grid.scss | 27 -- _sass/sassline-base/_layouts.scss | 282 ++++++++++++ _sass/sassline-base/_mixins.scss | 420 ++++++++++++++++++ _sass/sassline-base/_modular-scale.scss | 66 +++ _sass/sassline-base/_reset.scss | 13 + _sass/sassline-base/_typography.scss | 363 +++++++++++++++ _sass/sassline-base/_variables.scss | 96 ++++ _sass/sassline.scss | 1 + _sass/style.scss | 12 + _sass/theme.scss | 100 ++++- 95 files changed, 1396 insertions(+), 3281 deletions(-) delete mode 100644 _includes/favicons.html delete mode 100644 _includes/nav.html delete mode 100644 _includes/scripts.js create mode 100755 _sass/_sassline-base.scss delete mode 100755 _sass/base/_base.scss delete mode 100755 _sass/base/_buttons.scss delete mode 100755 _sass/base/_forms.scss delete mode 100644 _sass/base/_layout.scss delete mode 100755 _sass/base/_lists.scss delete mode 100644 _sass/base/_media.scss delete mode 100755 _sass/base/_tables.scss delete mode 100755 _sass/base/_typography.scss delete mode 100755 _sass/base/_variables.scss delete mode 100644 _sass/bourbon/_bourbon.scss delete mode 100644 _sass/bourbon/bourbon/helpers/_buttons-list.scss delete mode 100644 _sass/bourbon/bourbon/helpers/_scales.scss delete mode 100644 _sass/bourbon/bourbon/helpers/_text-inputs-list.scss delete mode 100644 _sass/bourbon/bourbon/library/_border-color.scss delete mode 100644 _sass/bourbon/bourbon/library/_border-radius.scss delete mode 100644 _sass/bourbon/bourbon/library/_border-style.scss delete mode 100644 _sass/bourbon/bourbon/library/_border-width.scss delete mode 100644 _sass/bourbon/bourbon/library/_buttons.scss delete mode 100644 _sass/bourbon/bourbon/library/_clearfix.scss delete mode 100644 _sass/bourbon/bourbon/library/_contrast-switch.scss delete mode 100644 _sass/bourbon/bourbon/library/_ellipsis.scss delete mode 100644 _sass/bourbon/bourbon/library/_font-face.scss delete mode 100644 _sass/bourbon/bourbon/library/_font-stacks.scss delete mode 100644 _sass/bourbon/bourbon/library/_hide-text.scss delete mode 100644 _sass/bourbon/bourbon/library/_hide-visually.scss delete mode 100644 _sass/bourbon/bourbon/library/_margin.scss delete mode 100644 _sass/bourbon/bourbon/library/_modular-scale.scss delete mode 100644 _sass/bourbon/bourbon/library/_padding.scss delete mode 100644 _sass/bourbon/bourbon/library/_position.scss delete mode 100644 _sass/bourbon/bourbon/library/_prefixer.scss delete mode 100644 _sass/bourbon/bourbon/library/_shade.scss delete mode 100644 _sass/bourbon/bourbon/library/_size.scss delete mode 100644 _sass/bourbon/bourbon/library/_strip-unit.scss delete mode 100644 _sass/bourbon/bourbon/library/_text-inputs.scss delete mode 100644 _sass/bourbon/bourbon/library/_timing-functions.scss delete mode 100644 _sass/bourbon/bourbon/library/_tint.scss delete mode 100644 _sass/bourbon/bourbon/library/_triangle.scss delete mode 100644 _sass/bourbon/bourbon/library/_value-prefixer.scss delete mode 100644 _sass/bourbon/bourbon/library/_word-wrap.scss delete mode 100644 _sass/bourbon/bourbon/settings/_settings.scss delete mode 100644 _sass/bourbon/bourbon/utilities/_assign-inputs.scss delete mode 100644 _sass/bourbon/bourbon/utilities/_collapse-directionals.scss delete mode 100644 _sass/bourbon/bourbon/utilities/_directional-values.scss delete mode 100644 _sass/bourbon/bourbon/utilities/_font-source-declaration.scss delete mode 100644 _sass/bourbon/bourbon/utilities/_retrieve-bourbon-setting.scss delete mode 100644 _sass/bourbon/bourbon/utilities/_unpack.scss delete mode 100644 _sass/bourbon/bourbon/validators/_contains-falsy.scss delete mode 100644 _sass/bourbon/bourbon/validators/_contains.scss delete mode 100644 _sass/bourbon/bourbon/validators/_is-color.scss delete mode 100644 _sass/bourbon/bourbon/validators/_is-length.scss delete mode 100644 _sass/bourbon/bourbon/validators/_is-light.scss delete mode 100644 _sass/bourbon/bourbon/validators/_is-number.scss delete mode 100644 _sass/bourbon/bourbon/validators/_is-size.scss delete mode 100644 _sass/neat/_neat-helpers.scss delete mode 100644 _sass/neat/_neat.scss delete mode 100644 _sass/neat/functions/_new-breakpoint.scss delete mode 100644 _sass/neat/functions/_private.scss delete mode 100644 _sass/neat/grid/_box-sizing.scss delete mode 100644 _sass/neat/grid/_direction-context.scss delete mode 100644 _sass/neat/grid/_display-context.scss delete mode 100644 _sass/neat/grid/_fill-parent.scss delete mode 100644 _sass/neat/grid/_media.scss delete mode 100644 _sass/neat/grid/_omega.scss delete mode 100644 _sass/neat/grid/_outer-container.scss delete mode 100644 _sass/neat/grid/_pad.scss delete mode 100644 _sass/neat/grid/_private.scss delete mode 100644 _sass/neat/grid/_row.scss delete mode 100644 _sass/neat/grid/_shift.scss delete mode 100644 _sass/neat/grid/_span-columns.scss delete mode 100644 _sass/neat/grid/_to-deprecate.scss delete mode 100644 _sass/neat/grid/_visual-grid.scss delete mode 100644 _sass/neat/settings/_disable-warnings.scss delete mode 100644 _sass/neat/settings/_grid.scss delete mode 100644 _sass/neat/settings/_visual-grid.scss create mode 100755 _sass/sassline-base/_layouts.scss create mode 100755 _sass/sassline-base/_mixins.scss create mode 100755 _sass/sassline-base/_modular-scale.scss create mode 100755 _sass/sassline-base/_reset.scss create mode 100755 _sass/sassline-base/_typography.scss create mode 100755 _sass/sassline-base/_variables.scss create mode 100644 _sass/sassline.scss create mode 100755 _sass/style.scss diff --git a/_includes/favicons.html b/_includes/favicons.html deleted file mode 100644 index 51935ef..0000000 --- a/_includes/favicons.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/_includes/footer.html b/_includes/footer.html index 6ba3f62..830f665 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,7 +2,7 @@
- © {{ site.time | date: '%Y' }} — {{ site.title }} + © {{ site.time | date: '%Y' }} – {{ site.title }}
diff --git a/_includes/header.html b/_includes/header.html index fa4be57..d30dfd0 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,16 +1,32 @@
- - - {{ site.title }} - - - - {% include nav.html %} -
-

{{ page.title }}

+ {% if site.logo %} + + {% endif %} + + + +
diff --git a/_includes/nav.html b/_includes/nav.html deleted file mode 100644 index 442bf6a..0000000 --- a/_includes/nav.html +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/_includes/pagination.html b/_includes/pagination.html index e424cd3..819dd61 100644 --- a/_includes/pagination.html +++ b/_includes/pagination.html @@ -1,17 +1,21 @@ -