Merge branch 'master' into dark_variant

2 files changed, 16 insertions, 11 deletions

diff --git a/common/gnome-shell/3.16/_common.scss b/common/gnome-shell/3.16/_common.scss
index 08a711c..9b17c8d 100644
--- a/common/gnome-shell/3.16/_common.scss
+++ b/common/gnome-shell/3.16/_common.scss
@@ -1130,11 +1130,22 @@ StScrollBar {
 }
 
 .message {
-  @include button(normal);
   padding: 4px;
+  color: $fg_color;
+  background-color: $button_bg;
+  border: 1px solid $button_border;
+
+  &:hover, &:focus {
+    color: $fg_color;
+    background-color: $button_bg;
+    border: 1px solid $selected_bg_color;
+  }
 
-  &:hover, &:focus { @include button(hover); }
-  &:active { @include button(active); }
+  &:active {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    border: 1px solid $selected_bg_color;
+  }
 }
 
 .message-icon-bin {
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index 8b46878..56a6c47 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -875,21 +875,15 @@ StScrollBar {
   background-color: #5294E2; }
 
 .message {
-  text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  padding: 4px;
   color: #5c616c;
   background-color: #fcfdfd;
-  border: 1px solid #cfd6e6;
-  padding: 4px; }
+  border: 1px solid #cfd6e6; }
   .message:hover, .message:focus {
-    text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fcfdfd;
     border: 1px solid #5294E2; }
   .message:active {
-    text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #ffffff;
     background-color: #5294E2;
     border: 1px solid #5294E2; }