From 4c5e485f77d69f428240bcf8504b3b520486ea58 Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 3 Jul 2025 01:52:36 +0200
Subject: [PATCH 1/7] add makefile

---
 Makefile               | 21 +++++++++++++++++++++
 gnome-shell/compile.sh |  8 --------
 2 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 Makefile
 delete mode 100755 gnome-shell/compile.sh

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a5a5166
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+SASSC = sassc -t expanded
+
+GTK30_DEPS = gtk-3.0/apps/ gtk-3.0/common/ gtk-3.0/widgets/ common/
+BUILD_DIRS = gnome-shell/ common/ gtk-3.0/
+
+.PHONY: all
+all: gtk-3.0/gtk.css gtk-3.0/gtk-dark.css gnome-shell/gnome-shell.css 
+
+gtk-3.0/gtk.css: gtk-3.0/gtk.scss $(GTK30_DEPS)
+	$(SASSC) $< $@
+
+gtk-3.0/gtk-dark.css: gtk-3.0/gtk-dark.scss $(GTK30_DEPS)
+	$(SASSC) $< $@
+
+gnome-shell/gnome-shell.css: gnome-shell/gnome-shell.scss gnome-shell/assets/
+	$(SASSC) $< $@
+
+# gnome-shell/: gnome-shell/gnome-shell.css
+
+deb-package: debian/ 
+	./build_deb_package.sh
diff --git a/gnome-shell/compile.sh b/gnome-shell/compile.sh
deleted file mode 100755
index 9ca2dd2..0000000
--- a/gnome-shell/compile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-#    -t, --style NAME        Output style. Can be: nested, expanded, compact, compressed.
-
-sassc \
-	--style expanded \
-	gnome-shell.scss \
-	gnome-shell.css
-	# test.css

From de779cc593aef4c0ef5e1924ff5d765ad945b065 Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 3 Jul 2025 01:53:55 +0200
Subject: [PATCH 2/7] fix sassc compile error

Error: It's not clear which file to import for '@import "gtk"'.
       Candidates:
         gtk.scss
         gtk.css
       Please delete or rename all but one of these files.
        on line 1:1 of gtk-3.0/gtk-dark.scss
---
 gtk-3.0/gtk-dark.css  | 19 +++++++++++++++----
 gtk-3.0/gtk-dark.scss |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 8a8b9e1..2afce78 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -24,6 +24,7 @@ headerbar {
   border-radius: 8px 8px 0px 0px;
   padding: 5px;
 }
+
 headerbar separator {
   background-color: rgba(0, 0, 0, 0);
 }
@@ -32,6 +33,7 @@ headerbar separator {
   background-color: #ffffff !important;
   color: #000000;
 }
+
 .titlebar * {
   color: #000000;
 }
@@ -45,10 +47,12 @@ headerbar separator {
   min-width: 18px;
   border-radius: 50%;
 }
+
 .titlebutton:hover {
   background-color: #000000;
   color: #ffffff;
 }
+
 .titlebutton:hover * {
   color: #ffffff;
 }
@@ -63,9 +67,11 @@ switch {
   border-radius: 14px;
   padding: 2px;
 }
+
 switch:hover {
   background-color: unset;
 }
+
 switch > slider {
   background-color: #000000;
   border: 2px solid #000000;
@@ -73,6 +79,7 @@ switch > slider {
   min-width: 18px;
   min-height: 18px;
 }
+
 switch * {
   color: rgba(0, 0, 0, 0);
 }
@@ -104,6 +111,7 @@ popover {
   border: 2px solid #000000;
   border-radius: 5px;
 }
+
 popover contents {
   background-color: #ffffff;
   border: 1px solid #000000;
@@ -149,9 +157,11 @@ button:hover * {
   background-color: #000000;
   color: #ffffff;
 }
+
 .suggested-action * {
   color: #ffffff;
 }
+
 .suggested-action:disabled {
   border: 2px solid #646464;
   background-color: #646464;
@@ -160,12 +170,15 @@ button:hover * {
 buttonbox button {
   border-radius: 0;
 }
+
 buttonbox button:first-child {
   border-radius: 5px 0px 0px 5px;
 }
+
 buttonbox button:last-child {
   border-radius: 0px 5px 5px 0px;
 }
+
 buttonbox button:checked {
   background-color: #000000;
   color: #ffffff;
@@ -226,7 +239,7 @@ scrollbar.vertical slider {
 }
 
 .gtkstyle-fallback {
-  background-color: rgb(255, 255, 255);
+  background-color: white;
   color: #000000;
 }
 
@@ -235,7 +248,7 @@ scrollbar.vertical slider {
 iconview text,
 textview text {
   color: #000000;
-  background-color: rgb(255, 255, 255);
+  background-color: white;
 }
 
 .view text selection {
@@ -368,5 +381,3 @@ viewswitcher button:checked {
 viewswitcher button:checked * {
   color: #ffffff;
 }
-
-/*# sourceMappingURL=gtk-dark.css.map */
diff --git a/gtk-3.0/gtk-dark.scss b/gtk-3.0/gtk-dark.scss
index 4758f3b..6990e7e 100644
--- a/gtk-3.0/gtk-dark.scss
+++ b/gtk-3.0/gtk-dark.scss
@@ -1 +1 @@
-@import "gtk";
\ No newline at end of file
+@import "gtk.scss";
\ No newline at end of file

From 2276b6586a23f0060c583fd57eb73add7c8c7ada Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 3 Jul 2025 01:55:31 +0200
Subject: [PATCH 3/7] add border around check, spin, frame

---
 gtk-3.0/gtk-dark.css | 21 +++++++++++++++++++++
 gtk-3.0/gtk.css      | 40 ++++++++++++++++++++++++++++++++++++----
 gtk-3.0/gtk.scss     | 22 +++++++++++++++++++++-
 3 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 2afce78..4c17e81 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -318,6 +318,23 @@ checkbutton {
   border: none !important;
 }
 
+checkbutton check {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+spinbutton entry {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  padding: 0 5px;
+  text-align: right;
+}
+
+frame {
+  border: 1px solid #777777;
+}
+
 .background {
   background-color: #ffffff;
 }
@@ -358,6 +375,10 @@ checkbutton {
   border-radius: 5px;
 }
 
+menuitem {
+  margin: 5px;
+}
+
 /* app-specific css */
 .frame {
   border: 1px solid #000000;
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 77493ac..4c17e81 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -24,6 +24,7 @@ headerbar {
   border-radius: 8px 8px 0px 0px;
   padding: 5px;
 }
+
 headerbar separator {
   background-color: rgba(0, 0, 0, 0);
 }
@@ -32,6 +33,7 @@ headerbar separator {
   background-color: #ffffff !important;
   color: #000000;
 }
+
 .titlebar * {
   color: #000000;
 }
@@ -45,10 +47,12 @@ headerbar separator {
   min-width: 18px;
   border-radius: 50%;
 }
+
 .titlebutton:hover {
   background-color: #000000;
   color: #ffffff;
 }
+
 .titlebutton:hover * {
   color: #ffffff;
 }
@@ -63,9 +67,11 @@ switch {
   border-radius: 14px;
   padding: 2px;
 }
+
 switch:hover {
   background-color: unset;
 }
+
 switch > slider {
   background-color: #000000;
   border: 2px solid #000000;
@@ -73,6 +79,7 @@ switch > slider {
   min-width: 18px;
   min-height: 18px;
 }
+
 switch * {
   color: rgba(0, 0, 0, 0);
 }
@@ -104,6 +111,7 @@ popover {
   border: 2px solid #000000;
   border-radius: 5px;
 }
+
 popover contents {
   background-color: #ffffff;
   border: 1px solid #000000;
@@ -149,9 +157,11 @@ button:hover * {
   background-color: #000000;
   color: #ffffff;
 }
+
 .suggested-action * {
   color: #ffffff;
 }
+
 .suggested-action:disabled {
   border: 2px solid #646464;
   background-color: #646464;
@@ -160,12 +170,15 @@ button:hover * {
 buttonbox button {
   border-radius: 0;
 }
+
 buttonbox button:first-child {
   border-radius: 5px 0px 0px 5px;
 }
+
 buttonbox button:last-child {
   border-radius: 0px 5px 5px 0px;
 }
+
 buttonbox button:checked {
   background-color: #000000;
   color: #ffffff;
@@ -226,7 +239,7 @@ scrollbar.vertical slider {
 }
 
 .gtkstyle-fallback {
-  background-color: rgb(255, 255, 255);
+  background-color: white;
   color: #000000;
 }
 
@@ -235,7 +248,7 @@ scrollbar.vertical slider {
 iconview text,
 textview text {
   color: #000000;
-  background-color: rgb(255, 255, 255);
+  background-color: white;
 }
 
 .view text selection {
@@ -305,6 +318,23 @@ checkbutton {
   border: none !important;
 }
 
+checkbutton check {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+spinbutton entry {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  padding: 0 5px;
+  text-align: right;
+}
+
+frame {
+  border: 1px solid #777777;
+}
+
 .background {
   background-color: #ffffff;
 }
@@ -345,6 +375,10 @@ checkbutton {
   border-radius: 5px;
 }
 
+menuitem {
+  margin: 5px;
+}
+
 /* app-specific css */
 .frame {
   border: 1px solid #000000;
@@ -368,5 +402,3 @@ viewswitcher button:checked {
 viewswitcher button:checked * {
   color: #ffffff;
 }
-
-/*# sourceMappingURL=gtk.css.map */
diff --git a/gtk-3.0/gtk.scss b/gtk-3.0/gtk.scss
index 3cb6b13..0e6173c 100644
--- a/gtk-3.0/gtk.scss
+++ b/gtk-3.0/gtk.scss
@@ -29,7 +29,6 @@ color: #ffffff;
 }
 
 *{
-
   &::backdrop{
     background-color: unset;
     background-image: unset;
@@ -92,6 +91,23 @@ checkbutton{
   border: none !important;
 }
 
+checkbutton check {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+spinbutton entry {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  padding: 0 5px;
+  text-align: right;
+}
+
+frame {
+  border: 1px solid #777777;
+}
+
 .background{
   background-color: #ffffff;
 }
@@ -132,6 +148,10 @@ checkbutton{
   border-radius: 5px;
 }
 
+menuitem {
+  margin: 5px;
+}
+
 /* app-specific css */
 @import "apps/apps";
 

From 03ec5c2333e62a6dc33dc2badd6324b82b2a667e Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 17 Jul 2025 20:35:49 +0200
Subject: [PATCH 4/7] fix treeview selected item colors

---
 gtk-3.0/gtk.css  | 6 +++---
 gtk-3.0/gtk.scss | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 4c17e81..a0ac333 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -289,18 +289,18 @@ row {
   border: 1px solid #ffffff;
 }
 
-row:hover {
+popover:hover, row:hover {
   background-color: #ffffff;
   color: #000000;
 }
 
-row:selected {
+treeview:selected, row:selected {
   border: 1px solid #000000;
   background-color: #000000;
   color: #ffffff;
 }
 
-row:selected * {
+treeview:selected, row:selected * {
   color: #ffffff;
 }
 
diff --git a/gtk-3.0/gtk.scss b/gtk-3.0/gtk.scss
index 0e6173c..01984a9 100644
--- a/gtk-3.0/gtk.scss
+++ b/gtk-3.0/gtk.scss
@@ -63,18 +63,18 @@ row{
   border: 1px solid #ffffff;
 }
 
-row:hover{
+popover:hover, row:hover{
   background-color: #ffffff;
   color: #000000;
 }
 
-row:selected{
+treeview:selected, row:selected{
   border: 1px solid #000000;
   background-color: #000000;
   color: #ffffff;
 }
 
-row:selected *{
+treeview:selected *, row:selected *{
   color: #ffffff;
 }
 

From aa20c918a2f4f7f29a8cc2723a8539a59fcdbd4e Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 17 Jul 2025 20:58:49 +0200
Subject: [PATCH 5/7] make all css targets PHONY

it's hard to "depend on all files recursively" in make so let's rebuild the css every time for now
---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a5a5166..c92f67d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,18 @@ SASSC = sassc -t expanded
 GTK30_DEPS = gtk-3.0/apps/ gtk-3.0/common/ gtk-3.0/widgets/ common/
 BUILD_DIRS = gnome-shell/ common/ gtk-3.0/
 
-.PHONY: all
+.PHONY: all gtk-3.0/gtk.css gtk-3.0/gtk-dark.css gnome-shell/gnome-shell.css 
 all: gtk-3.0/gtk.css gtk-3.0/gtk-dark.css gnome-shell/gnome-shell.css 
 
-gtk-3.0/gtk.css: gtk-3.0/gtk.scss $(GTK30_DEPS)
+gtk-3.0/gtk.css: gtk-3.0/gtk.scss
 	$(SASSC) $< $@
 
-gtk-3.0/gtk-dark.css: gtk-3.0/gtk-dark.scss $(GTK30_DEPS)
+gtk-3.0/gtk-dark.css: gtk-3.0/gtk-dark.scss
 	$(SASSC) $< $@
 
-gnome-shell/gnome-shell.css: gnome-shell/gnome-shell.scss gnome-shell/assets/
+gnome-shell/gnome-shell.css: gnome-shell/gnome-shell.scss
 	$(SASSC) $< $@
 
-# gnome-shell/: gnome-shell/gnome-shell.css
 
 deb-package: debian/ 
 	./build_deb_package.sh

From 1641204ca07b5de09b0e844abb68cb7030aa56a2 Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 17 Jul 2025 20:59:43 +0200
Subject: [PATCH 6/7] update README on make

---
 README.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d003c07..75cab5c 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,13 @@ Clone to /usr/share/themes
 In general, make sure to first modify the source css (.scss) files, and then
 regenerate the corresponding .css file, e.g.:
 
-	cd gnome-shell
-	sassc \
-		--style expanded \
-		gnome-shell.scss gnome-shell.css
+```
+$ make all
+sassc -t expanded gtk-3.0/gtk.scss gtk-3.0/gtk.css
+sassc -t expanded gtk-3.0/gtk-dark.scss gtk-3.0/gtk-dark.css
+sassc -t expanded gnome-shell/gnome-shell.scss gnome-shell/gnome-shell.css
+```
+
 
 ### Looking Glass
 

From 34ae7ce1b8d9f9ae06433916a7e93ec83d0eec26 Mon Sep 17 00:00:00 2001
From: Patryk Koryzna <patryk@koryzna.com>
Date: Thu, 17 Jul 2025 21:00:26 +0200
Subject: [PATCH 7/7] apply hrdl's patch

https://git.sr.ht/~hrdl/pinenote-dist/blob/main/packages/pneink-theme-git/0001-add-theme-colors.patch
---
 gtk-3.0/common/_colors.scss |  4 ++++
 gtk-3.0/gtk-dark.css        | 10 +++++++---
 gtk-3.0/gtk.css             |  6 +++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gtk-3.0/common/_colors.scss b/gtk-3.0/common/_colors.scss
index 2f4ab17..ae7e566 100644
--- a/gtk-3.0/common/_colors.scss
+++ b/gtk-3.0/common/_colors.scss
@@ -1,3 +1,7 @@
 @define-color text_view_bg #ffffff;
 @define-color theme_text_color #000000;
 
+@define-color theme_fg_color  #000000;
+@define-color theme_bg_color  #ffffff;
+@define-color theme_selected_fg_color #aaaaaa;
+@define-color theme_selected_bg_color #555555;
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 4c17e81..99c6581 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -1,6 +1,10 @@
 /*@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");*/
 @define-color text_view_bg #ffffff;
 @define-color theme_text_color #000000;
+@define-color theme_fg_color  #000000;
+@define-color theme_bg_color  #ffffff;
+@define-color theme_selected_fg_color #aaaaaa;
+@define-color theme_selected_bg_color #555555;
 window {
   background-color: #ffffff;
   color: #000000;
@@ -289,18 +293,18 @@ row {
   border: 1px solid #ffffff;
 }
 
-row:hover {
+popover:hover, row:hover {
   background-color: #ffffff;
   color: #000000;
 }
 
-row:selected {
+treeview:selected, row:selected {
   border: 1px solid #000000;
   background-color: #000000;
   color: #ffffff;
 }
 
-row:selected * {
+treeview:selected *, row:selected * {
   color: #ffffff;
 }
 
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index a0ac333..99c6581 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,6 +1,10 @@
 /*@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");*/
 @define-color text_view_bg #ffffff;
 @define-color theme_text_color #000000;
+@define-color theme_fg_color  #000000;
+@define-color theme_bg_color  #ffffff;
+@define-color theme_selected_fg_color #aaaaaa;
+@define-color theme_selected_bg_color #555555;
 window {
   background-color: #ffffff;
   color: #000000;
@@ -300,7 +304,7 @@ treeview:selected, row:selected {
   color: #ffffff;
 }
 
-treeview:selected, row:selected * {
+treeview:selected *, row:selected * {
   color: #ffffff;
 }