Merged from master

2015-11-25 09:04:11 -08:00
parent 7849803a5d
commit 268a2c2427
64 changed files with 3200 additions and 231 deletions
--- a/platform/commonUI/general/res/sass/controls/_buttons.scss
+++ b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -108,10 +108,7 @@ $pad: $interiorMargin * $baseRatio;

 .s-icon-btn {
    @extend .ui-symbol;
-    color: $colorBtnIcon;
-    &:hover {
-        color: lighten($colorBtnIcon, $ltGamma);
-    }
+    // Color and styling additionally in _controls.scss
 }

 .mini-tab {
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -187,7 +187,8 @@ label.checkbox.custom {
    }
 }

-.context-available {
+.context-available,
+.s-icon-btn {
    $c: $colorKey;
    color: $c;
    &:hover {