Skip to content

Commit

Permalink
Remove news tab
Browse files Browse the repository at this point in the history
  • Loading branch information
jliddev committed Apr 4, 2024
1 parent 3b59320 commit 741297a
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 41 deletions.
3 changes: 3 additions & 0 deletions wowup-electron/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<div class="cata-bg"></div>

<div
*ngIf="(showPreLoad$ | async) === false && quitEnabled === false"
class="app"
[ngClass]="[sessionService.currentTheme$ | async, electronService.platform]"
[style.zIndex]="1"
>
<app-titlebar class="gtitle"></app-titlebar>
<!-- <app-horizontal-tabs></app-horizontal-tabs> -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class VerticalTabsComponent implements OnInit, OnDestroy {
},
};

public tabsTop: Tab[] = [this.myAddonsTab, this.getAddonsTab, this.newsTab];
public tabsTop: Tab[] = [this.myAddonsTab, this.getAddonsTab];

public tabsBottom: Tab[] = [this.settingsTab];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<div class="about-container" [ngClass]="{
<div
class="about-container"
[ngClass]="{
mac: electronService.isMac,
windows: electronService.isWin,
linux: electronService.isLinux
}">
}"
>
<!-- <div class="theme-logo">
<div class="logo-img"></div>
</div> -->
Expand All @@ -21,12 +24,13 @@ <h2>{{ "PAGES.ABOUT.TITLE" | translate }}</h2>
</a>
</div>
</div>
<div class="changelog-container header-2 text-1">
<div class="changelog-container header-2 text-1">
<h2>{{ "PAGES.ABOUT.ATTRIBUTIONS_TITLE" | translate }}</h2>
<ul class="change-log-list">
<li class="changelog bg-secondary-4 border-primary mat-elevation-z8">
<p><a appExternalLink href="https://vectorified.com/wow-alliance-icon">Wow Alliance Icon</a></p>
<p><a appExternalLink href="https://vectorified.com/horde-logo-vector">Horde Logo Vector</a></p>
<p><a appExternalLink href="https://blizzard.gamespress.com/world-of-warcraft">Other WoW Art</a></p>
</li>
</ul>
</div>
Expand All @@ -36,12 +40,12 @@ <h2>
</h2>
<ul #changelogContainer class="change-log-list">
<li class="changelog bg-secondary-4 border-primary mat-elevation-z8" *ngFor="let cl of changeLogs">
<div class="version selectable mat-subheading-2">{{ cl.Version }}</div>
<div class="version selectable mat-subheading-2">{{ cl.Version }}</div>
<pre *ngIf="cl.Description" class="description selectable">{{ cl.Description }}</pre>
<pre *ngIf="cl.changes" class="description selectable">{{ formatChanges(cl) }}</pre>
<div *ngIf="cl.html" class="selectable" [innerHTML]="cl.html | trustHtml"></div>
</li>
</ul>
</div>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h3 class="px-3">{{ "PAGES.GET_ADDONS.ADDON_CATEGORIES_MENU_TITLE" | translate }
</button>
</mat-action-list>
</mat-drawer>
<mat-drawer-content class="bg-secondary">
<mat-drawer-content >
<div class="spinner-container flex-grow-1" style="height: 100%" *ngIf="(showTable$ | async) === false">
<app-progress-spinner> </app-progress-spinner>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
linux: electronService.isLinux
}"
>
<div class="nav-container bg-secondary-4">
<div class="nav-container">
<div class="theme-logo">
<div class="logo-img"></div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

.logo-img {
height: 100vh;
background-image: var(--theme-logo);
// background-image: var(--theme-logo);
background-repeat: no-repeat;
background-position: 0 0;
background-size: contain;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 40 additions & 31 deletions wowup-electron/src/custom-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ body {
--background-primary: #6b69d6;
--background-primary-2: #504fa1;
--background-primary-3: #383773;
--background-secondary-1: #666666;
--background-secondary-2: #555555;
--background-secondary-3: #444444;
--background-secondary-4: #333333;
--background-secondary-5: #222222;
--background-secondary-1: rgba(102, 102, 102, 0.85);
--background-secondary-2: rgba(85, 85, 85, 0.9);
--background-secondary-3: rgba(68, 68, 68, 0.8);
--background-secondary-4: rgba(51, 51, 51, 0.8);
--background-secondary-5: rgba(34, 34, 34, 0.8);
--control-color: #536dfe;
--epic-color: #a335ee;
--rare-color: #0070dd;
Expand All @@ -291,17 +291,20 @@ body {
--title-logo: url("assets/images/wowup-white-1.png");
--theme-logo: url("assets/images/wowup-white-1.png");
--ad-placeholder: url("assets/images/wowup-placeholder.png");

--mat-sidenav-content-background-color: rgba(0, 0, 0, 0);
--mat-sidenav-container-background-color: rgba(0, 0, 0, 0);
}

.default-theme-light-theme {
--background-primary: #6b69d6;
--background-primary-2: #504fa1;
--background-primary-3: #383773;
--background-secondary-1: #ffffff;
--background-secondary-2: #f3f3f3;
--background-secondary-3: #ebedef;
--background-secondary-4: #e3e5e8;
--background-secondary-5: #caccce;
--background-secondary-1: rgba(255, 255, 255, 0.75);
--background-secondary-2: rgba(243, 243, 243, 0.8);
--background-secondary-3: rgba(235, 237, 239, 0.75);
--background-secondary-4: rgba(227, 229, 232, 0.75);
--background-secondary-5: rgba(202, 204, 206, 0.75);
--control-color: #536dfe;
--epic-color: #a335ee;
--rare-color: #0070dd;
Expand All @@ -326,11 +329,11 @@ body {
--background-primary: #8c1616;
--background-primary-2: #9d3939;
--background-primary-3: #5c0606;
--background-secondary-1: #666666;
--background-secondary-2: #555555;
--background-secondary-3: #444444;
--background-secondary-4: #333333;
--background-secondary-5: #222222;
--background-secondary-1: rgba(102, 102, 102, 0.85);
--background-secondary-2: rgba(85, 85, 85, 0.9);
--background-secondary-3: rgba(68, 68, 68, 0.8);
--background-secondary-4: rgba(51, 51, 51, 0.8);
--background-secondary-5: rgba(34, 34, 34, 0.8);
--control-color: #ff5b5b;
--epic-color: #a335ee;
--rare-color: #0070dd;
Expand All @@ -349,17 +352,20 @@ body {

--title-logo: url("assets/images/horde-1.png");
--theme-logo: url("assets/images/horde-1.png");

--mat-sidenav-content-background-color: rgba(0, 0, 0, 0);
--mat-sidenav-container-background-color: rgba(0, 0, 0, 0);
}

.horde-theme-light-theme {
--background-primary: #8c1616;
--background-primary-2: #9d3939;
--background-primary-3: #5c0606;
--background-secondary-1: #ffffff;
--background-secondary-2: #f3f3f3;
--background-secondary-3: #ebedef;
--background-secondary-4: #e3e5e8;
--background-secondary-5: #caccce;
--background-secondary-1: rgba(255, 255, 255, 0.75);
--background-secondary-2: rgba(243, 243, 243, 0.8);
--background-secondary-3: rgba(235, 237, 239, 0.75);
--background-secondary-4: rgba(227, 229, 232, 0.75);
--background-secondary-5: rgba(202, 204, 206, 0.75);
--control-color: #ff5b5b;
--epic-color: #a335ee;
--rare-color: #0070dd;
Expand All @@ -384,11 +390,11 @@ body {
--background-primary: #162c57;
--background-primary-2: #394c70;
--background-primary-3: #06102c;
--background-secondary-1: #666666;
--background-secondary-2: #555555;
--background-secondary-3: #444444;
--background-secondary-4: #333333;
--background-secondary-5: #222222;
--background-secondary-1: rgba(102, 102, 102, 0.85);
--background-secondary-2: rgba(85, 85, 85, 0.9);
--background-secondary-3: rgba(68, 68, 68, 0.8);
--background-secondary-4: rgba(51, 51, 51, 0.8);
--background-secondary-5: rgba(34, 34, 34, 0.8);
--control-color: #335eff;
--epic-color: #a335ee;
--rare-color: #0070dd;
Expand All @@ -406,17 +412,20 @@ body {

--title-logo: url("assets/images/alliance-1.png");
--theme-logo: url("assets/images/alliance-1.png");

--mat-sidenav-content-background-color: rgba(0, 0, 0, 0);
--mat-sidenav-container-background-color: rgba(0, 0, 0, 0);
}

.alliance-theme-light-theme {
--background-primary: #162c57;
--background-primary-2: #394c70;
--background-primary-3: #06102c;
--background-secondary-1: #ffffff;
--background-secondary-2: #f3f3f3;
--background-secondary-3: #ebedef;
--background-secondary-4: #e3e5e8;
--background-secondary-5: #caccce;
--background-secondary-1: rgba(255, 255, 255, 0.75);
--background-secondary-2: rgba(243, 243, 243, 0.8);
--background-secondary-3: rgba(235, 237, 239, 0.75);
--background-secondary-4: rgba(227, 229, 232, 0.75);
--background-secondary-5: rgba(202, 204, 206, 0.75);
--control-color: #335eff;
--epic-color: #a335ee;
--rare-color: #0070dd;
Expand Down Expand Up @@ -551,7 +560,7 @@ body {
.mdc-snackbar__surface {
background-color: var(--background-secondary-4) !important;
}

&.text-1 {
* {
color: var(--text-1) !important;
Expand Down
14 changes: 13 additions & 1 deletion wowup-electron/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ a[href^="ftp://"]
/* Technically not supported in Electron yet */
}

.cata-bg {
background-image: url("~assets/images/wow-cata-background.jpg");
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-size: cover;
background-position: center;
z-index: -10;
}

.selectable {
user-select: text !important;
-webkit-user-select: text !important;
Expand Down Expand Up @@ -663,4 +675,4 @@ th.mat-header-cell .mat-sort-header-container.mat-sort-header-sorted .mat-sort-h
transform: scale(0.95);
box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
}
}
}

0 comments on commit 741297a

Please sign in to comment.