diff --git a/data/Application.css b/data/Application.css
index f9a9c864d..a2f299bf4 100644
--- 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
deleted file mode 100644
index c2326a221..000000000
--- a/data/disk-bar-fallback.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 2018 elementary LLC. (https://elementary.io)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * Authored by: Ian Santopietro
- */
-
-levelbar block {
- border-radius: 0.333em;
-}
-
-levelbar block:not(:first-child) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-levelbar block:not(:last-child) {
- border-right-style: none;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-levelbar block.legend {
- border-radius: 50%;
- border-style: solid;
- min-height: 14px;
- min-width: 14px;
-}
-
-levelbar block.swap {
- background-color: @STRAWBERRY_500;
-}
-
-levelbar block.ext4 {
- background-color: @LIME_500;
-}
-
-levelbar block.ext3 {
- background-color: @MINT_500;
-}
-
-levelbar block.ext2 {
- background-color: @BUBBLEGUM_500;
-}
-
-levelbar block.fat16,
-levelbar block.fat32 {
- background-color: @BANANA_500;
-}
-
-levelbar block.btrfs {
- background-color: @BLUEBERRY_500;
-}
-
-levelbar block.xfs {
- background-color: @SLATE_100;
-}
-
-levelbar block.ntfs {
- background-color: @COCOA_300;
-}
-
-levelbar block.luks {
- background-color: @ORANGE_500;
-}
-
-levelbar block.lvm {
- background-color: @GRAPE_500;
-}
-
-levelbar block.none,
-levelbar block.unused {
- background-color: @SILVER_300;
-}
-
-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/io.elementary.installer.gresource.xml b/data/io.elementary.installer.gresource.xml
index a43779f25..307b4b93c 100644
--- a/data/io.elementary.installer.gresource.xml
+++ b/data/io.elementary.installer.gresource.xml
@@ -2,7 +2,6 @@
Application.css
- disk-bar-fallback.css
wallpaper.jpg
diff --git a/src/Application.vala b/src/Application.vala
index b2e931a11..57199e6c4 100644
--- 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
index 24574cdf4..1400e4eab 100644
--- a/src/Views/PartitioningView.vala
+++ b/src/Views/PartitioningView.vala
@@ -49,6 +49,7 @@ public class Installer.PartitioningView : AbstractInstallerView {
mounts = new Gee.ArrayList ();
luks = new Gee.ArrayList ();
+ add_css_class ("partition");
title = _("Select Partitions");
var title_label = new Gtk.Label (title);