From 1222e5432d67bc330fcac58400a91874e1c64603 Mon Sep 17 00:00:00 2001 From: nirgendswo Date: Wed, 23 Aug 2017 00:21:08 +0200 Subject: [PATCH] adding new structure adding hover.css --- README.md | 1 + package.json | 3 +- {src => scss}/_mixins.scss | 0 {src => scss}/components/_align.scss | 0 {src => scss}/components/_body.scss | 0 {src => scss}/components/_button.scss | 0 {src => scss}/components/_clearfix.scss | 0 {src => scss}/components/_heading.scss | 2 +- {src => scss}/components/_icon.scss | 0 {src => scss}/components/_list.scss | 0 {src => scss}/components/_margin.scss | 0 {src => scss}/components/_normalize.scss | 0 {src => scss}/components/_text-colors.scss | 0 {src => scss}/crispyBoilerplate.scss | 4 +-- {src => scss}/example.scss | 0 {src => scss}/functions/_units.scss | 0 {src => scss}/functions/_zIndex.scss | 0 src/components/_animation.scss | 41 ---------------------- 18 files changed, 6 insertions(+), 45 deletions(-) rename {src => scss}/_mixins.scss (100%) rename {src => scss}/components/_align.scss (100%) rename {src => scss}/components/_body.scss (100%) rename {src => scss}/components/_button.scss (100%) rename {src => scss}/components/_clearfix.scss (100%) rename {src => scss}/components/_heading.scss (93%) rename {src => scss}/components/_icon.scss (100%) rename {src => scss}/components/_list.scss (100%) rename {src => scss}/components/_margin.scss (100%) rename {src => scss}/components/_normalize.scss (100%) rename {src => scss}/components/_text-colors.scss (100%) rename {src => scss}/crispyBoilerplate.scss (81%) rename {src => scss}/example.scss (100%) rename {src => scss}/functions/_units.scss (100%) rename {src => scss}/functions/_zIndex.scss (100%) delete mode 100644 src/components/_animation.scss diff --git a/README.md b/README.md index a6a405a..5abcf92 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # cripsy-boilerplate Flat Sass Boilerplate to give you a amount of Basic Settings, Mixins and Functions. +This Boilerplate uses hover.css and normalize.css ``` npm install crispy-boilerplate --save diff --git a/package.json b/package.json index 7c4bc4b..267770a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "crispy-boilerplate", - "version": "0.9.0", + "version": "0.9.1", "description": "Flat Sass Boilerplate to give you a amount of Basic Settings, Mixins and Functions", "repository": { "type": "git", @@ -9,6 +9,7 @@ "author": "Björn Hase", "license": "MIT", "dependencies": { + "hover.css": "^2.2.1", "normalize.css": "^7.0.0" } } diff --git a/src/_mixins.scss b/scss/_mixins.scss similarity index 100% rename from src/_mixins.scss rename to scss/_mixins.scss diff --git a/src/components/_align.scss b/scss/components/_align.scss similarity index 100% rename from src/components/_align.scss rename to scss/components/_align.scss diff --git a/src/components/_body.scss b/scss/components/_body.scss similarity index 100% rename from src/components/_body.scss rename to scss/components/_body.scss diff --git a/src/components/_button.scss b/scss/components/_button.scss similarity index 100% rename from src/components/_button.scss rename to scss/components/_button.scss diff --git a/src/components/_clearfix.scss b/scss/components/_clearfix.scss similarity index 100% rename from src/components/_clearfix.scss rename to scss/components/_clearfix.scss diff --git a/src/components/_heading.scss b/scss/components/_heading.scss similarity index 93% rename from src/components/_heading.scss rename to scss/components/_heading.scss index 03a7630..1e3a2b3 100644 --- a/src/components/_heading.scss +++ b/scss/components/_heading.scss @@ -24,7 +24,7 @@ $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; +$heading__margin: pxToEm(20px) 0 pxToEm(5px) !default; @mixin crispy-boilerplate-heading { @each $h, $font-size in $heading__font-sizes { diff --git a/src/components/_icon.scss b/scss/components/_icon.scss similarity index 100% rename from src/components/_icon.scss rename to scss/components/_icon.scss diff --git a/src/components/_list.scss b/scss/components/_list.scss similarity index 100% rename from src/components/_list.scss rename to scss/components/_list.scss diff --git a/src/components/_margin.scss b/scss/components/_margin.scss similarity index 100% rename from src/components/_margin.scss rename to scss/components/_margin.scss diff --git a/src/components/_normalize.scss b/scss/components/_normalize.scss similarity index 100% rename from src/components/_normalize.scss rename to scss/components/_normalize.scss diff --git a/src/components/_text-colors.scss b/scss/components/_text-colors.scss similarity index 100% rename from src/components/_text-colors.scss rename to scss/components/_text-colors.scss diff --git a/src/crispyBoilerplate.scss b/scss/crispyBoilerplate.scss similarity index 81% rename from src/crispyBoilerplate.scss rename to scss/crispyBoilerplate.scss index 95a55ce..8a377d0 100644 --- a/src/crispyBoilerplate.scss +++ b/scss/crispyBoilerplate.scss @@ -1,5 +1,6 @@ @import - '../node_modules/normalize.css/normalize', + '../../normalize.css/normalize', + '../../hover.css/scss/hover', 'functions/units', 'functions/zIndex', @@ -7,7 +8,6 @@ 'mixins', 'components/align', - 'components/animation', 'components/body', 'components/button', 'components/clearfix', diff --git a/src/example.scss b/scss/example.scss similarity index 100% rename from src/example.scss rename to scss/example.scss diff --git a/src/functions/_units.scss b/scss/functions/_units.scss similarity index 100% rename from src/functions/_units.scss rename to scss/functions/_units.scss diff --git a/src/functions/_zIndex.scss b/scss/functions/_zIndex.scss similarity index 100% rename from src/functions/_zIndex.scss rename to scss/functions/_zIndex.scss diff --git a/src/components/_animation.scss b/src/components/_animation.scss deleted file mode 100644 index 1bbebe0..0000000 --- a/src/components/_animation.scss +++ /dev/null @@ -1,41 +0,0 @@ -/** - * animation - * - * - * - * @author Björn Hase - * - */ - - -@mixin crispy-boilerplate-animation() { - .--animation-rotate { - animation: spin 3s linear infinite; - - @keyframes spin { - to { - transform: rotate(360deg); - } - } - } - - .--animation-shake { - animation: shake 0.82s cubic-bezier(.36,.07,.19,.97) both; - transform: translate3d(0, 0, 0); - - @keyframes shake { - 10%, 90% { - transform: translate3d(-1px, 0, 0); - } - 20%, 80% { - transform: translate3d(2px, 0, 0); - } - 30%, 50%, 70% { - transform: translate3d(-4px, 0, 0); - } - 40%, 60% { - transform: translate3d(4px, 0, 0); - } - } - } - }