Fixed vinceliuice#332 Large box around apps if libadwaita overwritten

tcorreabr · Apr 30, 2023 · e3a6ca2 · e3a6ca2
1 parent 49fe704
commit e3a6ca2
Show file tree

Hide file tree

Showing 35 changed files with 794 additions and 802 deletions.
diff --git a/src/_sass/_variables.scss b/src/_sass/_variables.scss
@@ -82,39 +82,39 @@ $transition-shadow: box-shadow $duration $ease-out;
 $shadow-z1:
   0 2px 2px -2px rgba(black, 0.3),
   0 1px 2px -1px rgba(black, 0.24),
-  0 1px 2px -.6px rgba(black, 0.17);
+  0 1px 2px -1px rgba(black, 0.17);
 $shadow-z2:
   0 3px 2px -3px rgba(black, 0.3),
   0 2px 2px -1px rgba(black, 0.24),
-  0 1px (5px * .6) 0 rgba(black, 0.12);
+  0 1px 3px 0 rgba(black, 0.12);
 $shadow-z3:
-  0 3px 2px -2px rgba(black, 0.2),
-  0 3px (4px * .6) 0 rgba(black, 0.14),
-  0 1px (8px * .6) 0 rgba(black, 0.12);
+  0 3px 3px -2px rgba(black, 0.2),
+  0 3px 3px 0 rgba(black, 0.14),
+  0 1px 5px 0 rgba(black, 0.12);
 $shadow-z4:
-  0 2px (4px * .6) -1px rgba(black, 0.2),
-  0 4px (5px * .6) 0 rgba(black, 0.14),
-  0 1px (10px * .6) 0 rgba(black, 0.12);
+  0 2px 2px -1px rgba(black, 0.2),
+  0 4px 4px 0 rgba(black, 0.14),
+  0 1px 6px 0 rgba(black, 0.12);
 $shadow-z6:
-  0 3px (5px * .6) -1px rgba(black, 0.2),
-  0 6px (10px * .6) 0 rgba(black, 0.14),
-  0 1px (18px * .6) 0 rgba(black, 0.12);
+  0 3px 3px -1px rgba(black, 0.2),
+  0 6px 6px 0 rgba(black, 0.14),
+  0 1px 11px 0 rgba(black, 0.12);
 $shadow-z8:
-  0 5px (5px * .6) -3px rgba(black, 0.2),
-  0 8px (10px * .6) 1px rgba(black, 0.14),
-  0 3px (14px * .6) 2px rgba(black, 0.12);
+  0 5px 5px -3px rgba(black, 0.2),
+  0 8px 8px 1px rgba(black, 0.14),
+  0 3px 9px 2px rgba(black, 0.12);
 $shadow-z12:
-  0 7px (8px * .6) -4px rgba(black, 0.2),
-  0 12px (17px * .6) 2px rgba(black, 0.14),
-  0 5px (22px * .6) 4px rgba(black, 0.12);
+  0 7px 7px -4px rgba(black, 0.2),
+  0 12px 12px 2px rgba(black, 0.14),
+  0 5px 13px 4px rgba(black, 0.12);
 $shadow-z16:
-  0 8px (10px * .6) -5px rgba(black, 0.2),
-  0 16px (24px * .6) 2px rgba(black, 0.14),
-  0 6px (30px * .6) 5px rgba(black, 0.12);
+  0 8px 6px -5px rgba(black, 0.2),
+  0 16px 16px 2px rgba(black, 0.14),
+  0 6px 18px 5px rgba(black, 0.12);
 $shadow-z24:
-  0 11px (15px * .6) -7px rgba(black, 0.2),
-  0 24px (38px * .6) 3px rgba(black, 0.14),
-  0 9px (46px * .6) 8px rgba(black, 0.12);
+  0 11px 11px -7px rgba(black, 0.2),
+  0 24px 24px 3px rgba(black, 0.14),
+  0 9px 28px 8px rgba(black, 0.12);
 
 $text-shadow:
   0 1px 1px rgba(black, 0.2),
@@ -125,11 +125,11 @@ $text-shadow:
 $icon-shadow-z2:
   0 1px 1px rgba(black, 0.2),
   0 2px 2px rgba(black, 0.14),
-  0 1px (5px * .6) rgba(black, 0.12);
+  0 1px 3px rgba(black, 0.12);
 $icon-shadow-z4:
   0 2px 2px rgba(black, 0.2),
-  0 4px (5px * .6) rgba(black, 0.14),
-  0 1px (10px * .6) rgba(black, 0.12);
+  0 4px 4px rgba(black, 0.14),
+  0 1px 6px rgba(black, 0.12);
 
 // workaround for Gnome-shell
 $shell-shadow-z1: 0 1px 2px rgba(black, 0.25);

diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
@@ -3800,7 +3800,7 @@ colorchooser .popover.osd {
  **********************/
 decoration {
   border-radius: $window-radius;
-  box-shadow: $shadow-z16, 0 16px (24px * .6) 2px transparent, 0 6px (30px * .6) 5px transparent;
+  box-shadow: $shadow-z16, 0 16px 16px 2px transparent, 0 6px 18px 5px transparent;
   border: none;
 
   // FIXME rationalize shadows
@@ -3813,7 +3813,7 @@ decoration {
     // change when we go to backdrop, to prevent jumping windows.
     // The biggest shadow should be in the same order then in the active state
     // or the jumping will happen during the transition.
-    box-shadow: $shadow-z4, 0 16px (24px * .6) 2px transparent, 0 6px (30px * .6) 5px transparent;
+    box-shadow: $shadow-z4, 0 16px 16px 2px transparent, 0 6px 18px 5px transparent;
     transition: $transition-shadow;
   }
 

diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
@@ -4267,8 +4267,7 @@ window {
     padding: 0;
     margin: 0;
     border-radius: $window-radius;
-    box-shadow: $shadow-z16,
-                0 0 0 100px transparent,
+    box-shadow: $shadow-z16, 0 16px 16px 2px transparent, 0 6px 18px 5px transparent,
                 inset 0 1px highlight($titlebar);
 
     @if $topbar == 'dark' {
@@ -4288,8 +4287,7 @@ window {
       // The biggest shadow should be in the same order then in the active state
       // or the jumping will happen during the transition.
       transition: $transition-shadow;
-      box-shadow: $shadow-z4,
-                  0 0 0 100px transparent,
+      box-shadow: $shadow-z4, 0 16px 16px 2px transparent, 0 6px 18px 5px transparent,
                   inset 0 1px highlight($titlebar);
 
       @if $topbar == 'dark' {
@@ -4307,16 +4305,10 @@ window {
     &.messagedialog {
       background-color: $surface;
       background-image: none;
-      box-shadow: $shadow-z16,
-                  0 0 0 100px transparent,
-                  inset 0 1px highlight($titlebar);
 
       &:backdrop {
         background-color: $background;
         background-image: none;
-        box-shadow: $shadow-z4,
-                    0 0 0 100px transparent,
-                    inset 0 1px highlight($titlebar);
       }
     }
 

diff --git a/src/cinnamon/cinnamon-Compact.css b/src/cinnamon/cinnamon-Compact.css
@@ -296,7 +296,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 52, 52, 0.9);
   color: white;
   margin: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.2), 0 4px 4px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
   font-size: 1em;
   font-weight: normal;
   text-align: center;
@@ -621,15 +621,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
 }
 
-.window-caption#selected {
+#selected.window-caption {
   background-color: #1A73E8;
   color: white;
   border: 1px solid #1A73E8;
   spacing: 25px;
 }
 
 .expo-workspaces-name-entry,
-.expo-workspaces-name-entry#selected {
+#selected.expo-workspaces-name-entry {
   height: 15px;
   border-radius: 10px;
   font-size: 9pt;
@@ -641,7 +641,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .expo-workspaces-name-entry:focus,
-.expo-workspaces-name-entry#selected:focus {
+#selected.expo-workspaces-name-entry:focus {
   border: 1px solid #1A73E8;
   background-color: #1A73E8;
   color: white;
@@ -657,7 +657,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 10px;
 }
 
-.expo-workspace-thumbnail-frame#active {
+#active.expo-workspace-thumbnail-frame {
   border: 4px solid #1A73E8;
   background-color: black;
   border-radius: 10px;

diff --git a/src/cinnamon/cinnamon-Dark-Compact.css b/src/cinnamon/cinnamon-Dark-Compact.css
@@ -296,7 +296,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(25, 25, 25, 0.9);
   color: white;
   margin: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.2), 0 4px 4px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
   font-size: 1em;
   font-weight: normal;
   text-align: center;
@@ -621,15 +621,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
 }
 
-.window-caption#selected {
+#selected.window-caption {
   background-color: #3281EA;
   color: white;
   border: 1px solid #3281EA;
   spacing: 25px;
 }
 
 .expo-workspaces-name-entry,
-.expo-workspaces-name-entry#selected {
+#selected.expo-workspaces-name-entry {
   height: 15px;
   border-radius: 10px;
   font-size: 9pt;
@@ -641,7 +641,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .expo-workspaces-name-entry:focus,
-.expo-workspaces-name-entry#selected:focus {
+#selected.expo-workspaces-name-entry:focus {
   border: 1px solid #3281EA;
   background-color: #3281EA;
   color: white;
@@ -657,7 +657,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 10px;
 }
 
-.expo-workspace-thumbnail-frame#active {
+#active.expo-workspace-thumbnail-frame {
   border: 4px solid #3281EA;
   background-color: black;
   border-radius: 10px;

diff --git a/src/cinnamon/cinnamon-Dark.css b/src/cinnamon/cinnamon-Dark.css
@@ -296,7 +296,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(25, 25, 25, 0.9);
   color: white;
   margin: 6px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.2), 0 4px 4px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
   font-size: 1em;
   font-weight: normal;
   text-align: center;
@@ -621,15 +621,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
 }
 
-.window-caption#selected {
+#selected.window-caption {
   background-color: #3281EA;
   color: white;
   border: 1px solid #3281EA;
   spacing: 25px;
 }
 
 .expo-workspaces-name-entry,
-.expo-workspaces-name-entry#selected {
+#selected.expo-workspaces-name-entry {
   height: 15px;
   border-radius: 12px;
   font-size: 9pt;
@@ -641,7 +641,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .expo-workspaces-name-entry:focus,
-.expo-workspaces-name-entry#selected:focus {
+#selected.expo-workspaces-name-entry:focus {
   border: 1px solid #3281EA;
   background-color: #3281EA;
   color: white;
@@ -657,7 +657,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 12px;
 }
 
-.expo-workspace-thumbnail-frame#active {
+#active.expo-workspace-thumbnail-frame {
   border: 4px solid #3281EA;
   background-color: black;
   border-radius: 12px;

diff --git a/src/cinnamon/cinnamon.css b/src/cinnamon/cinnamon.css
@@ -296,7 +296,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 52, 52, 0.9);
   color: white;
   margin: 6px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.2), 0 4px 4px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
   font-size: 1em;
   font-weight: normal;
   text-align: center;
@@ -621,15 +621,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
 }
 
-.window-caption#selected {
+#selected.window-caption {
   background-color: #1A73E8;
   color: white;
   border: 1px solid #1A73E8;
   spacing: 25px;
 }
 
 .expo-workspaces-name-entry,
-.expo-workspaces-name-entry#selected {
+#selected.expo-workspaces-name-entry {
   height: 15px;
   border-radius: 12px;
   font-size: 9pt;
@@ -641,7 +641,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .expo-workspaces-name-entry:focus,
-.expo-workspaces-name-entry#selected:focus {
+#selected.expo-workspaces-name-entry:focus {
   border: 1px solid #1A73E8;
   background-color: #1A73E8;
   color: white;
@@ -657,7 +657,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 12px;
 }
 
-.expo-workspace-thumbnail-frame#active {
+#active.expo-workspace-thumbnail-frame {
   border: 4px solid #1A73E8;
   background-color: black;
   border-radius: 12px;

diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Compact.css b/src/gnome-shell/shell-3-28/gnome-shell-Compact.css
@@ -1026,7 +1026,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-.popup-menu .popup-menu-item:checked.selected {
+.popup-menu .popup-menu-item.selected:checked {
   background-color: rgba(0, 0, 0, 0.2);
   color: rgba(0, 0, 0, 0.85);
 }
@@ -1036,7 +1036,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(0, 0, 0, 0.75);
 }
 
-.popup-menu .popup-menu-item:checked.selected:active {
+.popup-menu .popup-menu-item.selected:checked:active {
   background-color: rgba(0, 0, 0, 0.15);
   color: rgba(0, 0, 0, 0.75);
 }

diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css
@@ -1026,7 +1026,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-.popup-menu .popup-menu-item:checked.selected {
+.popup-menu .popup-menu-item.selected:checked {
   background-color: #e5e5e5;
   color: rgba(0, 0, 0, 0.85);
 }
@@ -1036,7 +1036,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(0, 0, 0, 0.75);
 }
 
-.popup-menu .popup-menu-item:checked.selected:active {
+.popup-menu .popup-menu-item.selected:checked:active {
   background-color: #e0e0e0;
   color: rgba(0, 0, 0, 0.75);
 }

diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Dark.css b/src/gnome-shell/shell-3-28/gnome-shell-Dark.css
@@ -1026,7 +1026,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-.popup-menu .popup-menu-item:checked.selected {
+.popup-menu .popup-menu-item.selected:checked {
   background-color: #e5e5e5;
   color: rgba(0, 0, 0, 0.85);
 }
@@ -1036,7 +1036,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(0, 0, 0, 0.75);
 }
 
-.popup-menu .popup-menu-item:checked.selected:active {
+.popup-menu .popup-menu-item.selected:checked:active {
   background-color: #e0e0e0;
   color: rgba(0, 0, 0, 0.75);
 }

diff --git a/src/gnome-shell/shell-3-28/gnome-shell.css b/src/gnome-shell/shell-3-28/gnome-shell.css
@@ -1026,7 +1026,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-.popup-menu .popup-menu-item:checked.selected {
+.popup-menu .popup-menu-item.selected:checked {
   background-color: rgba(0, 0, 0, 0.2);
   color: rgba(0, 0, 0, 0.85);
 }
@@ -1036,7 +1036,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(0, 0, 0, 0.75);
 }
 
-.popup-menu .popup-menu-item:checked.selected:active {
+.popup-menu .popup-menu-item.selected:checked:active {
   background-color: rgba(0, 0, 0, 0.15);
   color: rgba(0, 0, 0, 0.75);
 }