[gnome-builder] theme: more style cleanup

[Christian Hergert <chergert src gnome org>]

commit cf5bf9c390b325f9d68047d1168e4fa71e356218
Author: Christian Hergert <christian hergert me>
Date:   Mon Sep 14 19:32:04 2015 -0700

    theme: more style cleanup
    
    Pretty annoying to do margin-end for aligning our close buttons. But if
    we get CSS support for that next cycle, we can change this.

 data/theme/Adwaita-shared.css |   24 ++++++++++++++----------
 data/ui/gb-view-stack.ui      |   10 +---------
 2 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/data/theme/Adwaita-shared.css b/data/theme/Adwaita-shared.css
index 347f611..57ec23e 100644
--- a/data/theme/Adwaita-shared.css
+++ b/data/theme/Adwaita-shared.css
@@ -38,21 +38,25 @@ GbViewStack GtkBox.header.notebook {
 GbViewStack:not(.focused) GtkBox.header.notebook {
   background-color: shade (@theme_bg_color, 0.95);
 }
-GbWorkspacePane GtkBox.notebook.header GtkMenuButton,
+GbWorkspacePane GtkBox.notebook.header .button,
 GbViewStack GtkBox.header.notebook .button {
-  padding: none;
-  margin: none;
-  border: none;
-  border-bottom: 1px solid transparent;
-  box-shadow: none;
   background-image: none;
+  border-bottom: 1px solid transparent;
   border-radius: 0px;
+  border: none;
+  box-shadow: none;
+  margin: none;
+  opacity: 0.55;
+  padding: none;
 }
-GbWorkspacePane GtkBox.notebook.header GtkBox GtkMenuButton:checked,
-GbWorkspacePane GtkBox.notebook.header GtkBox GtkMenuButton:hover,
-GbViewStack GtkBox.header.notebook .button:checked,
-GbViewStack GtkBox.header.notebook .button:hover {
+GbWorkspacePane GtkBox.notebook.header GtkBox .button:checked,
+GbViewStack GtkBox.header.notebook .button:checked {
   box-shadow: 0px 2px 0px @theme_fg_color;
+  color: @theme_fg_color;
+}
+GbWorkspacePane GtkBox.notebook.header GtkBox .button:hover:not(:checked),
+GbViewStack GtkBox.header.notebook .button:hover:not(:checked) {
+  box-shadow: 0px 2px 0px mix(@theme_fg_color, @theme_bg_color,0.25);
 }
 
 
diff --git a/data/ui/gb-view-stack.ui b/data/ui/gb-view-stack.ui
index 5a2f0fb..3ac65d4 100644
--- a/data/ui/gb-view-stack.ui
+++ b/data/ui/gb-view-stack.ui
@@ -19,7 +19,7 @@
                 <property name="orientation">horizontal</property>
                 <property name="visible">true</property>
                 <property name="margin-bottom">3</property>
-                <property name="margin-end">9</property>
+                <property name="margin-end">7</property>
                 <property name="margin-start">6</property>
                 <property name="margin-top">3</property>
                 <child>
@@ -32,7 +32,6 @@
                         <property name="action-name">view-stack.go-backward</property>
                         <property name="focus-on-click">false</property>
                         <style>
-                          <class name="dim-label"/>
                           <class name="flat"/>
                           <class name="image-button"/>
                         </style>
@@ -50,7 +49,6 @@
                         <property name="action-name">view-stack.go-forward</property>
                         <property name="focus-on-click">false</property>
                         <style>
-                          <class name="dim-label"/>
                           <class name="flat"/>
                           <class name="image-button"/>
                         </style>
@@ -70,7 +68,6 @@
                     <property name="focus-on-click">false</property>
                     <property name="popover">views_popover</property>
                     <style>
-                      <class name="dim-label"/>
                       <class name="image-button"/>
                       <class name="flat"/>
                     </style>
@@ -95,7 +92,6 @@
                     <property name="sensitive">false</property>
                     <property name="visible">true</property>
                     <style>
-                      <class name="dim-label"/>
                       <class name="flat"/>
                       <class name="text-button"/>
                     </style>
@@ -131,9 +127,6 @@
                             <property name="xalign">0.0</property>
                             <property name="valign">baseline</property>
                             <property name="visible">true</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
                           </object>
                           <packing>
                             <property name="pack-type">end</property>
@@ -150,7 +143,6 @@
                     <property name="visible">true</property>
                     <property name="focus-on-click">false</property>
                     <style>
-                      <class name="dim-label"/>
                       <class name="image-button"/>
                       <class name="flat"/>
                       <class name="small-button"/>