[gtk+] Adwaita: shortcutswindow fixes

[Lapo Calamandrei <lapo src gnome org>]

commit 4d266400450f681eafc4b28c0adbf035a049da59
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon Feb 15 13:07:37 2016 +0100

    Adwaita: shortcutswindow fixes
    
    use darker text and tweak the keycap vertical centering,
    addresses https://bugzilla.gnome.org/show_bug.cgi?id=761778

 gtk/theme/Adwaita/_common.scss           |    5 +++--
 gtk/theme/Adwaita/gtk-contained-dark.css |    1 +
 gtk/theme/Adwaita/gtk-contained.css      |    5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 23a258b..0903a4e 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3758,11 +3758,12 @@ button.circular { // FIXME: aggregate to buttons
 .keycap {
   min-width: 20px;
   min-height: 25px;
+  margin-top: 2px;
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
 
-  color: if($variant == 'light', $insensitive_fg_color, $fg_color);
+  color: $fg_color;
   background-color: $base_color;
   border: 1px solid;
   border-color: if($variant == 'light', mix($borders_color, $bg_color, 50%), $borders_color);
@@ -3772,7 +3773,7 @@ button.circular { // FIXME: aggregate to buttons
 
   &:backdrop {
     background-color: $backdrop_base_color;
-    color: if($variant == 'light', $backdrop_insensitive_color, $backdrop_fg_color);
+    color: $backdrop_fg_color;
   }
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index a0ae7e2..17e2785 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4456,6 +4456,7 @@ button.circular {
 .keycap {
   min-width: 20px;
   min-height: 25px;
+  margin-top: 2px;
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 21fca0a..b545116 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4598,10 +4598,11 @@ button.circular {
 .keycap {
   min-width: 20px;
   min-height: 25px;
+  margin-top: 2px;
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
-  color: #8b8e8f;
+  color: #2e3436;
   background-color: #ffffff;
   border: 1px solid;
   border-color: #c3c3c0;
@@ -4610,7 +4611,7 @@ button.circular {
   font-size: smaller; }
   .keycap:backdrop {
     background-color: white;
-    color: #c3c3c0; }
+    color: #8b8e8f; }
 
 *:drop(active):focus,
 *:drop(active) {