Skip to content

Commit

Permalink
fix: updated spec file and removed unnecessary files for Bluefin
Browse files Browse the repository at this point in the history
  • Loading branch information
noelmiller committed Oct 4, 2024
1 parent 33cfee0 commit 351f349
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 61 deletions.
16 changes: 7 additions & 9 deletions lorax_templates/bluefin_files/fedora-silverblue.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
* to be overridden by a stylesheet in product.img.
*/
.logo-sidebar {
background-image: url('/usr/share/anaconda/pixmaps/silverblue/sidebar-bg.png');
background-color: @fedora;
background-image: url("/usr/share/anaconda/pixmaps/silverblue/sidebar-bg.png");
background-color: transparent;
background-repeat: no-repeat;
}

/* Add a logo to the sidebar */
.logo {
background-image: url('/usr/share/anaconda/pixmaps/silverblue/sidebar-logo.png');
background-image: url("/usr/share/anaconda/pixmaps/silverblue/sidebar-logo.png");
background-position: 50% 20px;
background-repeat: no-repeat;
background-color: transparent;
Expand All @@ -28,7 +28,7 @@

AnacondaSpokeWindow #nav-box {

Check notice on line 29 in lorax_templates/bluefin_files/fedora-silverblue.css

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

lorax_templates/bluefin_files/fedora-silverblue.css#L29

Expected "AnacondaSpokeWindow" to be "anacondaspokewindow" (selector-type-case)
background-color: @fedora;
background-image: url('/usr/share/anaconda/pixmaps/silverblue/topbar-bg.png');
background-image: url("/usr/share/anaconda/pixmaps/silverblue/topbar-bg.png");
background-repeat: no-repeat;
color: white;
}
Expand All @@ -39,14 +39,13 @@ AnacondaSpokeWindow #nav-box GtkButton {
box-shadow: none;
}


/* Change the sidebar background color */
.logo-sidebar {
background-color: #006eb4;
background-color: #006eb4;
}

AnacondaSpokeWindow #nav-box {
background-color: #006eb4;
background-color: #006eb4;
}

/* Move the Fedora logo to the bottom */
Expand All @@ -56,8 +55,7 @@ AnacondaSpokeWindow #nav-box {

/* Add the product logo at the top */
.product-logo {
background-image: url('/usr/share/anaconda/pixmaps/silverblue/sidebar-logo_flavor.png');
background-image: url("/usr/share/anaconda/pixmaps/silverblue/sidebar-logo_flavor.png");
background-position: 12px 10.5em;
background-repeat: no-repeat;
}

Binary file removed spec_files/bluefin/fedora-logos/anaconda_header.png
Binary file not shown.
21 changes: 6 additions & 15 deletions spec_files/bluefin/fedora-logos/fedora-logos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ Release: 101%{?dist}.bluefin
URL: https://pagure.io/fedora-logos
Source0: https://pagure.io/fedora-logos/archive/%{version}/fedora-logos-%{version}.tar.gz
Source1: sidebar-bg.png
Source2: sidebar-logo.png
Source3: topbar-bg.png
Source4: anaconda_header.png
Source5: fedora.css
Source6: fedora-silverblue.css
Source2: topbar-bg.png
Source3: fedora-silverblue.css
License: LicenseRef-Fedora-Logos
Provides: redhat-logos = %{version}-%{release}
Provides: gnome-logos = %{version}-%{release}
Expand Down Expand Up @@ -207,21 +204,16 @@ install -p -m 644 anaconda/syslinux-splash.png %{buildroot}%{_datadir}/anaconda/
# note the filename change
install -p -m 644 anaconda/syslinux-vesa-splash.png %{buildroot}%{_datadir}/anaconda/boot/splash.png
mkdir -p %{buildroot}%{_datadir}/anaconda/pixmaps
# install -p -m 644 anaconda/anaconda_header.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 %{SOURCE4} %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 anaconda/anaconda_header.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 anaconda/anaconda_header_classic.png %{buildroot}%{_datadir}/anaconda/pixmaps/
# This had not been regenerated since Fedora 17. Clearly not used anymore.
# install -p -m 644 anaconda/progress_first.png %%{buildroot}%%{_datadir}/anaconda/pixmaps/
# install -p -m 644 anaconda/splash.png %%{buildroot}%%{_datadir}/anaconda/pixmaps/
# install -p -m 644 anaconda/sidebar-logo.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 anaconda/sidebar-logo_classic.png %{buildroot}%{_datadir}/anaconda/pixmaps/
# install -p -m 644 anaconda/sidebar-bg.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/anaconda/pixmaps/
# install -p -m 644 anaconda/topbar-bg.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/anaconda/pixmaps/
# install -p -m 644 anaconda/fedora.css %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 %{SOURCE5} %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 anaconda/sidebar-bg.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 anaconda/topbar-bg.png %{buildroot}%{_datadir}/anaconda/pixmaps/
install -p -m 644 anaconda/fedora.css %{buildroot}%{_datadir}/anaconda/pixmaps/

# Variant Anaconda art
pushd anaconda
Expand All @@ -234,7 +226,6 @@ popd
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/anaconda/pixmaps/silverblue/
install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/anaconda/pixmaps/silverblue/
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/anaconda/pixmaps/silverblue/
install -p -m 644 %{SOURCE6} %{buildroot}%{_datadir}/anaconda/pixmaps/silverblue/

%if ! 0%{?eln}
# KDE Theme logos
Expand Down
37 changes: 0 additions & 37 deletions spec_files/bluefin/fedora-logos/fedora.css

This file was deleted.

Binary file modified spec_files/bluefin/fedora-logos/topbar-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 351f349

Please sign in to comment.