Merge branch 'main' into danirabbit/windows-less

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
     types:
       - opened
@@ -21,7 +21,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: |
           apt update

.github/workflows/merge.yml

@@ -2,7 +2,7 @@ name: Gettext Updates
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   build:
@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
     types: [closed]
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Release
         uses: elementary/actions/release@master

po/LINGUAS

@@ -200,3 +200,4 @@ aa
 ab
 gn
 an
+id_ID

po/id_ID.po

@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the extra package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: extra\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-11-15 18:48+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: id_ID\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/stylesheet.appdata.xml.in:8
+msgid "System Stylesheet"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:9
+msgid "The look and feel for elementary OS"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:11
+msgid ""
+"An original Gtk.CSS stylesheet designed specifically for elementary OS and "
+"its desktop environment: Pantheon."
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:19
+msgid "elementary, Inc."
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:26 data/stylesheet.appdata.xml.in:40
+#: data/stylesheet.appdata.xml.in:58
+msgid "Improve support for LibAdwaita widgets:"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:28
+msgid "Adw.TabOverview"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:30
+msgid "GTK 4 Improvements:"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:32
+msgid "Add missing \".default-decoration\" style for compact headerbars"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:33
+msgid "Add Latte palette"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:42
+msgid "Adw.AboutWindow"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:43
+msgid "Adw.MessageDialog"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:45 data/stylesheet.appdata.xml.in:64
+msgid "GTK 4 Fixes:"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:47
+msgid ""
+"Support \".destructive\" and \".suggested\" in addition to \".destructive-"
+"action\" and \".suggested-action\""
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:48
+msgid "\".raised\" overrides \".flat\" in Buttons"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:60
+msgid "Adw.PreferencesWindow"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:61
+msgid "Adw.StatusPage"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:62
+msgid "Adw.TabBar"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:66
+msgid "Correctly style list rows in popover menus"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:67
+msgid "Style headerbars without \".titlebar\""
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:68
+msgid "Style fullscreen windows"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:69
+msgid "Style SearchBars"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:70
+msgid "Add spacing between HeaderBar buttons"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:77
+msgid "Improvements:"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:79
+msgid "Checkerboard styles are more subtle"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:80
+msgid "Set `large-icons` size on headerbars to 24px"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:81
+msgid "Adjust header layout and typography in Granite.SimpleSettingsPage"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:82
+msgid "Infobars: set correct button margins"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:83
+msgid "Add padding to Gtk.Entry's completion popover"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:84
+msgid "Fix labels for scale marks"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:86 data/stylesheet.appdata.xml.in:105
+msgid "Fixes:"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:88
+msgid "Correct .title-4 padding in Lists"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:89
+msgid "Buttons: don't set font weight for children like popovers"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:101
+msgid "New Features:"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:103
+msgid "Support for Gtk4"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:107
+msgid "Fix titlebar in GNOME Web 42"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:108
+msgid "Fix font style for bold labels in some languages"
+msgstr ""
+
+#: data/stylesheet.appdata.xml.in:109
+msgid "ModelButtons: add margin between checks, radios, and labels"
+msgstr ""

po/ka.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-11-15 18:48+0000\n"
-"PO-Revision-Date: 2023-07-15 16:09+0000\n"
+"PO-Revision-Date: 2024-02-05 16:11+0000\n"
 "Last-Translator: NorwayFun <[email protected]>\n"
 "Language-Team: Georgian <https://l10n.elementary.io/projects/desktop/"
 "stylesheet-extra/ka/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.0.2\n"
 
 #: data/stylesheet.appdata.xml.in:8
 msgid "System Stylesheet"
@@ -47,10 +47,8 @@ msgid "Adw.TabOverview"
 msgstr ""
 
 #: data/stylesheet.appdata.xml.in:30
-#, fuzzy
-#| msgid "Improvements:"
 msgid "GTK 4 Improvements:"
-msgstr "გაუმჯობესებები:"
+msgstr "GTK 4 გაუმჯობესებები:"
 
 #: data/stylesheet.appdata.xml.in:32
 msgid "Add missing \".default-decoration\" style for compact headerbars"

src/gtk-4.0/_index.scss

@@ -18,7 +18,7 @@ $disabled-opacity: 0.5;
 $error_color: $STRAWBERRY_500;
 $success_color: $LIME_700;
 $warning_color: $BANANA_900;
-$warning-icon-color: mix($BANANA_500, $BANANA_700, $weight: 50%);
+$warning-icon-color: mix($BANANA_700, $BANANA_900, $weight: 50%);
 
 @if $color-scheme == "dark" {
     $titlebar-color: mix($BLACK_500, $BLACK_700, $weight: 65%);

src/gtk-4.0/widgets/_buttons.scss

@@ -126,6 +126,43 @@ button {
         }
     }
 
+    // Stopgap since we can't do angled buttons in GtkCSS, and generating all
+    // the necessary SVGs for light/dark and accent color combinations is
+    // untenable. Ideally we'd deprecate this in favor of something like a
+    // Granite.BackButton with custom drawing; until then, stick an icon in it.
+    &.back-button {
+        background-repeat: no-repeat no-repeat;
+        background-size: 16px, cover;
+
+        &:dir(ltr) {
+            background-image:
+                -gtk-icontheme('go-previous-symbolic'),
+                linear-gradient(
+                    to bottom,
+                    #{'alpha(@highlight_color, 0.2)'},
+                    rgba(white, 0)
+                );
+            padding-left: calc(#{rem(9px)} + 16px);
+            background-position:
+                #{rem(6px)} 50%,
+                center, center;
+        }
+
+        &:dir(rtl) {
+            background-image:
+                -gtk-icontheme('go-next-symbolic'),
+                linear-gradient(
+                    to bottom,
+                    #{'alpha(@highlight_color, 0.2)'},
+                    rgba(white, 0)
+                );
+            padding-right: calc(#{rem(9px)} + 16px);
+            background-position:
+                calc(100% - #{rem(6px)}) 50%,
+                center, center;
+        }
+    }
+
     &:disabled {
         color: $insensitive-fg-color;
     }

src/gtk-4.0/widgets/_scrollbars.scss

@@ -41,7 +41,8 @@ scrollbar {
 
     &.vertical {
         slider {
-            min-height: rem(32px);
+            // Can't be taller than menuitem or popover is too big
+            min-height: rem(20px);
             min-width: rem(3px);
         }