From 6a1005027d6e39119bfad0c23e42051f2deed7f4 Mon Sep 17 00:00:00 2001 From: bjoern Date: Sun, 11 Nov 2018 12:08:49 +0100 Subject: [PATCH] adding --- dist/index.html | 26 ++++++++++++++------------ src/example/components/_nav.scss | 18 +----------------- src/example/site/_container.scss | 13 ------------- src/example/site/_footer.scss | 4 ++-- webpack.mix.js | 5 ++++- 5 files changed, 21 insertions(+), 45 deletions(-) delete mode 100644 src/example/site/_container.scss diff --git a/dist/index.html b/dist/index.html index 6cc6a63..15b2136 100644 --- a/dist/index.html +++ b/dist/index.html @@ -8,6 +8,7 @@ + @@ -41,20 +42,21 @@ -
+ +

diff --git a/src/example/components/_nav.scss b/src/example/components/_nav.scss index ba18649..c350d3f 100644 --- a/src/example/components/_nav.scss +++ b/src/example/components/_nav.scss @@ -9,26 +9,10 @@ @mixin example__nav() { .nav { - position: relative; + position: fixed; a { @include crispy__font-size(18px); } - - ul { - margin-left: 0; - list-style: none; - } - - @include crispy__media-sm() { - position: absolute; - } - - &--fixed { - @include crispy__media-sm() { - position: fixed; - top: 40px !important; - } - } } } diff --git a/src/example/site/_container.scss b/src/example/site/_container.scss deleted file mode 100644 index 0694fcb..0000000 --- a/src/example/site/_container.scss +++ /dev/null @@ -1,13 +0,0 @@ -/** - * - * - */ - -@mixin example__container() -{ - .container { - max-width: 992px; - width: 100%; - margin: 0 auto; - } -} diff --git a/src/example/site/_footer.scss b/src/example/site/_footer.scss index b46a1c6..5ee0e9b 100644 --- a/src/example/site/_footer.scss +++ b/src/example/site/_footer.scss @@ -8,9 +8,9 @@ @mixin example__footer() { .footer { - padding: 12px 0; + padding: toEm(12px 0); background-color: #e9e9e9; border-top: 1px dotted #959595; - margin: 50px 0 0 0; + margin: toEm(50px 0 0 0); } } diff --git a/webpack.mix.js b/webpack.mix.js index e1a84dc..1af5d6b 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,7 +11,10 @@ let mix = require('laravel-mix'); | */ -mix.js.sass('src/app.scss', 'dist/') +mix.sass([ + 'src/sass/crispy.scss', + 'src/example/example.scss', + ], 'dist/') .options({ postCss: [ require('postcss-css-variables')()