From a29f9a676a6ea3bad56ede05cd1a1c82ffbbe8e9 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Sun, 10 Apr 2016 10:47:35 -0400 Subject: #219 - everything upgraded Former-commit-id: 15f58d10df83feda8199a1b904433e625ef36b44 --- www/lib/ionic/scss/_mixins.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'www/lib/ionic/scss/_mixins.scss') diff --git a/www/lib/ionic/scss/_mixins.scss b/www/lib/ionic/scss/_mixins.scss index b025ea90..c584a98a 100644 --- a/www/lib/ionic/scss/_mixins.scss +++ b/www/lib/ionic/scss/_mixins.scss @@ -3,7 +3,7 @@ // -------------------------------------------------- @mixin button-style($bg-color, $border-color, $active-bg-color, $active-border-color, $color) { - border-color: $border-color; + border-color: transparent;//$border-color; background-color: $bg-color; color: $color; @@ -14,9 +14,9 @@ } &.active, &.activated { - border-color: $active-border-color; + //border-color: transparent;//$active-border-color; background-color: $active-bg-color; - box-shadow: inset 0 1px 4px rgba(0,0,0,0.1); + //box-shadow: inset 0 1px 4px rgba(0,0,0,0.1); } } @@ -100,6 +100,10 @@ @mixin item-active-style($active-bg-color, $active-border-color) { border-color: $active-border-color; background-color: $active-bg-color; + &.item-complex > .item-content { + border-color: $active-border-color; + background-color: $active-bg-color; + } } -- cgit v1.2.3