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

Installer: Refactor to use @import rather than concatting files #182

Merged
merged 19 commits into from
Jul 29, 2023

Conversation

Foldex
Copy link
Contributor

@Foldex Foldex commented Jul 16, 2023

Fixes #180
Partially Fixes #178
Partially Fixes #177

General

web has been renamed to adwaita

Installer

The adwaita folder is now copied to steamui/adwaita during install
Rather than concatting together a single file, the generated steamui/libraryroot.custom.css now contains multiple import statements pointing to adwaita through steamloopback.host ala:

@import url("https://steamloopback.host/adwaita/variants/base/_root.css");

Colorthemes

Colorthemes are now plain css and imported in libraryroot.custom.css

The old colortheme directory remains for compatability sake until I fix AdwSteamGtk to compensate.

Custom CSS

While we technically supported custom CSS before, it wasn't as discoverable. It is now an option in the installer.

Users can edit adwaita/custom/custom.css and provide the -cu flag to enable it.

Not the happiest with the placement of it residing inside the theme dir, any ideas?

Variants

There's really no need for base anymore.

While the underlying files will need a merge down the line, the -w flag is deprecated and now does nothing.

Remains for the sake of AdwSteamGtk compatability.

@Foldex Foldex marked this pull request as ready for review July 28, 2023 03:25
@Foldex
Copy link
Contributor Author

Foldex commented Jul 28, 2023

Merged to latest master.

adwaita/custom/custom.css is now under custom/custom.css instead.

install.py Outdated Show resolved Hide resolved
@tkashkin tkashkin merged commit 34f6097 into tkashkin:master Jul 29, 2023
@Foldex
Copy link
Contributor Author

Foldex commented Jul 29, 2023

Updated to address those issues.
I've also made the changes on AdwSteamGtk's side to support the css themes and new argument names, so we can just rip the bandaid on that when we merge this.

@Foldex Foldex deleted the installer_import branch July 30, 2023 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revamp gen_webkit_theme to use import Make color themes plain CSS Simplify installation variants
2 participants