From f5dfb4a4f412a298f38f2a5373dbc6d42879f759 Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 17 Oct 2016 18:22:30 +0200
Subject: [PATCH 1/5] Remove stray closing brace.

---
 gtk-3.0/applications.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gtk-3.0/applications.css b/gtk-3.0/applications.css
index c66350c7..eff57c3f 100644
--- a/gtk-3.0/applications.css
+++ b/gtk-3.0/applications.css
@@ -18,8 +18,6 @@
 	border-image: none;
 }
 
-}
-
 /*******************
  * gnome-documents *
  *******************/

From e705071be9043653784c5e94adb052f60888d013 Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 17 Oct 2016 18:23:27 +0200
Subject: [PATCH 2/5] Fix font definitions.

---
 gtk-3.0/gtk-widgets.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 4a107b0c..5f5b0575 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1591,7 +1591,7 @@ treemenu menuitem {
 
 menu,
 .menu {
-	font: normal;
+	font-weight: normal;
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
 	padding: 1px;
@@ -1973,7 +1973,7 @@ placessidebar .view {
 
 assistant .sidebar highlight {
 	color: @theme_fg_color;
-	font: bold;
+	font-weight: bold;
 }
 
 assistant .sidebar {
@@ -2523,7 +2523,7 @@ infobar:last-child,
 }
 
 .titlebar .title {
-	font: Bold;
+	font-weight: bold;
 }
 
 /*.titlebar :first-child {*/

From df4f5bf3a35423eff1d8f8f84edad05e931b0ef7 Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 17 Oct 2016 18:23:55 +0200
Subject: [PATCH 3/5] Fix menus.

---
 gtk-3.0/gtk-widgets.css | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 5f5b0575..d85729d3 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1594,7 +1594,7 @@ menu,
 	font-weight: normal;
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
-	padding: 1px;
+	padding: 0px;
 	border-style: solid;
 	border-width: 1px;
 	border-color: @menu_border_color;
@@ -1630,7 +1630,7 @@ menu button:disabled,
 menubar,
 .menubar {
 	border-style: none;
-	padding: 4px;
+	padding: 0px;
 	-GtkWidget-window-dragging: true;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -2539,8 +2539,13 @@ decoration {
 	box-shadow: none;
 }
 
-window decoration {
-	border: solid 2px @insensitive_border_color;
+window.background decoration {
+    border: solid 2px @insensitive_border_color;
+}
+
+combobox window.background decoration,
+menuitem window.background decoration {
+    border: none 0 transparent;
 }
 
 tooltip.csd decoration {

From c8c605e7bd97f04b204fb2ebcf360a68d4b93ff1 Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 17 Oct 2016 18:24:22 +0200
Subject: [PATCH 4/5] Make comboboxes look nicer.

---
 gtk-3.0/gtk-widgets.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index d85729d3..02261eb9 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1154,6 +1154,11 @@ combobox arrow {
 	min-height: 16px;
 	min-width: 16px;
 }
+
+combobox arrow:disabled {
+	background-color: transparent;
+}
+
 combobox entry.combo,
 combobox button.combo {
 	padding: 5px 5px 5px 5px;
@@ -1206,7 +1211,7 @@ combobox > .linked > button.combo:focus:hover:last-child,
 combobox > .linked > button.combo:disabled:last-child {
 	border-image-width: 3px 3px 4px 0;
 	border-radius: 0 3px 3px 0;
-	border-width: 0;
+	border-width: 0 1;
 }
 combobox > .linked > entry.combo:only-child,
 combobox > .linked > button.combo:only-child,

From e41be36dae630028437fbcba3ab6b4d458e83490 Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 17 Oct 2016 18:25:07 +0200
Subject: [PATCH 5/5] Remove strange padding from horisontal stack switchers.

---
 gtk-3.0/gtk-widgets.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 02261eb9..756bdf96 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -2582,7 +2582,6 @@ headerbar {
 
 headerbar.titlebar > stackswitcher.linked.stack-switcher > button,
 headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover {
-	padding: 6px 12px;
 	border-width: 1px 1px 1px 0px;
 }