optimize gtk buttons styles

hardpixel · Oct 11, 2019 · 48ed336 · 48ed336
1 parent 2226554
commit 48ed336
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 29 deletions.
diff --git a/[email protected]/styles/buttons-left-always.css b/[email protected]/styles/buttons-left-always.css
@@ -1,23 +1,22 @@
-headerbar,
-.titlebar {
+window headerbar,
+window .titlebar {
   padding-left: 0;
 }
 
-.titlebar headerbar ~ headerbar {
+window headerbar ~ headerbar,
+window headerbar ~ .titlebar,
+window .titlebar ~ .titlebar,
+window .titlebar ~ headerbar {
   padding-left: 6px;
 }
 
-.titlebar .titlebar {
-  padding-left: 0;
-}
-
-headerbar > box.left,
-.titlebar > box.left {
+window headerbar > box.left,
+window .titlebar > box.left {
   margin: 0 0 0 -200px;
   opacity: 0;
 }
 
-.titlebar.default-decoration {
+window .titlebar.default-decoration {
   margin: -200px 0 0;
   opacity: 0;
 }
diff --git a/[email protected]/styles/buttons-left-tiled.css b/[email protected]/styles/buttons-left-tiled.css
@@ -3,14 +3,13 @@
   padding-left: 0;
 }
 
-.tiled .titlebar headerbar ~ headerbar {
+.tiled headerbar ~ headerbar,
+.tiled headerbar ~ .titlebar,
+.tiled .titlebar ~ .titlebar,
+.tiled .titlebar ~ headerbar {
   padding-left: 6px;
 }
 
-.tiled .titlebar .titlebar {
-  padding-left: 0;
-}
-
 .tiled headerbar > box.left,
 .tiled .titlebar > box.left {
   margin: 0 0 0 -200px;

diff --git a/[email protected]/styles/buttons-left.css b/[email protected]/styles/buttons-left.css
@@ -3,14 +3,13 @@
   padding-left: 0;
 }
 
-.maximized .titlebar headerbar ~ headerbar {
+.maximized headerbar ~ headerbar,
+.maximized headerbar ~ .titlebar,
+.maximized .titlebar ~ .titlebar,
+.maximized .titlebar ~ headerbar {
   padding-left: 6px;
 }
 
-.maximized .titlebar .titlebar {
-  padding-left: 0;
-}
-
 .maximized headerbar > box.left,
 .maximized .titlebar > box.left {
   margin: 0 0 0 -200px;

diff --git a/[email protected]/styles/buttons-right-always.css b/[email protected]/styles/buttons-right-always.css
@@ -1,15 +1,20 @@
-headerbar,
-.titlebar {
+window > headerbar,
+window > .titlebar,
+window > headerbar > headerbar,
+window > .titlebar > .titlebar,
+window > .titlebar > stack > headerbar,
+window headerbar:last-child,
+window .titlebar:last-child {
   padding-right: 0;
 }
 
-headerbar > box.right,
-.titlebar > box.right {
+window headerbar > box.right,
+window .titlebar > box.right {
   margin: 0 -200px 0 0;
   opacity: 0;
 }
 
-.titlebar.default-decoration {
+window .titlebar.default-decoration {
   margin: -200px 0 0;
   opacity: 0;
 }
diff --git a/[email protected]/styles/buttons-right-tiled.css b/[email protected]/styles/buttons-right-tiled.css
@@ -1,5 +1,10 @@
-.tiled headerbar,
-.tiled .titlebar {
+.tiled > headerbar,
+.tiled > .titlebar,
+.tiled > headerbar > headerbar,
+.tiled > .titlebar > .titlebar,
+.tiled > .titlebar > stack > headerbar,
+.tiled headerbar:last-child,
+.tiled .titlebar:last-child {
   padding-right: 0;
 }
 

diff --git a/[email protected]/styles/buttons-right.css b/[email protected]/styles/buttons-right.css
@@ -1,5 +1,10 @@
-.maximized headerbar,
-.maximized .titlebar {
+.maximized > headerbar,
+.maximized > .titlebar,
+.maximized > headerbar > headerbar,
+.maximized > .titlebar > .titlebar,
+.maximized > .titlebar > stack > headerbar,
+.maximized headerbar:last-child,
+.maximized .titlebar:last-child {
   padding-right: 0;
 }