From 8583256a5622aece22b4873c4d6276ead2c0e980 Mon Sep 17 00:00:00 2001
From: Sam Hewitt <hewittsamuel@gmail.com>
Date: Thu, 23 Apr 2015 10:48:28 -0400
Subject: [PATCH] Refinements

---
 Paper/gtk-3.0/apps/nautilus.css       |  11 +++
 Paper/gtk-3.0/apps/pantheon.css       |  24 +++++-
 Paper/gtk-3.0/granite-widgets.css     |  12 ++-
 Paper/gtk-3.0/gtk-common.css          |   2 +-
 Paper/gtk-3.0/gtk.css                 |   4 +-
 Paper/gtk-3.0/widgets/entry.css       |  12 ++-
 Paper/gtk-3.0/widgets/header-bar.css  |  45 +++++++----
 Paper/gtk-3.0/widgets/menu-button.css | 107 --------------------------
 Paper/gtk-3.0/widgets/menus.css       |  41 +++++++---
 Paper/gtk-3.0/widgets/notebook.css    |  14 +---
 Paper/gtk-3.0/widgets/titlebar.css    |  26 ++++++-
 11 files changed, 138 insertions(+), 160 deletions(-)

diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css
index ebbe6ec..5cbd3e9 100644
--- a/Paper/gtk-3.0/apps/nautilus.css
+++ b/Paper/gtk-3.0/apps/nautilus.css
@@ -29,6 +29,17 @@ NautilusWindow .titlebar,
 NautilusWindow .header-bar {
     border: none;
     background-color: @nautilus;
+    padding:0;
+    border: none;
+    border-radius: 0;
+    background-color: @header;
+    color: @header_text;
+    box-shadow: none;
+}
+
+NautilusWindow .titlebar {    
+    border-radius: 4px 4px 0 0;
+    box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
 }
 
 NautilusWindow .titlebar:backdrop,
diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css
index ff10834..9fe1ff7 100644
--- a/Paper/gtk-3.0/apps/pantheon.css
+++ b/Paper/gtk-3.0/apps/pantheon.css
@@ -102,14 +102,30 @@ BirdieWidgetsTweetList * {
 /********
 * Files *
 ********/
-.pathbar:focus {
+.pathbar .entry:focus,
+.marlin-pathbar .pathbar .entry:focus {
     padding: 0px;
-    box-shadow: inset 0 -2px 0 0 @header_text;
+    border-radius: 2px;
+    background-color: @base;
+    color: @text;
+    border: 1px solid @selection;
+    box-shadow:inset 0 1px 1px 0 alpha(#000, 0.1);
 }
 
-.pathbar:active {
+.pathbar .entry:active,
+.marlin-pathbar .pathbar .entry:active {
     padding: 0px;
-    box-shadow: inset 0 -2px 0 0 @header_text;
+    border-radius: 2px;
+    background-color: @base;
+    color: @text;
+    border: 1px solid @selection;
+    box-shadow:inset 0 1px 1px 0 alpha(#000, 0.1);
+}
+
+.marlin-pathbar,
+.marlin-pathbar .pathbar .entry .button.raised {
+    background-color: red;
+    color: red;
 }
 
 /********
diff --git a/Paper/gtk-3.0/granite-widgets.css b/Paper/gtk-3.0/granite-widgets.css
index 99e03cd..acb564e 100644
--- a/Paper/gtk-3.0/granite-widgets.css
+++ b/Paper/gtk-3.0/granite-widgets.css
@@ -95,7 +95,7 @@ GraniteWidgetsWelcome .h3 {
  ********/
 
 .panel {
-    background: @panel;
+    background-color: @panel;
     color: @panel_text;
     font-weight: bold;
 }
@@ -117,6 +117,10 @@ GraniteWidgetsWelcome .h3 {
     font-weight: normal;
 }
 
+.panel .menuitem {
+    padding: 2px 4px;
+}
+
 .panel .window-frame.menu.csd,
 .panel .window-frame.popup.csd {
     box-shadow: none;
@@ -126,5 +130,7 @@ GraniteWidgetsWelcome .h3 {
 .panel .menu .window-frame.popup.csd {
     box-shadow: 0 0 0 1px alpha (#000, 0.20),
                 0 10px 20px alpha (#000, 0.19),
-                0 6px 6px alpha (#000, 0.23);
-}
+                0 6px 6px alpha (#000, 0.23),
+                inset 0 1px 0 0 rgba(255,255,255,0.1),
+                inset 0 -3px 3px -4px alpha(#000, 0.4);
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css
index e2f662d..fb3eb46 100644
--- a/Paper/gtk-3.0/gtk-common.css
+++ b/Paper/gtk-3.0/gtk-common.css
@@ -64,7 +64,7 @@
 /* Selected color */
 @define-color selected_background @selection;
 @define-color selected_border shade(@selection, 0.9);
-@define-color selected_foreground alpha(#000, 0.5);
+@define-color selected_foreground shade(@selection, 0.5);
 @define-color selection_foreground @selected_foreground;
 
 /****************
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index ce461c7..7a85db2 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -33,9 +33,7 @@
 @define-color backdrop_header #5A6367; /* Header backdrop color */
 @define-color header_text #fff;/* Header text color */
 @define-color header_text_dark alpha(#000, 0.3);/* Header text color */
-@define-color menu #636E73;/* Menu color */
-@define-color menu_text #dbdee0;/* Menu color */
-@define-color selection #9FB0B9;/* Selection color */
+@define-color selection #dbdee0;/* Selection color */
 @define-color view_background @base;/* View background */
 @define-color inactive_frame @border;/* Inactive frame color */
 @define-color panel_text #dbdee0;/* Panel text color */
diff --git a/Paper/gtk-3.0/widgets/entry.css b/Paper/gtk-3.0/widgets/entry.css
index 0f86398..e34fae1 100644
--- a/Paper/gtk-3.0/widgets/entry.css
+++ b/Paper/gtk-3.0/widgets/entry.css
@@ -28,12 +28,20 @@
     border: 1px solid @border;
 }
 
-.entry:active,
+.entry:active {
+    background-color: @base;
+    color: @text;
+    border: 1px solid @border;
+    box-shadow:inset 0 0 0 1px alpha(#000, 0.05),
+               inset 0 1px 0 0 alpha(#000, 0.02);
+}
+
 .entry:focus {
     background-color: @base;
     color: @text;
     border: 1px solid @selection;
-    box-shadow:inset 0 1px 1px 0 alpha(#000, 0.1);
+    box-shadow:inset 0 0 0 1px alpha(@selection, 0.4),
+               inset 0 1px 0 0 alpha(@selection, 0.1);
 }
 
 .entry:backdrop:active,
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index f20ee31..3f65e45 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -28,8 +28,7 @@
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
-                inset 0 -1px 0 0 rgba(0,0,0,0.1),
-                inset 0 -3px 3px -4px alpha(#000, 0.4);
+                inset 0 -1px 0 0 rgba(0,0,0,0.1);
 }
 
 
@@ -116,7 +115,6 @@
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    outline: none;
     color: @header_text;
 }
 
@@ -132,11 +130,16 @@
     /*background-color: alpha(#000, 0.1);*/
     background-image: none;
     border: none;
-    outline: none;
     color: @header_text;
     box-shadow: inset 0 -2px 0 0 @header_text;
 }
 
+.header-bar .linked:active,
+.header-bar .image-button:active  {    
+    box-shadow: 0 2px 0 0 @header_text;
+}
+
+
 .header-bar .text-button:active {
     font: Bold 10;
 }
@@ -153,9 +156,13 @@
     background-image: none;
     /*background-color: alpha(#000, 0.1);*/
     border: none;
-    outline: none;
     color: @header_text;
-    box-shadow: inset 0 -2px 0 0 @header_text;
+    box-shadow: 0 -2px 0 0 @header_text;
+}
+
+.header-bar .linked:checked,
+.header-bar .image-button:checked  {    
+    box-shadow: 0 2px 0 0 @header_text;
 }
 
 .header-bar .text-button:checked {
@@ -174,11 +181,16 @@
     background-color: transparent;
     background-image: none;
     border: none;
-    outline: none;
     color: @header_text;
     box-shadow: inset 0 -2px 0 0 @header_text;
 }
 
+.header-bar .linked:focus,
+.header-bar .image-button:focus  {    
+    box-shadow: 0 2px 0 0 @header_text;
+}
+
+
 /* Hover Button */
 .header-bar .button:hover,
 .header-bar .text-button:hover,
@@ -191,7 +203,6 @@
     background-color: alpha(#000, 0.1);
     background-image: none;
     border: none;
-    outline: none;
     /*box-shadow: inset 0 -2px 0 0 @header_text;*/
     color: @header_text;
 }
@@ -209,7 +220,6 @@
     background-image: none;
     border: none;
     box-shadow: none;
-    outline: none;
     color: @backdrop_header_text;
 }
 
@@ -246,11 +256,19 @@
     background-color: transparent;
     background-image: none;
     border: none;
-    outline: none;
     color: @backdrop_header_text;
     box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
 }
 
+.header-bar .linked:focus:backdrop,
+.header-bar .image-button:focus:backdrop
+.header-bar .linked:active:backdrop,
+.header-bar .image-button:active:backdrop
+.header-bar .linked:checked:backdrop,
+.header-bar .image-button:checked:backdrop  {    
+    box-shadow: 0 2px 0 0 @backdrop_header_text;
+}
+
 .header-bar .text-button:active:backdrop {
     font: Bold 10;
 }
@@ -267,7 +285,6 @@
     background-image: none;
     border-radius: 0px;
     border: none;
-    outline: none;
     box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
     color: @backdrop_header_text;
 }
@@ -285,7 +302,6 @@
     border-radius: 0px;
     border: none;
     box-shadow: none;
-    outline: none;
     color: @insensitive_header_text;
 }
 
@@ -301,12 +317,10 @@
     background-color: transparent;
     background-image: none;
     border: none;
-    outline: none;
     color: @insensitive_header_text;
 }
 
 
-
 /* Button Images */
 .header-bar .button GtkImage,
 .header-bar .button GtkImage:active,
@@ -415,7 +429,6 @@
     padding: 13px;
     border-radius: 0px;
     border: 1px solid transparent;
-    outline: none;
     box-shadow: none;
 }
 
@@ -424,14 +437,12 @@
     background: none;
     color: @header_text;
     border: none;
-    outline: none;
 }
 
 .header-bar .entry:backdrop {
     background: none;
     color: @backdrop_header_text;
     border: none;
-    outline: none;
 }
 
 .header-bar .entry:selected,
diff --git a/Paper/gtk-3.0/widgets/menu-button.css b/Paper/gtk-3.0/widgets/menu-button.css
index 9973517..f0738d5 100644
--- a/Paper/gtk-3.0/widgets/menu-button.css
+++ b/Paper/gtk-3.0/widgets/menu-button.css
@@ -21,29 +21,15 @@
  ***************/
 
 .menu-button {
-    background-image: none;
-    background-color: @base;
-    border: 1px solid @selection;
 }
 
 .menu-button.separator {
-    border-style: none;
-    color: shade(@foreground, 3.2);
-    -GtkMenuItem-horizontal-padding: 0;
-    -GtkWidget-separator-height: 1;
 }
 
 .menu-button:hover {
-    background-image: none;
-    background-color: @base;
-    color: @foreground;
-    border-style: none;
 }
 
 .menu-button:insensitive {
-    background-color: @base;
-    color: lighter(@internal_element);
-    border-style: none;
 }
 
 .menu-button:hover,
@@ -51,101 +37,8 @@
 .menu-button:active:insensitive,
 .menu-button:insensitive,
 .menu-button {
-    border-width: 0;
-    background-color: shade(@foreground, 1.05);
-    background-image: none;
 }
 
 GtkMenuButton.button:active,
 GtkMenuButton.button.raised:active {
-    color: @foreground;
-}
-/* Images */
-.menu-button .menuitem GtkImage,
-.menu-button .menu .menuitem GtkImage,
-.menu-button .menu .menuitem .menu .menuitem GtkImage {
-    color: @text;
-}
-
-.menu-button .menu .menuitem:active GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:active GtkImage,
-.menu-button .menu .menuitem:hover GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:hover GtkImage,
-.menu-button .menu .menuitem:focus GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:focus GtkImage,
-.menu-button .menuitem:active GtkImage,
-.menu-button .menuitem:focus GtkImage,
-.menu-button .menuitem:hover GtkImage {
-    color: @selected_foreground;
-}
-
-.menu-button .menu .menuitem:backdrop GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:backdrop GtkImage,
-.menu-button .menu .menuitem:active:backdrop GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:active:backdrop GtkImage,
-.menu-button .menu .menuitem:backdrop:hover GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:backdrop:hover GtkImage,
-.menu-button .menuitem:backdrop GtkImage,
-.menu-button .menuitem:backdrop:hover GtkImage,
-.menu-button .menuitem:active:backdrop GtkImage {
-    color: @backdrop_text;
-    -gtk-image-effect: dim;
-}
-
-.menu-button .menu .menuitem:insensitive GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:insensitive GtkImage,
-.menu-button .menuitem:insensitive GtkImage {
-    color: @insensitive_text;
-    -gtk-image-effect: dim;
-}
-
-.menu-button .menu .menuitem:insensitive:backdrop GtkImage,
-.menu-button .menu .menuitem .menu .menuitem:insensitive:backdrop GtkImage,
-.menu-button .menuitem:insensitive:backdrop GtkImage {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-/* Labels */
-.menu-button .menuitem GtkLabel,
-.menu-button .menu .menuitem GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem .menuitem GtkLabel {
-    color: @text;
-}
-
-.menu .menu-button .menuitem:active GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:active GtkLabel,
-.menu-button .menu .menuitem:hover GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:hover GtkLabel,
-.menu-button .menu .menuitem:focus GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:focus GtkLabel,
-.menu-button .menuitem:active GtkLabel,
-.menu-button .menuitem:focus GtkLabel,
-.menu-button .menuitem:hover GtkLabel {
-    color: @selected_foreground;
-}
-
-.menu-button .menu .menuitem:backdrop GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:backdrop GtkLabel,
-.menu-button .menu .menuitem:active:backdrop GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:active:backdrop GtkLabel,
-.menu-button .menu .menuitem:backdrop:hover GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:backdrop:hover GtkLabel,
-.menu-button .menuitem:backdrop GtkLabel,
-.menu-button .menuitem:backdrop:hover GtkLabel,
-.menu-button .menuitem:active:backdrop GtkLabel {
-    color: @backdrop_text;
-}
-
-.menu-button .menu .menuitem:insensitive GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:insensitive GtkLabel,
-.menu-button .menuitem:insensitive GtkLabel {
-    color: @insensitive_text;
-}
-
-.menu-button .menu .menuitem:insensitive:backdrop GtkLabel,
-.menu-button .menu .menuitem .menu .menuitem:insensitive:backdrop GtkLabel,
-.menu-button .menuitem:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css
index c55a41d..ce87f5a 100644
--- a/Paper/gtk-3.0/widgets/menus.css
+++ b/Paper/gtk-3.0/widgets/menus.css
@@ -21,14 +21,20 @@
  ********/
  
 .menu {
-    border-image: none;
-    box-shadow: 0 2px 3px 2px @menu_shadow;
+    box-shadow: 0 2px 3px 2px @menu_shadow,
+                inset 0 1px 0 0 rgba(255,255,255,0.1),
+                inset 0 -3px 3px -4px alpha(#000, 0.4);
 }
 
+.content-view .menu,
+.context-menu,
 .menu,
 .popup {
     padding: 4px 0;
-    background-color: @base;
+    border-radius: 2px;
+    border-image: none;
+    background-color: @background;
+    color: @text;
 }
 
 /*Context Menu*/
@@ -47,16 +53,14 @@
 .content-view .menu .menuitem:active,
 .content-view .menu .menuitem:hover {
     background-color: @selection;
+    color: @text;
 }
 
 /* Menu Item */
 .menuitem,
 .menu .menuitem,
 .popup .menuitem {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    padding-left: 6px;
-    padding-right: 6px;
+    padding: 6px 4px;
     border:none;
 
     -GtkMenuItem-arrow-scaling: 0.5;
@@ -68,19 +72,20 @@
 .menu .menuitem:active,
 .popup .menuitem:active {
     background-color: @selection;
-
+    color: @selection_foreground;
     -gtk-icon-style: symbolic;
 }
 
 /* Hover*/
 .menuitem:hover,
 .menu .menuitem:hover,
-.popup .menuitem:hover{
+.popup .menuitem:hover {
     background-color: @selection;
-
+    color: @selection_foreground;
     -gtk-icon-style: symbolic;
 }
 
+
 .menuitem:backdrop,
 .menu .menuitem:backdrop {
     box-shadow: none;
@@ -90,11 +95,14 @@
 .menuitem:insensitive,
 .menu .menuitem:insensitive {
     box-shadow: none;
+    color: @insensitive_text;
     border: none;
 }
 
 /* Arrows */
 .menu .menuitem.arrow {
+    color: @text;
+    -GtkComboBox-arrow-scaling: 0.5;
 }
 
 .menu .menuitem.arrow {
@@ -109,6 +117,7 @@
     padding-left: 2px;
     padding-right: 2px;
     border: none;
+    color: @border;
     -GtkMenuItem-horizontal-padding: 0;
     -GtkWidget-separator-height: 1;
 }
@@ -140,12 +149,24 @@
 .menuitem GtkLabel {
     padding-left: 2px;
     padding-right: 2px;
+    color: @text;
 }
 
 .menu .menuitem GtkLabel,
 .popup .menuitem GtkLabel {
     padding-left: 6px;
+}
+
+/* Menu Image */
+.menuitem GtkImage {
+    padding-left: 2px;
     padding-right: 2px;
+    color: @text;
+}
+
+.menu .menuitem GtkImage,
+.popup .menuitem GtkImage {
+    padding-left: 6px;
 }
 
 /* Something is utterly broken where I've had to do this ugly bit of styling. */
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index b896b6c..df77f6b 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -211,17 +211,11 @@
 /*----- In-tab padding -----*/
 
 .notebook tab.top {
-    padding: 6px;
-    padding-left: 8px;
-    padding-bottom: 8px;
-    padding-right: 8px;
+    padding: 6px 8px 8px 8px;
 }
 
 .notebook tab.bottom {
-    padding-top: 8px;
-    padding-left: 8px;
-    padding-bottom: 6px;
-    padding-right: 8px;
+    padding: 8px 8px 6px 8px;
 }
 
 .notebook tab.left {
@@ -233,11 +227,11 @@
 }
 
 .notebook tab.top:active {
-    padding: 5px 8px 8px 8px;
+    padding: 8px 8px 6px 8px;
 }
 
 .notebook tab.bottom:active {
-    padding: 8px 8px 5px 8px;
+    padding: 6px 8px 8px 8px;
 }
 
 .notebook tab.left:active {
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index ac55f61..1ea601b 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -27,8 +27,7 @@
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
-                inset 0 -1px 0 0 rgba(0,0,0,0.1),
-                inset 0 -3px 3px -4px alpha(#000, 0.4);
+                inset 0 -1px 0 0 rgba(0,0,0,0.1);
 }
 
 .maximized .titlebar {
@@ -96,7 +95,7 @@
     background-color: transparent;
     background-image: none;
     border: none;
-    padding: 12px 15px;
+    padding: 12px 15px 10px 15px;
 }
 
 /* Normal Button */
@@ -191,6 +190,15 @@
     color: @header_text;
 }
 
+.titlebar .linked:focus,
+.titlebar .image-button:focus
+.titlebar .linked:active,
+.titlebar .image-button:active
+.titlebar .linked:checked,
+.titlebar .image-button:checked  {    
+    box-shadow: 0 2px 0 0 @header_text;
+}
+
 /* Backdrop Button */
 .titlebar .button:backdrop,
 .titlebar .text-button:backdrop,
@@ -246,6 +254,18 @@
     box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
 }
 
+
+.titlebar .titlebutton:focus:backdrop,
+.titlebar .image-button:focus:backdrop
+.titlebar .linked:focus:backdrop,
+.titlebar .image-button:focus:backdrop
+.titlebar .linked:active:backdrop,
+.titlebar .image-button:active:backdrop
+.titlebar .linked:checked:backdrop,
+.titlebar .image-button:checked:backdrop  {    
+    box-shadow: 0 2px 0 0 @backdrop_header_text;
+}
+
 .titlebar .text-button:active:backdrop {
     font: Bold 10;
 }