Some fixes from upstream

lassekongo83 · Oct 9, 2019 · 3b99822 · 3b99822
1 parent 32f6110
commit 3b99822
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/gnome-shell/gnome-shell-high-contrast.css b/gnome-shell/gnome-shell-high-contrast.css
@@ -294,6 +294,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.3); 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; }
 
 /* fallback menu - odd thing for styling App menu when apparently not running under shell. Light Adwaita styled app menu inside the main app window itself rather than the top bar */
@@ -350,7 +354,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .workspace-switcher { background: transparent; border: 0px; border-radius: 0px; padding: 0px; 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: 0; }
+.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: 0; }
 
 .ws-switcher-box { height: 50px; border: 1px solid rgba(238, 238, 236, 0.1); background: transparent; border-radius: 0; }
 

diff --git a/gnome-shell/gnome-shell-sass/_common.scss b/gnome-shell/gnome-shell-sass/_common.scss
@@ -600,6 +600,14 @@ 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; }
@@ -737,7 +745,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/gnome-shell.css b/gnome-shell/gnome-shell.css
@@ -294,6 +294,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(23, 25, 26, 0.3); 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; }
 
 /* fallback menu - odd thing for styling App menu when apparently not running under shell. Light Adwaita styled app menu inside the main app window itself rather than the top bar */
@@ -350,7 +354,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .workspace-switcher { background: transparent; border: 0px; border-radius: 0px; padding: 0px; spacing: 8px; }
 
-.ws-switcher-active-up, .ws-switcher-active-down, .ws-switcher-active-left, .ws-switcher-active-right { height: 50px; background-color: #4a90d9; color: #ffffff; background-size: 32px; border-radius: 0; }
+.ws-switcher-active-up, .ws-switcher-active-down, .ws-switcher-active-left, .ws-switcher-active-right { height: 52px; background-color: #4a90d9; color: #ffffff; background-size: 32px; border-radius: 0; }
 
 .ws-switcher-box { height: 50px; border: 1px solid rgba(238, 238, 236, 0.1); background: transparent; border-radius: 0; }
 

diff --git a/gtk-3.0/_common.scss b/gtk-3.0/_common.scss
@@ -1815,7 +1815,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-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
@@ -675,7 +675,7 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; background-c
 
 menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 2px 8px; border: 1px solid; border-color: transparent; color: #eeeeec; }
 
-.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 { background-color: #4a90d9; color: #ffffff; border-radius: 0px; }
 

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
@@ -685,7 +685,7 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; background-c
 
 menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 2px 8px; border: 1px solid; 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 { background-color: #4a90d9; color: #ffffff; border-radius: 0px; }