diff --git a/config.windows.v10.toml b/config.windows.v10.toml index 1db13a8..5cb22e6 100644 --- a/config.windows.v10.toml +++ b/config.windows.v10.toml @@ -15,6 +15,7 @@ auth_url = "https://api.yuzu-emu.org/jwt/installer/" [[packages]] name = "yuzu" description = "Includes frequent updates to yuzu with all the latest reviewed and tested features." +icon = "thicc_logo_installer_shadow.png" default = true [packages.source] name = "github" @@ -29,6 +30,7 @@ default = true [[packages]] name = "yuzu Early Access" description = "Bonus preview release for project supporters. Thanks for your support!" +icon = "thicc_logo_installer__ea_shadow.png" # Displayed when the package has no authentication for the user need_authentication_description = "Click here to sign in with your yuzu account for Early Access" # Displayed when the package has an authentication, but the user has not linked their account diff --git a/src/config.rs b/src/config.rs index ef3e91f..cde0cd3 100644 --- a/src/config.rs +++ b/src/config.rs @@ -32,6 +32,8 @@ pub struct PackageShortcut { pub struct PackageDescription { pub name: String, pub description: String, + #[serde(default)] + pub icon: Option, pub default: Option, pub source: PackageSource, #[serde(default)] diff --git a/src/frontend/rest/assets.rs b/src/frontend/rest/assets.rs index 51679c4..679b50a 100644 --- a/src/frontend/rest/assets.rs +++ b/src/frontend/rest/assets.rs @@ -34,7 +34,10 @@ pub fn file_from_string(file_path: &str) -> Option<(String, &'static [u8])> { file_path, "/index.html", "/favicon.ico", - "/img/logo.png", + "/img/light_mode_installer_logo.png", + "/img/dark_mode_installer_logo.png", + "/thicc_logo_installer__ea_shadow.png", + "/thicc_logo_installer_shadow.png", "/img/how-to-open.png", "/css/app.css", "/css/chunk-vendors.css", diff --git a/ui/public/thicc_logo_installer__ea_shadow.png b/ui/public/thicc_logo_installer__ea_shadow.png new file mode 100644 index 0000000..369f130 Binary files /dev/null and b/ui/public/thicc_logo_installer__ea_shadow.png differ diff --git a/ui/public/thicc_logo_installer_shadow.png b/ui/public/thicc_logo_installer_shadow.png new file mode 100644 index 0000000..46070d2 Binary files /dev/null and b/ui/public/thicc_logo_installer_shadow.png differ diff --git a/ui/src/App.vue b/ui/src/App.vue index 60e865c..7f7e97d 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -4,7 +4,7 @@
- Application icon + Application icon

@@ -52,6 +52,30 @@ body, div, span, h1, h2, h3, h4, h5, h6 { cursor: default; } +#applicationIcon { + width:0px; height: 0px; + padding: 50px 60% 0px 0px; + background: url("./assets/light_mode_installer_logo.png") left top no-repeat; + background-size: contain; +} + +body.has-background-black-ter #applicationIcon { + background: url("./assets/dark_mode_installer_logo.png") left top no-repeat; + background-size: contain; +} + +.package-icon { + width: 3rem; + height: 3rem; + float: left; + padding-right: 10px; + padding-top: 10px; +} + +.package-description { + overflow: hidden; +} + pre { -webkit-user-select: text; -moz-user-select: text; diff --git a/ui/src/assets/dark_mode_installer_logo.png b/ui/src/assets/dark_mode_installer_logo.png new file mode 100644 index 0000000..e3516a7 Binary files /dev/null and b/ui/src/assets/dark_mode_installer_logo.png differ diff --git a/ui/src/assets/how-to-open.png b/ui/src/assets/how-to-open.png index 9db0922..989659b 100644 Binary files a/ui/src/assets/how-to-open.png and b/ui/src/assets/how-to-open.png differ diff --git a/ui/src/assets/light_mode_installer_logo.png b/ui/src/assets/light_mode_installer_logo.png new file mode 100644 index 0000000..239ad7d Binary files /dev/null and b/ui/src/assets/light_mode_installer_logo.png differ diff --git a/ui/src/assets/logo.png b/ui/src/assets/logo.png deleted file mode 100644 index 7c6918d..0000000 Binary files a/ui/src/assets/logo.png and /dev/null differ diff --git a/ui/src/views/SelectPackages.vue b/ui/src/views/SelectPackages.vue index 6efd2a1..51c2a12 100644 --- a/ui/src/views/SelectPackages.vue +++ b/ui/src/views/SelectPackages.vue @@ -14,45 +14,60 @@ (installed) -

- {{ Lpackage.description }} -

+
+ +

+ {{ Lpackage.description }} +

+
New!
{{ Lpackage.name }} -

- {{Lpackage.need_authentication_description}} -

+
+ +

+ {{ Lpackage.description }} +

+
New!
{{ Lpackage.name }} -

- {{Lpackage.need_link_description}} -

+
+ +

+ {{ Lpackage.description }} +

+
New!
{{ Lpackage.name }} -

- {{Lpackage.need_subscription_description}} -

+
+ +

+ {{ Lpackage.description }} +

+
New!
{{ Lpackage.name }} -

- {{Lpackage.need_reward_tier_description}} -

+
+ +

+ {{ Lpackage.description }} +

+
@@ -116,6 +131,7 @@ export default { }, data: function () { return { + publicPath: process.env.BASE_URL, advanced: false } },