From 16547c9b8f259f1831115c58872f3667f876724a Mon Sep 17 00:00:00 2001 From: nirgendswo Date: Thu, 17 Aug 2017 17:54:07 +0200 Subject: [PATCH] bugfix --- package.json | 2 +- scss/components/_align.scss | 11 ++++++----- scss/components/_animation.scss | 3 ++- scss/components/_body.scss | 11 +++++------ scss/components/_button.scss | 1 + scss/components/_heading.scss | 8 +++----- scss/components/_icon.scss | 1 + scss/components/_list.scss | 7 ++++--- scss/components/_margin.scss | 8 +++----- scss/components/_normalize.scss | 4 +--- scss/components/_text-colors.scss | 1 + 11 files changed, 28 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index fc5840f..2ebc2ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "crispy-boilerplate", - "version": "0.4.0", + "version": "0.5.0", "description": "Flat Sass Boilerplate to give you a amount of Basic Settings, Mixins and Functions", "repository": { "type": "git", diff --git a/scss/components/_align.scss b/scss/components/_align.scss index d8637cb..db1abaf 100644 --- a/scss/components/_align.scss +++ b/scss/components/_align.scss @@ -1,14 +1,15 @@ /** - * align + * align * - * - text - * - floating for elements - * - centering with margin + * - text + * - floating for elements + * - centering with margin * - * @author Björn Hase + * @author Björn Hase * */ + @mixin crispy-boilerplate-align() { .--text-left { text-align: left; diff --git a/scss/components/_animation.scss b/scss/components/_animation.scss index 7878143..1bbebe0 100644 --- a/scss/components/_animation.scss +++ b/scss/components/_animation.scss @@ -1,12 +1,13 @@ /** * animation * - * + * * * @author Björn Hase * */ + @mixin crispy-boilerplate-animation() { .--animation-rotate { animation: spin 3s linear infinite; diff --git a/scss/components/_body.scss b/scss/components/_body.scss index 2841af9..752565d 100644 --- a/scss/components/_body.scss +++ b/scss/components/_body.scss @@ -1,21 +1,20 @@ -@import - '../mixins/font-size'; - /** - * body + * body * * * - * @author Björn Hase + * @author Björn Hase * */ + +// text $body__font-size: 12px !default; $body__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default; - $body__line-height: 1.5 !default; $body__direction: ltr !default; +// colors $body__color: black !default; $body__backgroun-color: white !default; diff --git a/scss/components/_button.scss b/scss/components/_button.scss index abbdf87..40f417e 100644 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -7,6 +7,7 @@ * */ + @mixin crispy-boilerplate-button() { .button { position: relative; diff --git a/scss/components/_heading.scss b/scss/components/_heading.scss index d06c0a2..03a7630 100644 --- a/scss/components/_heading.scss +++ b/scss/components/_heading.scss @@ -1,7 +1,3 @@ -@import - '../functions/units', - '../mixins/font-size'; - /** * heading * @@ -13,6 +9,8 @@ * */ + +// text $heading__font-sizes: ( 'h1': 36px, 'h2': 30px, @@ -24,8 +22,8 @@ $heading__font-sizes: ( $heading__font-weight: bold !default; $heading__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default; - $heading__line-height: 1.5 !default; + $heading__margin: 0 0 pxToEm(20px) !default; @mixin crispy-boilerplate-heading { diff --git a/scss/components/_icon.scss b/scss/components/_icon.scss index c3dfaba..eb10fd6 100644 --- a/scss/components/_icon.scss +++ b/scss/components/_icon.scss @@ -12,6 +12,7 @@ * */ + $icon__vertical-align: middle !default; $icon__margin: 0 2px !default; diff --git a/scss/components/_list.scss b/scss/components/_list.scss index b187596..1cd93a4 100644 --- a/scss/components/_list.scss +++ b/scss/components/_list.scss @@ -1,25 +1,26 @@ /** * list * - * styles and mixins for ul-element + * styles and mixins for ol and ul-element * * * @author Björn Hase * */ + @mixin crispy-boilerplate-list { .list { list-style-position: outside; &--horizontal { - .list__item { + li { float: left; } } &--clear { - @include crispy-boilerplate-ist-clear(); + @include crispy-boilerplate-list-clear(); } } diff --git a/scss/components/_margin.scss b/scss/components/_margin.scss index 675cf82..416de2d 100644 --- a/scss/components/_margin.scss +++ b/scss/components/_margin.scss @@ -1,6 +1,3 @@ -@import - '../mixins/units'; - /** * margin * @@ -11,8 +8,9 @@ * */ -$margin-top: em(5px) !default; -$margin-bottom: em(20px) !default; + +$margin-top: pxToEm(5px) !default; +$margin-bottom: pxToEm(20px) !default; @mixin crispy-boilerplate-margin() { .--margin-top-y0 { diff --git a/scss/components/_normalize.scss b/scss/components/_normalize.scss index 9ff25d1..73f5645 100644 --- a/scss/components/_normalize.scss +++ b/scss/components/_normalize.scss @@ -1,6 +1,3 @@ -@import - '../functions/units'; - /** * normalize * @@ -9,6 +6,7 @@ * */ + $normalize__margin: 0 0 pxToEm(20px) !default; @mixin crispy-boilerplate-normalize { diff --git a/scss/components/_text-colors.scss b/scss/components/_text-colors.scss index 9ef942d..89926c1 100644 --- a/scss/components/_text-colors.scss +++ b/scss/components/_text-colors.scss @@ -8,6 +8,7 @@ * */ + $text-colors: ( 'success': green, 'warning': yellow,