summaryrefslogtreecommitdiff
path: root/www/lib/ionic/scss/_mixins.scss
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-10 10:47:35 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-10 10:47:35 -0400
commita29f9a676a6ea3bad56ede05cd1a1c82ffbbe8e9 (patch)
tree7e6e6bfb23390a64344fdfe2272a5da04c2dd97c /www/lib/ionic/scss/_mixins.scss
parent42bc21f7d0b4acfeefa5f4c2708203be78f57778 (diff)
#219 - everything upgraded
Former-commit-id: 15f58d10df83feda8199a1b904433e625ef36b44
Diffstat (limited to 'www/lib/ionic/scss/_mixins.scss')
-rw-r--r--www/lib/ionic/scss/_mixins.scss10
1 files changed, 7 insertions, 3 deletions
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;
+ }
}