From a120e77ef517d4aa07f53ca5bb5db240a563c597 Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu, 20 Sep 2018 23:30:25 +0200
Subject: [PATCH 1/3] Fix glitch in xfdesktop 4.13 rubberband (Fixes #234)

---
 gtk-3.0/_xfce.scss        | 5 ++++-
 gtk-3.0/gtk-contained.css | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gtk-3.0/_xfce.scss b/gtk-3.0/_xfce.scss
index 754f4c7..caf58d5 100644
--- a/gtk-3.0/_xfce.scss
+++ b/gtk-3.0/_xfce.scss
@@ -150,7 +150,10 @@ XfdesktopIconView.view {
     text-shadow: 0 1px 1px black;
   }
   .label { text-shadow: 1px 1px 2px black; }
-  .rubberband { @extend rubberband; }
+  .rubberband {
+    @extend rubberband;
+    border-radius: 0;
+  }
 }
 
 #XfceNotifyWindow {
diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css
index 53e4e5f..d7eca41 100644
--- a/gtk-3.0/gtk-contained.css
+++ b/gtk-3.0/gtk-contained.css
@@ -4665,6 +4665,8 @@ XfdesktopIconView.view {
     text-shadow: 0 1px 1px black; }
   XfdesktopIconView.view .label {
     text-shadow: 1px 1px 2px black; }
+  XfdesktopIconView.view .rubberband {
+    border-radius: 0; }
 
 #XfceNotifyWindow {
   background-color: shade(#686868, 0.3);

From 0904216995f1108f517b98432000fb70a021932d Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Fri, 9 Nov 2018 01:14:14 +0100
Subject: [PATCH 2/3] Apply xfce4-panel tasklist margin intelligently (Fixes
 #240)

This properly works with xfce4-panel >4.13.3 and was fixed here
https://git.xfce.org/xfce/xfce4-panel/commit/?id=e56e8699e271cea209f5b283421952d9035ad2b5
---
 gtk-3.0/_xfce.scss        | 3 ++-
 gtk-3.0/gtk-contained.css | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gtk-3.0/_xfce.scss b/gtk-3.0/_xfce.scss
index caf58d5..6070ce5 100644
--- a/gtk-3.0/_xfce.scss
+++ b/gtk-3.0/_xfce.scss
@@ -80,7 +80,6 @@ $variant: 'light';
         }
     }
     .tasklist button {
-        margin: 1px;
         border-radius: 3px;
         text-shadow: 0 1px $fg_color;
         color: shade($panel_fg_color, 0.7);
@@ -122,6 +121,8 @@ $variant: 'light';
             padding: 3px;
         }
     }
+    &.horizontal .tasklist button { margin: 0 1px; }
+    &.vertical .tasklist button { margin: 1px 0; }
 }
 
 /* Workspace switcher provided by libwnck */
diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css
index d7eca41..8fdbe41 100644
--- a/gtk-3.0/gtk-contained.css
+++ b/gtk-3.0/gtk-contained.css
@@ -4616,7 +4616,6 @@ read if you used those and something break with a version upgrade you're on your
       border-radius: 0px;
       border-color: shade(#686868, 0.4); }
   .xfce4-panel.background .tasklist button {
-    margin: 1px;
     border-radius: 3px;
     text-shadow: 0 1px #3c3c3c;
     color: shade(#fcfcfc, 0.7);
@@ -4636,6 +4635,10 @@ read if you used those and something break with a version upgrade you're on your
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px rgba(0, 0, 0, 0.2); }
     .xfce4-panel.background .tasklist button image {
       padding: 3px; }
+  .xfce4-panel.background.horizontal .tasklist button {
+    margin: 0 1px; }
+  .xfce4-panel.background.vertical .tasklist button {
+    margin: 1px 0; }
 
 /* Workspace switcher provided by libwnck */
 wnck-pager:selected {

From c60f47498d4c498c08e6a9d08d6077afb1ba1388 Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon, 12 Nov 2018 22:47:53 +0100
Subject: [PATCH 3/3] Handle carets in entry widgets in Xfce panel plugins
 (Fixes #241)

---
 gtk-3.0/_xfce.scss        | 1 +
 gtk-3.0/gtk-contained.css | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/gtk-3.0/_xfce.scss b/gtk-3.0/_xfce.scss
index 6070ce5..b10c3e3 100644
--- a/gtk-3.0/_xfce.scss
+++ b/gtk-3.0/_xfce.scss
@@ -46,6 +46,7 @@ $variant: 'light';
             transition: none;
         }
     }
+    entry { caret-color: $text_color; }
     menu {
         -gtk-icon-effect: none;
 
diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css
index 8fdbe41..e89eb01 100644
--- a/gtk-3.0/gtk-contained.css
+++ b/gtk-3.0/gtk-contained.css
@@ -4576,6 +4576,8 @@ read if you used those and something break with a version upgrade you're on your
       color: #fcfcfc;
       box-shadow: inset 0 -1px alpha(white,0), inset 1px 0 alpha(white,0.15), inset -1px 0 alpha(white,0.15), inset 0 1px alpha(white,0.15);
       transition: none; }
+  .xfce4-panel.background entry {
+    caret-color: #212121; }
   .xfce4-panel.background menu {
     -gtk-icon-effect: none;
     text-shadow: none; }