[gtk+/gtk-3-22] Adwaita: sass cleanup

[Lapo Calamandrei <lapo src gnome org>]

commit 38056d0f6e3a1db222d3bd85fbab3bd08622cb8a
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Oct 18 13:16:07 2016 +0200

    Adwaita: sass cleanup
    
    aggregate circular button style to the main button structure.

 gtk/theme/Adwaita/_common.scss           |   14 +++++++-------
 gtk/theme/Adwaita/gtk-contained-dark.css |   11 +++++------
 gtk/theme/Adwaita/gtk-contained.css      |   11 +++++------
 3 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 010b23d..49d5ef4 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -764,6 +764,13 @@ button {
   .linked.vertical > &:active,
   .linked.vertical > &:checked,
   .linked.vertical > &:backdrop { @extend %linked_vertical; }
+
+  &.circular { // The Bloody Circul Button
+    border-radius: 9999px;
+    -gtk-outline-radius: 9999px;
+
+    label { padding: 0; }
+  }
 }
 
 %needs_attention {
@@ -4242,13 +4249,6 @@ cursor-handle {
 
 .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview
 
-button.circular { // FIXME: aggregate to buttons
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px;
-
-  label { padding: 0; }
-}
-
 // shortcut window keys
 .keycap {
   min-width: 20px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 1ff6188..e34b0ec 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1153,6 +1153,11 @@ button:backdrop {
 .primary-toolbar
 button {
   -gtk-icon-shadow: none; }
+button.circular {
+  border-radius: 9999px;
+  -gtk-outline-radius: 9999px; }
+  button.circular label {
+    padding: 0; }
 
 .stack-switcher >
 button.needs-attention > label,
@@ -4508,12 +4513,6 @@ cursor-handle {
 .context-menu {
   font: initial; }
 
-button.circular {
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px; }
-  button.circular label {
-    padding: 0; }
-
 .keycap {
   min-width: 20px;
   min-height: 25px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 38f6698..0f181e1 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1156,6 +1156,11 @@ button:backdrop {
 .primary-toolbar
 button {
   -gtk-icon-shadow: none; }
+button.circular {
+  border-radius: 9999px;
+  -gtk-outline-radius: 9999px; }
+  button.circular label {
+    padding: 0; }
 
 .stack-switcher >
 button.needs-attention > label,
@@ -4539,12 +4544,6 @@ cursor-handle {
 .context-menu {
   font: initial; }
 
-button.circular {
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px; }
-  button.circular label {
-    padding: 0; }
-
 .keycap {
   min-width: 20px;
   min-height: 25px;