Merge branch 'master' of github.com:horst3180/arc-theme

1 files changed, 16 insertions, 17 deletions

diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index c1788b0..6760dcc 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -8,6 +8,7 @@ $font-family: Futura Bk bt, sans, Sans-Serif;
 $_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
+$_shell_fg_color: white;
 
 stage {
   font-family: $font-family;
@@ -266,7 +267,8 @@ StScrollBar {
 //
 // Popvers/Menus
 //
-.popup-menu {
+.popup-menu,
+%menu {
   color: white;
   min-width: 200px;
   color: $fg_color;
@@ -324,13 +326,9 @@ StScrollBar {
   -arrow-rise: 0;
 }
 
-/*Don't know what this does*/
 .popup-combo-menu {
-  background-color: rgba(0,0,0,0.4);
-  padding: 1em 0em;
-  color: red;
-  border: 1px solid rgba(0,0,0,0.6);
-  border-radius: 3px;
+  @extend %menu;
+  padding: 10px 1px;
 }
 .popup-image-menu-item {}
 
@@ -397,9 +395,10 @@ StScrollBar {
 }
 
 .panel {
+  $_panel_fg_color: $_shell_fg_color;
 
   &-top, &-bottom {
-    color: $selected_fg_color;
+    color: $_panel_fg_color;
     font-size: 1em;
     padding: 0px;
   }
@@ -833,7 +832,7 @@ StScrollBar {
 
   &:highlighted {
     border-color: rgba(0,0,0,0);
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
   }
 }
 
@@ -1186,7 +1185,7 @@ StScrollBar {
   font-weight: bold;
   spacing: 1em;
   padding: 16px;
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   border-image: url("common-assets/misc/osd.svg") 9 9 9 9;
 }
 
@@ -1199,7 +1198,7 @@ StScrollBar {
   min-width: 64px;
   min-height: 64px;
 
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   background: none;
   border: none;
   border-radius: 5px;
@@ -1241,14 +1240,14 @@ StScrollBar {
     padding-left: 8px;
     padding-right: 8px;
     transition-duration: 100;
-    color: transparentize($selected_fg_color, 0.4);
+    color: transparentize($_shell_fg_color, 0.4);
 
-    &:hover {color: $selected_fg_color;}
+    &:hover {color: $_shell_fg_color;}
 
     &:active,
     &:checked,
     &:focus {
-      color: $selected_fg_color;
+      color: $_shell_fg_color;
 
       .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
 
@@ -1485,7 +1484,7 @@ StScrollBar {
   &-box {
     padding-left: 3px;
     padding-right: 3px;
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
     text-shadow: none;
     transition-duration: 100;
 
@@ -1497,7 +1496,7 @@ StScrollBar {
 
   &-label {
     font-weight: bold;
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
 
     &:hover, .applet-box:hover > & {
       color: $selected_fg_color;
@@ -1506,7 +1505,7 @@ StScrollBar {
   }
 
   &-icon {
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
     icon-size: 22px;
 
     &:hover, .applet-box:hover > & {