Some fixes from upstream

lassekongo83 · Oct 9, 2019 · 2c456c6 · 2c456c6
1 parent 4c0d44b
commit 2c456c6
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 10 deletions.
diff --git a/gnome-shell/src/gnome-shell-high-contrast.css b/gnome-shell/src/gnome-shell-high-contrast.css
@@ -272,6 +272,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .popup-separator-menu-item { height: 1px; margin: 6px 0px; background-color: transparent; border-color: rgba(0, 0, 0, 0.2); border-bottom-width: 1px; border-bottom-style: solid; }
 
+.rename-folder-popup .rename-folder-popup-item { spacing: 6px; }
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl { padding: 0, 12px; }
+
 .background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
 
 .lowres-icon { icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
@@ -322,7 +326,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .workspace-switcher { background: transparent; border: 0; border-radius: 0; padding: 0; spacing: 8px; }
 
-.ws-switcher-active-up, .ws-switcher-active-down, .ws-switcher-active-left, .ws-switcher-active-right { height: 50px; background-color: #215d9c; color: #ffffff; background-size: 32px; border-radius: 5px; }
+.ws-switcher-active-up, .ws-switcher-active-down, .ws-switcher-active-left, .ws-switcher-active-right { height: 52px; background-color: #215d9c; color: #ffffff; background-size: 32px; border-radius: 5px; }
 
 .ws-switcher-box { height: 50px; border: 1px solid rgba(238, 238, 236, 0.1); background: transparent; border-radius: 5px; }
 

diff --git a/gnome-shell/src/gnome-shell-sass/_common.scss b/gnome-shell/src/gnome-shell-sass/_common.scss
@@ -583,6 +583,15 @@ StScrollBar {
   border-bottom-style: solid;
 }
 
+// Rename popup
+
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: 6px;
+    &:ltr, &:rtl { padding: 0, 12px; }
+  }
+}
+
 // Background menu
 .background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
 
@@ -714,7 +723,7 @@ StScrollBar {
 
 .ws-switcher-active-up, .ws-switcher-active-down,
 .ws-switcher-active-left, .ws-switcher-active-right {
-  height: 50px;
+  height: 52px;
   background-color: $selected_bg_color;
   color: $selected_fg_color;
   background-size: 32px;

diff --git a/gnome-shell/src/gnome-shell.css b/gnome-shell/src/gnome-shell.css
@@ -272,6 +272,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .popup-separator-menu-item { height: 1px; margin: 6px 0px; background-color: transparent; border-color: rgba(18, 21, 23, 0.2); border-bottom-width: 1px; border-bottom-style: solid; }
 
+.rename-folder-popup .rename-folder-popup-item { spacing: 6px; }
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl { padding: 0, 12px; }
+
 .background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
 
 .lowres-icon { icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
@@ -322,7 +326,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .workspace-switcher { background: transparent; border: 0; border-radius: 0; padding: 0; spacing: 8px; }
 
-.ws-switcher-active-up, .ws-switcher-active-down, .ws-switcher-active-left, .ws-switcher-active-right { height: 50px; background-color: #4a79c7; color: #ffffff; background-size: 32px; border-radius: 5px; }
+.ws-switcher-active-up, .ws-switcher-active-down, .ws-switcher-active-left, .ws-switcher-active-right { height: 52px; background-color: #4a79c7; color: #ffffff; background-size: 32px; border-radius: 5px; }
 
 .ws-switcher-box { height: 50px; border: 1px solid rgba(246, 246, 247, 0.1); background: transparent; border-radius: 5px; }
 

diff --git a/gtk/src/Zukitre/gtk-3.0/_common.scss b/gtk/src/Zukitre/gtk-3.0/_common.scss
@@ -1849,7 +1849,7 @@ menubar,
 
     // remove padding and rounding from menubar submenus
     menu {
-      .csd &, & {
+      &:dir(rtl), &:dir(ltr) { // specificity bump
         border-radius: 0;
         padding: 0;
       }

diff --git a/gtk/src/Zukitre/gtk-3.0/gtk-dark.css b/gtk/src/Zukitre/gtk-3.0/gtk-dark.css
@@ -661,7 +661,7 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; background-c
 
 menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 2px 8px; border: 0; border-color: transparent; color: #f6f6f7; }
 
-.csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; }
+menubar > menuitem menu:dir(rtl), menubar > menuitem menu:dir(ltr), .menubar > menuitem menu:dir(rtl), .menubar > menuitem menu:dir(ltr) { border-radius: 0; padding: 0; }
 
 menubar > menuitem:hover, menubar > menuitem:active, .menubar > menuitem:hover, .menubar > menuitem:active { color: #ffffff; border-radius: 0; background-color: #4a79c7; }
 

diff --git a/gtk/src/Zukitre/gtk-3.0/gtk.css b/gtk/src/Zukitre/gtk-3.0/gtk.css
@@ -669,7 +669,7 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; background-c
 
 menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 2px 8px; border: 0; border-color: transparent; color: #2c2c2c; }
 
-.csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; }
+menubar > menuitem menu:dir(rtl), menubar > menuitem menu:dir(ltr), .menubar > menuitem menu:dir(rtl), .menubar > menuitem menu:dir(ltr) { border-radius: 0; padding: 0; }
 
 menubar > menuitem:hover, menubar > menuitem:active, .menubar > menuitem:hover, .menubar > menuitem:active { color: #ffffff; border-radius: 0; background-color: #4a79c7; }
 

diff --git a/gtk/src/Zukitwo/gtk-3.0/_common.scss b/gtk/src/Zukitwo/gtk-3.0/_common.scss
@@ -1853,7 +1853,7 @@ menubar,
 
     // remove padding and rounding from menubar submenus
     menu {
-      .csd &, & {
+      &:dir(rtl), &:dir(ltr) { // specificity bump
         border-radius: 0;
         padding: 0;
       }
@@ -3368,7 +3368,7 @@ messagedialog { // Message Dialog styling
       border-color: $borders_color;
 
       &:focus {
-        box-shadow: inset 0 0 0 1px $selected_bg_color;
+        box-shadow: inset 0 0 0 1px $selected_bg_color; // FIXME: Fix color on red buttons. https://github.com/lassekongo83/zuki-themes/issues/154
         background-color: $selected_bg_color;
         //color: $selected_fg_color;
       }

diff --git a/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css b/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css
@@ -669,7 +669,7 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; background-c
 
 menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 2px 8px; border: 0; border-color: transparent; color: #f6f6f7; }
 
-.csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; }
+menubar > menuitem menu:dir(rtl), menubar > menuitem menu:dir(ltr), .menubar > menuitem menu:dir(rtl), .menubar > menuitem menu:dir(ltr) { border-radius: 0; padding: 0; }
 
 menubar > menuitem:hover, menubar > menuitem:active, .menubar > menuitem:hover, .menubar > menuitem:active { color: #ffffff; border-radius: 0; background-color: #4a79c7; }
 

diff --git a/gtk/src/Zukitwo/gtk-3.0/gtk.css b/gtk/src/Zukitwo/gtk-3.0/gtk.css
@@ -677,7 +677,7 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; background-c
 
 menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 2px 8px; border: 0; border-color: transparent; color: #2c2c2c; }
 
-.csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; }
+menubar > menuitem menu:dir(rtl), menubar > menuitem menu:dir(ltr), .menubar > menuitem menu:dir(rtl), .menubar > menuitem menu:dir(ltr) { border-radius: 0; padding: 0; }
 
 menubar > menuitem:hover, menubar > menuitem:active, .menubar > menuitem:hover, .menubar > menuitem:active { color: #ffffff; border-radius: 0; background-color: #4a79c7; }