Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add branding for bluefin and aurora #1735

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
cf312de
feat: add branding for bluefin
noelmiller Oct 2, 2024
b22e8c8
fix: add anaconda header
noelmiller Oct 2, 2024
c6a3f0a
fix: rename anaconda_header
noelmiller Oct 2, 2024
0a8b2f3
fix: add quotes
noelmiller Oct 2, 2024
3a2bc64
fix: uses envs
noelmiller Oct 2, 2024
4c61b5f
fix: add quotes?!
noelmiller Oct 3, 2024
d369d3d
fix: quotes
noelmiller Oct 3, 2024
a2ab081
fix: exported as png
noelmiller Oct 3, 2024
a8eb87f
fix: exported as png
noelmiller Oct 3, 2024
82c4ca1
Update logo sizes
KyleGospo Oct 3, 2024
9345bb9
feat: add aurora branding
NiHaiden Oct 3, 2024
45e157d
Merge branch 'testing' of https://github.com/ublue-os/bluefin into te…
NiHaiden Oct 3, 2024
7e58503
fix: add logos to correct place
noelmiller Oct 3, 2024
1777bc3
fix: fqdn?
noelmiller Oct 3, 2024
90cdbf5
fix: move sources to root of directory
noelmiller Oct 3, 2024
2d52d89
fix: try with a lorax template...
noelmiller Oct 3, 2024
24f2bea
fix: use fully qualified path?
noelmiller Oct 3, 2024
3cf88c1
fix: add slash?
noelmiller Oct 3, 2024
e8d6546
fix: try with the brand repo again?
noelmiller Oct 4, 2024
7b66140
fix: update version!
noelmiller Oct 4, 2024
c451666
fix: try templates?
noelmiller Oct 4, 2024
9fda193
fix: full path
noelmiller Oct 4, 2024
a9750e1
fix: try rpm
noelmiller Oct 4, 2024
63202ef
fix: try fix from jason and update CSS
noelmiller Oct 4, 2024
33cfee0
fix: for real this time, I swear.
noelmiller Oct 4, 2024
351f349
fix: updated spec file and removed unnecessary files for Bluefin
noelmiller Oct 4, 2024
953ea4c
fix: incrememented version
noelmiller Oct 4, 2024
b994fa8
fix: new release, removed sidebar-logo file as it is not needed
noelmiller Oct 4, 2024
d0366b5
fix: missed v
noelmiller Oct 4, 2024
6a5a23a
fix: forgot change back to repos
noelmiller Oct 4, 2024
a1154a8
fix: use higher resolution images
noelmiller Oct 5, 2024
9d3ffae
fix: update version
noelmiller Oct 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/reusable-build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ jobs:
${image} /temp_flatpak_install_dir/script.sh
docker rmi ${image}

- name: Setup Branding Repo
id: setup-branding-repo
shell: bash
run: |
curl -Lo "${{ github.workspace }}/brand.repo" "https://copr.fedorainfracloud.org/coprs/ublue-os/bluefin/repo/fedora-${{ steps.labels.outputs.fedora_version }}/ublue-os-${{ inputs.brand_name }}-fedora-${{ steps.labels.outputs.fedora_version }}.repo"

- name: Build ISOs
uses: jasonn3/build-container-installer@v1.2.2
id: build
Expand All @@ -167,6 +173,8 @@ jobs:
enable_cache_skopeo: "false"
flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }}
enable_flatpak_dependencies: "false"
#additional_templates: "/github/workspace/lorax_templates/bluefin_branding.tmpl"
repos: "/github/workspace/brand.repo /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo"

- name: Move ISOs to Upload Directory
id: upload-directory
Expand Down
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,253 changes: 1,253 additions & 0 deletions lorax_templates/aurora_files/fedora-logos.spec

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions lorax_templates/aurora_files/fedora.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/* Anaconda gtk style overrides for Fedora */

/* vendor-specific colors */
@define-color fedora #51a2da;

/* logo and sidebar classes */

/* The sidebar consists of three parts: a background, a logo, and a product logo,
* rendered in that order. The product logo is empty by default and is intended
* to be overridden by a stylesheet in product.img.
*/
.logo-sidebar {
background-image: url("/usr/share/anaconda/pixmaps/sidebar-bg.png");
background-color: @fedora;
background-repeat: no-repeat;
}

/* Add a logo to the sidebar */
.logo {
background-image: url("/usr/share/anaconda/pixmaps/sidebar-logo.png");
background-position: 50% 20px;
background-repeat: no-repeat;
background-color: transparent;
}

/* This is a placeholder to be filled by a product-specific logo. */
.product-logo {
background-image: none;
background-color: transparent;
}

AnacondaSpokeWindow #nav-box {

Check notice on line 32 in lorax_templates/aurora_files/fedora.css

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

lorax_templates/aurora_files/fedora.css#L32

Expected "AnacondaSpokeWindow" to be "anacondaspokewindow" (selector-type-case)
background-color: @fedora;
background-image: url("/usr/share/anaconda/pixmaps/topbar-bg.png");
background-repeat: repeat;
color: white;
}
Binary file added lorax_templates/aurora_files/sidebar-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lorax_templates/aurora_files/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.
9 changes: 9 additions & 0 deletions lorax_templates/bluefin_branding.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
remove usr/share/anaconda/pixmaps/silverblue/fedora-silverblue.css
remove usr/share/anaconda/pixmaps/silverblue/sidebar-bg.png
remove usr/share/anaconda/pixmaps/silverblue/sidebar-logo.png
remove usr/share/anaconda/pixmaps/silverblue/topbar-bg.png

copy tmp/config_files/workspace/lorax_templates/bluefin_files/fedora-silverblue.css usr/share/anaconda/pixmaps/silverblue/fedora-silverblue.css
copy tmp/config_files/workspace/lorax_templates/bluefin_files/sidebar-bg.png usr/share/anaconda/pixmaps/silverblue/sidebar-bg.png
copy tmp/config_files/workspace/lorax_templates/bluefin_files/sidebar-logo.png usr/share/anaconda/pixmaps/silverblue/sidebar-logo.png
copy tmp/config_files/workspace/lorax_templates/bluefin_files/topbar-bg.png usr/share/anaconda/pixmaps/silverblue/topbar-bg.png
38 changes: 38 additions & 0 deletions lorax_templates/bluefin_files/fedora-silverblue.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/* logo and sidebar classes for Fedora */

/* The sidebar consists of three parts: a background, a logo, and a product logo,
* rendered in that order. The product logo is empty by default and is intended
* to be overridden by a stylesheet in product.img.
*/
.logo-sidebar {
background-image: url("/usr/share/anaconda/pixmaps/silverblue/sidebar-bg.png");
background-repeat: no-repeat;
}

/* This is a placeholder to be filled by a product-specific logo. */
.product-logo {
background-image: none;
background-color: transparent;
}

AnacondaSpokeWindow #nav-box {

Check notice on line 18 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#L18

Expected "AnacondaSpokeWindow" to be "anacondaspokewindow" (selector-type-case)
background-color: @fedora;
background-image: url("/usr/share/anaconda/pixmaps/silverblue/topbar-bg.png");
background-repeat: no-repeat;
color: white;
}

/* Remove the box-shadow from buttons in the nav-box because it adds a white stripe
* below the buttons and makes them look dumb */
AnacondaSpokeWindow #nav-box GtkButton {

Check notice on line 27 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#L27

Expected "AnacondaSpokeWindow" to be "anacondaspokewindow" (selector-type-case)
box-shadow: none;
}

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

AnacondaSpokeWindow #nav-box {
background-color: #006eb4;
}
Binary file added lorax_templates/bluefin_files/sidebar-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lorax_templates/bluefin_files/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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading