From 4f1ee0547ad7c3389ad3ff6b54b3601b525107d8 Mon Sep 17 00:00:00 2001 From: Ian Weller Date: Tue, 31 May 2016 10:36:00 -0400 Subject: [PATCH] Revert "New way of doing mixins" This reverts commit d1eef2f6ee444843e3cea9eddf84fbe3b2980389. --- scss/_mixins.scss | 7 ------- scss/app.scss | 4 +++- scss/mixins/_gradient.scss | 10 ---------- scss/mixins/_off-canvas-arrow.scss | 10 +++++----- 4 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 scss/_mixins.scss delete mode 100644 scss/mixins/_gradient.scss diff --git a/scss/_mixins.scss b/scss/_mixins.scss deleted file mode 100644 index 4b68036..0000000 --- a/scss/_mixins.scss +++ /dev/null @@ -1,7 +0,0 @@ -/* - Created on : Mar 5, 2015, 2:57:46 PM - Author : laury -*/ - - @import "mixins/gradient"; - @import "mixins/off-canvas-arrow"; \ No newline at end of file diff --git a/scss/app.scss b/scss/app.scss index 8f11774..21685ce 100644 --- a/scss/app.scss +++ b/scss/app.scss @@ -1,9 +1,11 @@ -@import "mixins"; +@import "mixins/off-canvas-arrow"; + @import "settings"; @import "foundation"; @import "wordpress"; @import "structure"; + // Or selectively include components // @import // "foundation/components/accordion", diff --git a/scss/mixins/_gradient.scss b/scss/mixins/_gradient.scss deleted file mode 100644 index 84d0898..0000000 --- a/scss/mixins/_gradient.scss +++ /dev/null @@ -1,10 +0,0 @@ -/* - Created on : Mar 5, 2015, 2:57:35 PM - Author : laury -*/ - -@mixin gradient($from, $to) { - background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, $from), color-stop(1, $to)); - background: -moz-linear-gradient(center top, $from 5%, $to 100%); - filter: progid:DXIm-ageTransform.Microsoft.gradient(startColorstr='#{$from}', endColorstr'#{$to}'); -} \ No newline at end of file diff --git a/scss/mixins/_off-canvas-arrow.scss b/scss/mixins/_off-canvas-arrow.scss index 4beb816..f7dc46f 100644 --- a/scss/mixins/_off-canvas-arrow.scss +++ b/scss/mixins/_off-canvas-arrow.scss @@ -1,12 +1,12 @@ -@mixin off-canvas-arrow($direction: down, $color: white, $size: 20px) { - border-left: $size - 5 solid transparent; - border-right: $size - 5 solid transparent; +@mixin off-canvas-arrow($direction: down, $color: white) { + border-left: 15px solid transparent; + border-right: 15px solid transparent; @if $direction == 'up' { - border-bottom: $size solid $color; + border-bottom: 20px solid $color; border-top: 0; // if width is not passed, or empty do this } @else { - border-top: $size solid $color; + border-top: 20px solid $color; border-bottom: 0; } } \ No newline at end of file -- 2.17.1