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

Fix Chunky Boy + Update Alert Modal #528

Merged
merged 32 commits into from
Apr 26, 2023
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
567e850
Easier Theme Selector
dragoonDorise Apr 14, 2023
ada388f
EmuDeck wip
dragoonDorise Apr 14, 2023
3a21513
Deck Theme
dragoonDorise Apr 14, 2023
979897f
Merge branch 'master' into master
dragoonDorise Apr 14, 2023
3ea3a1d
EmuDeck theme
dragoonDorise Apr 16, 2023
de0a447
Opacity
dragoonDorise Apr 16, 2023
063df1c
small fix setttings
dragoonDorise Apr 16, 2023
7ddca78
font
dragoonDorise Apr 16, 2023
c763a10
Fix routing issue (#1)
cbartondock Apr 16, 2023
4705a8c
EmuDeck Theme + fixes Classic and Deck theme
dragoonDorise Apr 17, 2023
b42ec2b
Merge branch 'master' into master
dragoonDorise Apr 17, 2023
b4fe764
Merge branch 'master' into master
cbartondock Apr 17, 2023
cc5ca6d
new bg + fix navarea buttons
dragoonDorise Apr 17, 2023
e892e8a
Merge branch 'master' into master
cbartondock Apr 17, 2023
9ac9d3c
Merge branch 'master' of https://github.com/dragoonDorise/steam-rom-m…
dragoonDorise Apr 17, 2023
691f3f3
Merge branch 'SteamGridDB:master' into master
dragoonDorise Apr 17, 2023
942599e
Merge branch 'upstream-master'
dragoonDorise Apr 25, 2023
e930087
Preview Screen Text + Lens Icon
dragoonDorise Apr 25, 2023
f7979a9
typo
dragoonDorise Apr 25, 2023
41a4362
streamlined button
dragoonDorise Apr 25, 2023
f9b427d
Merge branch 'upstream-master'
dragoonDorise Apr 25, 2023
ce2a6b2
add (bad) styling for required fields (#2)
cbartondock Apr 26, 2023
2332bcc
comma
dragoonDorise Apr 26, 2023
eeb1723
nicer colors
dragoonDorise Apr 26, 2023
d7792cd
Merge branch 'upstream-master'
dragoonDorise Apr 26, 2023
fbe84a4
small fixie
dragoonDorise Apr 26, 2023
203a312
Merge branch 'upstream-master'
dragoonDorise Apr 26, 2023
c3c7d60
Merge branch 'upstream-master'
dragoonDorise Apr 26, 2023
08b1c4c
Fix update alert
dragoonDorise Apr 26, 2023
9bbf1c6
fix chunky boy
dragoonDorise Apr 26, 2023
2db8fca
Merge branch 'upstream-master'
dragoonDorise Apr 26, 2023
17c8f0d
label switcharoo
dragoonDorise Apr 26, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'upstream-master'
# Conflicts:
#	src/renderer/components/app.component.ts
dragoonDorise committed Apr 25, 2023
commit 942599ee8550fd5452c85c4f7d30d47dfbdb798a
8 changes: 4 additions & 4 deletions src/renderer/components/app.component.ts
Original file line number Diff line number Diff line change
@@ -36,19 +36,19 @@ export class AppComponent {
this.settingsLoaded = true;
document.querySelector('html').className = '';
document.querySelector('html').classList.add(appSettings.theme)

// EmuDeck special navigation
this.router.events.subscribe((val) => {
if (this.router.url === '/logger' && appSettings.theme === 'EmuDeck' || this.router.url === '/' && appSettings.theme === 'EmuDeck') {
this.shouldHideComponent = true;
} else {
this.shouldHideComponent = false;
}
}
});

if(appSettings.theme === 'EmuDeck'){
document.querySelector('html').removeAttribute("style");
this.router.navigate(['/parsers-list']);
this.router.navigate(['/parsers-list']);
}else{
this.router.navigate(['/parsers', -1]);
}
You are viewing a condensed version of this merge commit. You can view the full changes here.