[gtk+] shortcuts label: Redo the keycap theming

[Matthias Clasen <matthiasc src gnome org>]

commit 62ec4a2415bc463c6b07dbcbf4baa1770f14019f
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 28 07:10:30 2015 -0400

    shortcuts label: Redo the keycap theming
    
    Use a style class directly on the frame. This is easier to reuse.

 gtk/gtkshortcutlabel.c                   |    1 +
 gtk/theme/Adwaita/_common.scss           |    2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css |    2 +-
 gtk/theme/Adwaita/gtk-contained.css      |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c
index 907761c..12f1467 100644
--- a/gtk/gtkshortcutlabel.c
+++ b/gtk/gtkshortcutlabel.c
@@ -175,6 +175,7 @@ display_shortcut (GtkContainer    *self,
         gtk_container_add (self, dim_label ("+"));
 
       frame = gtk_frame_new (NULL);
+      gtk_style_context_add_class (gtk_widget_get_style_context (frame), "keycap");
       gtk_widget_show (frame);
 
       gtk_container_add (self, frame);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a39e8fa..45916e6 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3447,7 +3447,7 @@ shortcutswindow .round .button label {
   padding: 0;
 }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0ef4bd0..89e913d 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4660,7 +4660,7 @@ shortcutswindow .round .titlebar .button.titlebutton label,
 .titlebar shortcutswindow .round .button.titlebutton label {
   padding: 0; }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1fcd53b..c478007 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4833,7 +4833,7 @@ shortcutswindow .round .titlebar .button.titlebutton label,
 .titlebar shortcutswindow .round .button.titlebutton label {
   padding: 0; }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;