BUGfix: headerbar window borders not colored in ssd apps

thekomer · Oct 23, 2022 · 3ae630f · 3ae630f
1 parent 89f97f3
commit 3ae630f
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 14 deletions.
diff --git a/gnome-shell/_common.scss b/gnome-shell/_common.scss
@@ -3,6 +3,7 @@ $corner-radius: 2px;
 
 /* GLOBALS */
 $font-size: 14;
+$base_radius: 0.5em;
 $_bubble_bg_color: $osd_bg_color;
 $_bubble_fg_color: $fg_color;
 $_bubble_borders_color: $fg_color;
@@ -19,7 +20,7 @@ stage {
 /* Buttons */
 .button {
   @include button(normal);
-  border-radius: 0.5em;
+  border-radius: $base_radius;
   border-width: 1px;
   padding: 0.4em 2em; //4px 32px;
   &:focus { @include button(focus); }
@@ -179,8 +180,8 @@ StScrollBar {
 .flashspot { background-color: white; }
 
 .modal-dialog {
-  border: none;
-  border-radius: 2px;
+  border: 1px solid $osd_borders_color;
+  border-radius: $base_radius;
   color: $osd_fg_color;
   background-color: darken($osd_bg_color,5%);
   box-shadow: $depth6;
@@ -245,6 +246,8 @@ StScrollBar {
     &:hover, &:focus {
       background: darken($error_color, 3%);
       color: #fff;
+      font-weight: bold;
+      border: 1px solid $destructive_color;
     }
   }
 }

diff --git a/gnome-shell/gnome-shell.css b/gnome-shell/gnome-shell.css
@@ -97,7 +97,7 @@ stage {
 
 /* Entries */
 StEntry {
-  background-color: #1b2139;
+  background-color: #1a1f35;
   border-color: rgba(255, 255, 255, 0.05);
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
   border-radius: 1em;
@@ -219,8 +219,8 @@ StScrollBar {
   background-color: white; }
 
 .modal-dialog {
-  border: none;
-  border-radius: 2px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  border-radius: 0.5em;
   color: #fefefe;
   background-color: rgba(0, 0, 0, 0.8);
   box-shadow: 0 2px 4px 2px rgba(0, 0, 0, 0.2); }
@@ -276,7 +276,9 @@ StScrollBar {
     color: #fff; }
     .end-session-dialog .modal-dialog-linked-button:last-child:hover, .end-session-dialog .modal-dialog-linked-button:last-child:focus {
       background: #d60000;
-      color: #fff; }
+      color: #fff;
+      font-weight: bold;
+      border: 1px solid #9b1b32; }
 
 .end-session-dialog-list {
   padding-top: 20px; }

diff --git a/gnome-shell/v40/gnome-shell.css b/gnome-shell/v40/gnome-shell.css
@@ -94,7 +94,7 @@ stage {
 
 /* Entries */
 StEntry {
-  background-color: #1b2139;
+  background-color: #1a1f35;
   border-color: rgba(255, 255, 255, 0.05);
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
   border-radius: 6px;

diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
@@ -329,7 +329,7 @@ assistant .sidebar label.highlight {
 .csd popover.background.osd, popover.background.osd, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .osd .scale-popup, .app-notification,
 .app-notification.frame, .osd {
   color: #fefefe;
-  border: none;
+  border: 1px solid rgba(255, 255, 255, 0.1);
   background-color: rgba(6, 8, 13, 0.8);
   background-clip: padding-box;
   outline-color: rgba(254, 254, 254, 0.3);
@@ -2514,7 +2514,14 @@ headerbar {
   min-height: 34px;
   background: #06080d;
   color: #BFC3CD;
-  border-radius: 12px; }
+  border-top: 1px solid #512509;
+  border-left: 1px solid #512509;
+  border-right: 1px solid #512509;
+  border-radius: 12px 12px 0 0; }
+  .titlebar headerbar, .titlebar:not(headerbar) headerbar,
+  headerbar headerbar {
+    border-left: none;
+    border-right: none; }
   .titlebar:backdrop, progressbar:backdrop progress.titlebar, progressbar:backdrop trough.titlebar, label:backdrop selection.titlebar,
   headerbar:backdrop {
     border-color: rgba(59, 62, 71, 0.145);

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
@@ -329,7 +329,7 @@ assistant .sidebar label.highlight {
 .csd popover.background.osd, popover.background.osd, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .osd .scale-popup, .app-notification,
 .app-notification.frame, .osd {
   color: #fefefe;
-  border: none;
+  border: 1px solid rgba(255, 255, 255, 0.1);
   background-color: rgba(6, 8, 13, 0.8);
   background-clip: padding-box;
   outline-color: rgba(254, 254, 254, 0.3);
@@ -2514,7 +2514,14 @@ headerbar {
   min-height: 34px;
   background: #06080d;
   color: #BFC3CD;
-  border-radius: 12px; }
+  border-top: 1px solid #512509;
+  border-left: 1px solid #512509;
+  border-right: 1px solid #512509;
+  border-radius: 12px 12px 0 0; }
+  .titlebar headerbar, .titlebar:not(headerbar) headerbar,
+  headerbar headerbar {
+    border-left: none;
+    border-right: none; }
   .titlebar:backdrop, progressbar:backdrop progress.titlebar, progressbar:backdrop trough.titlebar, label:backdrop selection.titlebar,
   headerbar:backdrop {
     border-color: rgba(59, 62, 71, 0.145);

diff --git a/gtk-3.0/widgets/_base-states.scss b/gtk-3.0/widgets/_base-states.scss
@@ -159,7 +159,7 @@ assistant {
 
 %osd, .osd {
   color: $osd_fg_color;
-  border: none;
+  border: 1px solid $osd_borders_color;
   background-color: $osd_bg_color;
   background-clip: padding-box;
   outline-color: transparentize($osd_fg_color, 0.7);

diff --git a/gtk-3.0/widgets/_header-bars.scss b/gtk-3.0/widgets/_header-bars.scss
@@ -8,7 +8,15 @@ headerbar {
   min-height: 34px;
   background: $headerbar_color;
   color: $headerbar_fg_color;
-  border-radius: 10px + 2px;
+  border-top: 1px solid $window_border_color;
+  border-left: 1px solid $window_border_color;
+  border-right: 1px solid $window_border_color;
+  border-radius: 10px + 2px 10px + 2px 0 0;
+
+  headerbar { // fix: headerbar splited with border when there are headerbars inside headerbar
+		border-left: none;
+		border-right: none;
+  }
   &:backdrop {
     border-color: $backdrop_borders_color;
    // background-image: none;