diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html index aa077202a..0f9f02273 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html @@ -1,29 +1,42 @@ - + {{applicationName}} - - + + wb_incandescent + brightness_4 +  {{ 'NavigationBar.ChangeTheme' | translate }} + + exit_to_app - {{ 'NavigationBar.Logout' | translate }} +  {{ 'NavigationBar.Logout' | translate }} @@ -31,28 +44,20 @@ - - -
- - -
- -
-
- - -
-
- + + +
+ + +
+ +
+
+ diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss index 22f291331..d727ac697 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss @@ -55,6 +55,15 @@ font-weight:500; } + +.mat-drawer-content { + position: relative; + overflow: hidden; + z-index: 1; + display: block; + height: 100%; + /* overflow: auto; */ +} // Changed color with !important and changed the font weight /*.active-list-item-dark { background: $accent-dark !important; diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts index 5b142dd58..9dd5b841a 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts @@ -36,6 +36,7 @@ export class MyNavComponent implements OnInit { public async ngOnInit() { this.issuesEnabled = await this.settingsService.issueEnabled().toPromise(); + const customizationSettings = await this.settingsService.getCustomization().toPromise(); console.log("issues enabled: " + this.issuesEnabled); this.theme = this.store.get("theme"); if(!this.theme) { @@ -48,6 +49,7 @@ export class MyNavComponent implements OnInit { { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true, enabled: true, faIcon: null }, // { name: "NavigationBar.Calendar", icon: "calendar_today", link: "/calendar", requiresAdmin: false, enabled: true }, { name: "NavigationBar.Donate", icon: "attach_money", link: "https://www.paypal.me/PlexRequestsNet", externalLink: true, requiresAdmin: true, enabled: true, toolTip: true, style: "color:red;", toolTipMessage: 'NavigationBar.DonateTooltip', faIcon: null }, + { name: "NavigationBar.Donate", icon: "attach_money", link: customizationSettings.customDonationUrl, externalLink: true, requiresAdmin: false, enabled: customizationSettings.enableCustomDonations, toolTip: true, toolTipMessage: customizationSettings.customDonationMessage, faIcon: null }, { name: "NavigationBar.FeatureSuggestion", icon: null, link: "https://features.ombi.io/", externalLink: true, requiresAdmin: false, enabled: true, toolTip: true, toolTipMessage: 'NavigationBar.FeatureSuggestionTooltip', faIcon: "fa-lightbulb-o" }, { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true, enabled: true, faIcon: null }, { name: "NavigationBar.UserPreferences", icon: "person", link: "/user-preferences", requiresAdmin: false, enabled: true, faIcon: null }, @@ -71,10 +73,4 @@ export class MyNavComponent implements OnInit { this.themeChange.emit(newTheme); } } - - // @TIDUSJAR Don't know if we need this method anymore? - public getTheme(){ - return 'active-list-item'; - } - } diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss index a62897e7d..31245eb0e 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss +++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss @@ -43,4 +43,5 @@ $ombi-accent: #258a6d; .options { margin-bottom: 5px; - } \ No newline at end of file + } + diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html index 178978380..7705dde13 100644 --- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html +++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html @@ -6,21 +6,21 @@
- + Application Name - +
- + Application URL - +
- + Custom Logo - +
@@ -37,15 +37,15 @@
- + Custom Donation URL - +
- - Custom Donation URL - + + Custom Donation Message +
@@ -53,10 +53,10 @@ Enable Custom Page
-
- +
+ Custom CSS - +
diff --git a/src/Ombi/ClientApp/src/styles/shared.scss b/src/Ombi/ClientApp/src/styles/shared.scss index 34497f2a2..3259040a5 100644 --- a/src/Ombi/ClientApp/src/styles/shared.scss +++ b/src/Ombi/ClientApp/src/styles/shared.scss @@ -43,13 +43,7 @@ body { scrollbar-width: thin; //firefox -webkit-overflow-scrolling: touch; } -#main-container { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; -} + .spinner-container { position: relative; margin-left: 50%;