Merge branch 'main' into danirabbit/a11y-improvements

elementary · Aug 8, 2024 · fbddb6f · fbddb6f
2 parents 78be22c + d32b030
commit fbddb6f
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 104 deletions.
diff --git a/data/Application.css b/data/Application.css
@@ -123,3 +123,80 @@
             0 2px 3px alpha(@BLUEBERRY_900, 0.2);
     }
 }
+
+navigation-view-page.partition levelbar block {
+    border-radius: 0.333em;
+}
+
+navigation-view-page.partition levelbar block:not(:first-child) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+navigation-view-page.partition levelbar block:not(:last-child) {
+    border-right-style: none;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+navigation-view-page.partition levelbar block.legend {
+    border-radius: 50%;
+    border-style: solid;
+    min-height: 14px;
+    min-width: 14px;
+}
+
+navigation-view-page.partition levelbar block.swap {
+    background-color: @STRAWBERRY_500;
+}
+
+navigation-view-page.partition levelbar block.ext4 {
+    background-color: @LIME_500;
+}
+
+navigation-view-page.partition levelbar block.ext3 {
+    background-color: @MINT_500;
+}
+
+navigation-view-page.partition levelbar block.ext2 {
+    background-color: @BUBBLEGUM_500;
+}
+
+navigation-view-page.partition levelbar block.fat16,
+navigation-view-page.partition levelbar block.fat32 {
+    background-color: @BANANA_500;
+}
+
+navigation-view-page.partition levelbar block.btrfs {
+    background-color: @BLUEBERRY_500;
+}
+
+navigation-view-page.partition levelbar block.xfs {
+    background-color: @SLATE_100;
+}
+
+navigation-view-page.partition levelbar block.ntfs {
+    background-color: @COCOA_300;
+}
+
+navigation-view-page.partition levelbar block.luks {
+    background-color: @ORANGE_500;
+}
+
+navigation-view-page.partition levelbar block.lvm {
+    background-color: @GRAPE_500;
+}
+
+navigation-view-page.partition levelbar block.none,
+navigation-view-page.partition levelbar block.unused {
+    background-color: @SILVER_300;
+}
+
+navigation-view-page.partition levelbar block image {
+    min-height: 16px; /* Preserve height when empty */
+    padding: 0.5em;
+    -gtk-icon-palette: error #fff, success #fff, warning #fff;
+    -gtk-icon-shadow:
+        0 1px 1px alpha(#000, 0.2),
+        0 1px 3px alpha(#000, 0.1);
+}
diff --git a/data/disk-bar-fallback.css b/data/disk-bar-fallback.css
diff --git a/data/io.elementary.installer.gresource.xml b/data/io.elementary.installer.gresource.xml
@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/io/elementary/installer">
     <file compressed="true">Application.css</file>
-    <file alias="disk-bar-fallback.css" compressed="true">disk-bar-fallback.css</file>
     <file compressed="true">wallpaper.jpg</file>
   </gresource>
   <gresource prefix="/io/elementary/installer/icons">

diff --git a/src/Application.vala b/src/Application.vala
@@ -33,14 +33,6 @@ public class Installer.App : Gtk.Application {
         base.startup ();
 
         Granite.init ();
-
-        var css_fallback = new Gtk.CssProvider ();
-        css_fallback.load_from_resource ("io/elementary/installer/disk-bar-fallback.css");
-        Gtk.StyleContext.add_provider_for_display (
-            Gdk.Display.get_default (),
-            css_fallback,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-        );
     }
 
     public override void activate () {

diff --git a/src/Views/PartitioningView.vala b/src/Views/PartitioningView.vala
@@ -49,6 +49,7 @@ public class Installer.PartitioningView : AbstractInstallerView {
         mounts = new Gee.ArrayList<Installer.Mount> ();
         luks = new Gee.ArrayList<InstallerDaemon.LuksCredentials?> ();
 
+        add_css_class ("partition");
         title = _("Select Partitions");
 
         var title_label = new Gtk.Label (title);