Merge branch 'main' into danirabbit/installedpackagerowgrid-readericon

elementary · Jun 20, 2024 · 826aab7 · 826aab7
2 parents 5734095 + f098b10
commit 826aab7
Show file tree

Hide file tree

Showing 191 changed files with 19,315 additions and 18,804 deletions.
diff --git a/data/appcenter.metainfo.xml.in b/data/appcenter.metainfo.xml.in
@@ -82,6 +82,8 @@
       <issues>
         <issue url="https://github.com/elementary/appcenter/issues/366">Cover SPDX licenses</issue>
         <issue url="https://github.com/elementary/appcenter/issues/470">Screenshots are being stretched</issue>
+        <issue url="https://github.com/elementary/appcenter/issues/554">Can't search from an external source while open on an app from search</issue>
+        <issue url="https://github.com/elementary/appcenter/issues/736">Fonts of some categories don't support some diacritics</issue>
         <issue url="https://github.com/elementary/appcenter/issues/1590">When an app installs, the cancel button is not properly highlighted at the right edge</issue>
         <issue url="https://github.com/elementary/appcenter/issues/1940">Weird previous/next buttons behaviour in screenshots carousel</issue>
         <issue url="https://github.com/elementary/appcenter/issues/2035">Only show update info icon when there is info available</issue>

diff --git a/data/styles/Category.scss b/data/styles/Category.scss
@@ -13,8 +13,8 @@
         inset 0 -1px 0 0 rgba(white, 0.15),
         0 3px 2px -1px rgba(black, 0.15),
         0 3px 5px rgba(black, 0.1);
-    font-size: 32px;
-    font-weight: 300;
+    font-size: 2em;
+    font-weight: 600;
     margin: rem(12px);
     padding: rem(12px);
     min-height: 3em;
@@ -28,8 +28,6 @@
             );
         border-color: #{'alpha(#2980d1, 0.8)'};
         color: #fff8ef;
-        font-size: 24px;
-        font-weight: 600;
         text-shadow: 0 1px 0 rgba(black, 0.3);
         -gtk-icon-shadow: 0 1px 0 rgba(black, 0.3);
     }
@@ -43,7 +41,6 @@
             0 0 0 1px rgba(black, 0.15),
             0 3px 2px -1px rgba(black, 0.15),
             0 3px 5px rgba(black, 0.1);
-        font-size: 24px;
     }
 
     &.audio {
@@ -152,8 +149,6 @@
             center center;
         border-color: #{'alpha(@LIME_900, 0.7)'};
         color: #{'alpha(@LIME_900, 0.15)'};
-        font-size: 26px;
-        font-weight: 500;
         text-shadow: 0 1px 2px #{'alpha(@LIME_900, 0.9)'};
 
         label {
@@ -202,7 +197,6 @@
             cover;
         border-color: #{'alpha(@GRAPE_900, 0.7)'};
         color: white;
-        font-family: "Lobster";
         text-shadow: 0 2px 0 #{'alpha(@GRAPE_900, 0.5)'};
     }
 
@@ -230,9 +224,6 @@
             0 3px 2px -1px rgba(black, 0.15),
             0 3px 5px rgba(black, 0.1);
         color: white;
-        font-family: "HVD Bodedo", serif;
-        font-size: 24px;
-        font-weight: 400;
     }
 
     &.finance {
@@ -252,8 +243,6 @@
         color: #{'@SILVER_100'};
         text-shadow: 0 1px 2px #{'alpha(@SLATE_900, 0.5)'};
         -gtk-icon-shadow: 0 1px 2px #{'alpha(@SLATE_900, 0.5)'};
-        font-family: serif;
-        font-size: 28px;
 
         label {
             margin-top: 0.125em;
@@ -276,15 +265,15 @@
             0 2px 6px #{'alpha(@SLATE_900, 0.1)'};
 
         label.pink {
-            font-size: 30px;
+            font-size: 1em;
             text-shadow:
                 0 1px 2px #{'alpha(@BUBBLEGUM_900, 0.2)'},
                 0 2px 6px #{'alpha(@BUBBLEGUM_900, 0.1)'};
             margin-bottom: -12px;
         }
 
         label.blue {
-            font-size: 36px;
+            font-size: 1.5em;
             text-shadow:
                 0 1px 2px #{'alpha(@BLUEBERRY_900, 0.2)'},
                 0 2px 6px #{'alpha(@BLUEBERRY_900, 0.1)'};
@@ -332,7 +321,6 @@
             0 3px 2px -1px rgba(black, 0.15),
             0 3px 5px rgba(black, 0.1);
         color: #fe5498;
-        font-weight: normal;
         text-shadow: 0 1px 3px #{'@bg_color'};
 
         label {
@@ -499,8 +487,6 @@
             0 3px 2px -1px rgba(black, 0.15),
             0 3px 5px rgba(black, 0.1);
         color: #{'@BANANA_300'};
-        font-size: 24px;
-        font-weight: 600;
         text-shadow: 0 1px 2px #{'alpha(@SLATE_900, 0.75)'};
         -gtk-icon-shadow: 0 1px 2px #{'alpha(@SLATE_900, 0.75)'};
     }
@@ -537,7 +523,6 @@
             0 3px 2px -1px rgba(black, 0.15),
             0 3px 5px rgba(black, 0.1);
         color: #{'@ORANGE_500'};
-        font-weight: normal;
     }
 
     &.science {
@@ -556,8 +541,6 @@
             0 3px 2px -1px rgba(black, 0.15),
             0 3px 5px rgba(black, 0.1);
         color: white;
-        font-family: Limelight;
-        font-size: 24px;
         text-shadow: 0 1px 2px rgba(black, 0.3);
         -gtk-icon-shadow: 0 1px 2px rgba(black, 0.3);
     }
@@ -652,6 +635,5 @@
         background-repeat: no-repeat, repeat-y;
         background-size: auto auto, 110% 1em; /* Gtk.CSS bug requiring over 100% width maybe? */
         color: #{'@BLACK_300'};
-        font-size: 24px;
     }
 }
diff --git a/data/styles/HomePage.scss b/data/styles/HomePage.scss
@@ -4,6 +4,27 @@
  */
 
 homepage {
+    headerbar {
+        min-height: rem(32px);
+        padding-bottom: rem(3px);
+        padding-top: rem(3px);
+    }
+
+    .badge {
+        font-size: 0.75em;
+        margin: rem(3px);
+        min-height: rem(14px);
+        min-width: rem(14px);
+
+        &:dir(ltr) {
+            margin-right: 0;
+        }
+
+        &:dir(rtl) {
+            margin-left: 0;
+        }
+    }
+
     .banner {
         border: 1px solid #{'shade(@banner_bg_color, 0.8)'};
         box-shadow:
@@ -12,7 +33,7 @@ homepage {
             inset 0 -1px 0 0 #{'alpha(shade(@banner_bg_color, 1.7), 0.15)'},
             0 3px 2px -1px #{'alpha(shade(@banner_bg_color, 0.5), 0.2)'},
             0 3px 5px #{'alpha(shade(@banner_bg_color, 0.5), 0.15)'};
-        margin: rem(24px);
+        margin: rem(6px) rem(24px);
         padding: rem(64px) rem(24px);
 
         &:hover {

diff --git a/data/styles/MainWindow.scss b/data/styles/MainWindow.scss
@@ -3,53 +3,6 @@
  * SPDX-FileCopyrightText: 2024 elementary, Inc. (https://elementary.io)
  */
 
-.titlebar {
-    min-height: rem(32px);
-    padding-bottom: rem(3px);
-    padding-top: rem(3px);
-}
-
-.badge {
-    font-size: 0.75em;
-    margin: rem(3px);
-    min-height: rem(14px);
-    min-width: rem(14px);
-
-    &:dir(ltr) {
-        margin-right: 0;
-    }
-
-    &:dir(rtl) {
-        margin-left: 0;
-    }
-}
-
 .header > box {
-    background: #{'@base_color'};
     padding: 1rem;
 }
-
-.header + scrolledwindow {
-    overshoot.top {
-        background:
-            linear-gradient(
-                to top,
-                #{'alpha(@accent_color, 0)'} 80%,
-                #{'alpha(@accent_color, 0.25)'} 100%
-            ),
-            linear-gradient(
-                #{'@borders'},
-                rgba(black, 0.05) 1px,
-                rgba(black, 0.0) rem(3px)
-            );
-    }
-
-    undershoot.top {
-        background:
-            linear-gradient(
-                #{'@borders'},
-                rgba(black, 0.05) 1px,
-                rgba(black, 0.0) rem(3px)
-            );
-    }
-}