From 2a440a05917765db4a558a68b9f77360c2947ad0 Mon Sep 17 00:00:00 2001
From: Adriano Moura <adriano.lols@gmail.com>
Date: Mon, 8 May 2017 16:05:15 -0300
Subject: [PATCH 1/2] fixes .appmenu definitions in a previous commit that have
 messed up the window buttons aligment

---
 Theme/Chicago95/gtk-3.0/gtk-widgets.css | 27 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index edf6d8c..df4d5ab 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -1601,7 +1601,7 @@ window > menu {
     padding: 0px;
 }
 
-.titlebar button:not(.appmenu)  {
+.titlebar button  {
     margin: 0px;
     padding: 0px;
     min-width: 0px;
@@ -1688,17 +1688,13 @@ window.ssd.maximized .titlebar {
  * window buttons *
  ******************/
 
-button.appmenu {
-	padding-bottom: 7px;
-	padding-left: 5px;
-	padding-right: 5px;
-	padding-top: 4px;
-}
 
 /* Makes the raised 2px effect slimmer on the top and left side */
-button.titlebutton:not(.appmenu) {
+button.titlebutton {
     padding: 0px;
     margin: 0px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     border-top: 0px;
     border-left: 0px;
     background-position: center;
@@ -1776,7 +1772,20 @@ button.titlebutton:checked:not(.appmenu) {
     margin-left: -6px;
 }
 
-
+/* putting :not(.appmenu) in button.titlemenu breaks the main window buttons position,
+ * so restore any damage made to buttons styled with both .appmenu and .titlemenu here */
+button.appmenu {
+    border: solid 1px;
+    border-color: @bg_color @bg_dark @bg_dark @bg_color;
+    margin-top: 1px;
+    margin-left: 3px;
+    margin-right: 1px;
+    margin-bottom: 0px;
+	padding-bottom: 7px;
+	padding-left: 5px;
+	padding-right: 5px;
+	padding-top: 4px;
+}
 
 /* declaration of .view was causing problems with white background rubberband in nautilus, putting this here for now */
 flowbox rubberband, treeview.view rubberband, .content-view rubberband,

From 5f6629e01e9fc0a9e34c0054cd02d8602ff3fa4f Mon Sep 17 00:00:00 2001
From: Adriano Moura <adriano.lols@gmail.com>
Date: Mon, 8 May 2017 16:06:01 -0300
Subject: [PATCH 2/2] Assorted styling canges.

---
 Theme/Chicago95/gtk-3.0/gtk-widgets.css | 45 +++++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index df4d5ab..8c7e42d 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -116,7 +116,7 @@ slider, .slider {
 
 frame {
     background-color: transparent;
-    padding: 1px;
+    padding: 3px;
 }
 .frame {
     background-color: transparent;
@@ -239,6 +239,8 @@ button:selected, button:active,
 check, radio,
 scrolledwindow.frame,
 scrolledwindow:not(.frame) > viewport,
+/*stack.view > box,
+.nautilus-list-view,*/
 notebook:not(.frame) > stack > box {
     border-style: solid;
     border-width: 1px;
@@ -255,7 +257,7 @@ button.flat:hover:not(:active):not(:checked):not(:selected),
 toolbar button,
 toolbar button:hover:not(:active):not(:checked):not(:selected),
 menubar,
-toolbar,
+toolbar:not(.inline-toolbar),
 stepper {
     border-style: solid;
     border-width: 1px;
@@ -446,7 +448,11 @@ viewport,
 viewport list,
 iconview,
 textview,
-view, .view {
+view, .view,
+viewport.frame > frame,
+viewport.frame > box > frame,
+list.tweak-group,
+list.tweak-categories {
     border-width: 0px;
     background-color: @base_color;
     color: @theme_text_color;
@@ -473,7 +479,6 @@ iconview {
     -GdMainIconView-icon-size: 48;
 }
 
-
 /*********************
  * list cell and row *
  *********************/
@@ -484,6 +489,21 @@ row, :not(check):not(radio).row {
     border-style: solid;
     border-color: mix(@fg_color,@base_color,0.7);
 }
+/* remove :not(.frame) for less elements separated with horizontla lines */
+viewport:not(.frame) list row {
+    border-bottom: 0px;
+    padding: 0px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    margin-top: 1px;
+    margin-bottom: 1px;
+}
+
+list > row label,
+list > row image {
+    padding-left: 4px;
+    padding-right: 3px;
+}
 
 cell:selected,
 cell:selected:focus,
@@ -501,6 +521,11 @@ list > separator {
     min-width: 0px;
 }
 
+/* Exception for gnome-tweak-tool */
+list.tweak-group {
+    padding: 8px;
+}
+
 
 /*********
  * paned *
@@ -801,10 +826,11 @@ scrolledwindow {
     margin: 1px;
 }
 
-/* transmission misteriously resets border-width to zero, cant even force it here
+/* transmission misteriously resets border-width to zero, cant even force it here*/
 scrolledwindow.frame {
-border-width: 1px;
-} */
+    border-width: 1px;
+    padding: 1px;
+}
 
 
 /* nautilus seems to have a special transparent icon canvas, since scrolledwindow is also transparent
@@ -1652,6 +1678,11 @@ headerbar separator {
 	border-style: solid;
 }
 
+headerbar scale {
+    margin-top: 4px;
+    margin-bottom: -6px;
+}
+
 window.csd tooltip {
     border-radius: 0;
     border: 0 none @border_dark;