diff --git a/src/i18n/README.md b/src/i18n/README.md
index 182e730b..cf5f1de4 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -515,3 +515,9 @@ Update 21/06/2022 20:39 UTC
Update 23/06/2022 04:00 UTC
* `settings.option.connectivity.lastfmScrobble.filterTypes`: Added to `en_US`
+
+
+Update 03/07/2022 20:00 UTC
+
+* `term.plugins`: Added to `en_US`
+* `settings.header.visual.styles`: Added to `en_US`
\ No newline at end of file
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index f2ef03fd..aa4aec03 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -90,9 +90,6 @@
"term.size": "Size",
"term.size.normal": "Normal",
"term.size.compact": "Compact",
- "term.scroll": "Scroll Mode",
- "term.scroll.infinite": "Infinite",
- "term.scroll.paged": "${songsPerPage} per page",
"term.enable": "Enable",
"term.disable": "Disable",
"term.enabled": "Enabled",
@@ -139,7 +136,6 @@
"term.recentStations": "Recent Stations",
"term.personalStations": "Personal Stations",
"term.amLive": "Apple Music Live",
- "term.live": "LIVE",
"term.language": "Language",
"term.funLanguages": "Fun",
"term.noLyrics": "Instrumental Track / No Lyrics.",
@@ -184,8 +180,9 @@
"term.top": "Top",
"term.version": "Version",
"term.noVideos": "No videos found.",
- "term.plugin": "Plug-in",
- "term.pluginMenu": "Plug-in Menu",
+ "term.plugins": "Plugins",
+ "term.plugin": "Plugin",
+ "term.pluginMenu": "Plugins Menu",
"term.pluginMenu.none": "No interactive plugins",
"term.replay": "Replay",
"term.uniqueAlbums": "Unique Albums",
@@ -210,9 +207,6 @@
"term.zoomout" : "Zoom Out",
"term.zoomreset" : "Reset Zoom",
"term.fullscreen" : "Fullscreen",
- "term.nowPlaying": "Now Playing",
- "home.syncFavorites": "Sync Favorites",
- "home.syncFavorites.gettingArtists": "Getting Favorited Artists...",
"home.title": "Home",
"home.recentlyPlayed": "Recently Played",
"home.recentlyAdded": "Recently Added",
@@ -233,8 +227,6 @@
"podcast.episodes": "Episodes",
"podcast.playEpisode": "Play Episode",
"podcast.website": "Podcast Website",
- "action.favorite": "Favorite",
- "action.removeFavorite": "Remove Favorite",
"action.hideLibrary": "Hide Library",
"action.showLibrary": "Show Library",
"action.cut": "Cut",
@@ -308,7 +300,6 @@
"action.createNew": "Create New...",
"action.openArtworkInBrowser": "Open artwork in browser",
"action.scrollToTop": "Scroll to top",
- "action.refresh": "Refresh",
"menubar.options.view": "View",
"menubar.options.reload": "Reload",
"menubar.options.forcereload": "Force Reload",
@@ -419,8 +410,6 @@
"settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E168_1": "Jasmine Macchiato",
"settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z3600": "Hokkaido Milk Tea",
"settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500A": "Moonlight Softcake",
- "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500B": "Clafoutis aux Cerises",
- "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500C": "Uji Matcha Mochi",
"settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "Brown Sugar Creme Brûlée Milk",
"settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "Cuddle Warmth",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️",
@@ -455,15 +444,10 @@
"settings.header.visual": "Visual",
"settings.header.visual.description": "Adjust the visual settings for Cider.",
"settings.option.visual.windowStyle": "Window Style",
- "settings.option.visual.customAccentColor": "Custom Accent Color",
- "settings.option.visual.accentColor": "Accent Color",
- "settings.option.visual.purplePodcastPlaybackBar": "Purple Playback Bar for Podcasts",
- "settings.option.visual.windowColor": "Window Tint Color",
"settings.option.visual.windowBackgroundStyle": "Window Background Style",
"settings.header.visual.windowBackgroundStyle.none": "None",
"settings.header.visual.windowBackgroundStyle.artwork": "Artwork",
"settings.header.visual.windowBackgroundStyle.image": "Image",
- "settings.header.visual.windowBackgroundStyle.color": "Color Tint",
"settings.option.visual.animatedArtwork": "Animated Artwork",
"settings.header.visual.animatedArtwork.always": "Always",
"settings.header.visual.animatedArtwork.limited": "Limited to pages and special entries",
@@ -489,6 +473,7 @@
"settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install",
"settings.prompt.visual.theme.uninstallTheme": "Are you sure you want to uninstall {{ theme }}?",
"settings.option.visual.theme.checkForUpdates": "Check for updates",
+ "settings.header.visual.styles": "Styles",
"settings.option.visual.theme.manageStyles": "Manage Styles",
"settings.option.visual.theme.uninstall": "Uninstall",
"settings.option.visual.theme.viewInfo": "View Info",
@@ -638,4 +623,4 @@
"oobe.visual.suggestingThemes.community3": "Dracula",
"oobe.visual.suggestingThemes.community3.text": "The iconic Dracula color scheme.",
"oobe.amsignin.title": ""
-}
+}
\ No newline at end of file
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 256b937d..aa4aec03 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -180,8 +180,9 @@
"term.top": "Top",
"term.version": "Version",
"term.noVideos": "No videos found.",
- "term.plugin": "Plug-in",
- "term.pluginMenu": "Plug-in Menu",
+ "term.plugins": "Plugins",
+ "term.plugin": "Plugin",
+ "term.pluginMenu": "Plugins Menu",
"term.pluginMenu.none": "No interactive plugins",
"term.replay": "Replay",
"term.uniqueAlbums": "Unique Albums",
@@ -472,6 +473,7 @@
"settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install",
"settings.prompt.visual.theme.uninstallTheme": "Are you sure you want to uninstall {{ theme }}?",
"settings.option.visual.theme.checkForUpdates": "Check for updates",
+ "settings.header.visual.styles": "Styles",
"settings.option.visual.theme.manageStyles": "Manage Styles",
"settings.option.visual.theme.uninstall": "Uninstall",
"settings.option.visual.theme.viewInfo": "View Info",
@@ -621,4 +623,4 @@
"oobe.visual.suggestingThemes.community3": "Dracula",
"oobe.visual.suggestingThemes.community3.text": "The iconic Dracula color scheme.",
"oobe.amsignin.title": ""
-}
+}
\ No newline at end of file
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index da39d7eb..876c8f2d 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -64,7 +64,7 @@ export class BrowserWindow {
"pages/groupings",
"pages/charts",
"pages/settings",
- "pages/installed-themes",
+ //"pages/installed-themes",
"pages/listen_now",
"pages/radio",
"pages/home",
@@ -80,13 +80,12 @@ export class BrowserWindow {
"pages/about",
"pages/library-videos",
"pages/remote-pair",
- "pages/themes-github",
- "pages/plugins-github",
+ //"pages/themes-github",
+ //"pages/plugins-github",
"pages/replay",
"pages/audiolabs",
"pages/zoo",
"pages/plugin-renderer",
- "pages/keybinds",
"pages/oobe",
"components/app-content",
"components/sidebar",
@@ -126,6 +125,10 @@ export class BrowserWindow {
"components/hello-world",
"components/inline-collection-list",
"components/settings-window",
+ "components/settings-keybinds",
+ "components/settings-themes",
+ "components/settings-themes-github",
+ "components/settings-plugins-github",
],
appRoutes: [
{
@@ -275,6 +278,10 @@ export class BrowserWindow {
page: "replay",
component: ``,
condition: `$root.page == 'replay'`
+ }, {
+ page: "keydinds",
+ component: ``,
+ condition: `$root.page == 'keybinds-settings'`
}
]
},
@@ -1562,4 +1569,4 @@ export class BrowserWindow {
server2.start();
console.log('remote broadcasted')
}
-}
+}
\ No newline at end of file
diff --git a/src/renderer/assets/feather/plugins.svg b/src/renderer/assets/feather/plugins.svg
new file mode 100644
index 00000000..76eff3b0
--- /dev/null
+++ b/src/renderer/assets/feather/plugins.svg
@@ -0,0 +1,48 @@
+
+
diff --git a/src/renderer/assets/feather/style.svg b/src/renderer/assets/feather/style.svg
new file mode 100644
index 00000000..e6eae9e2
--- /dev/null
+++ b/src/renderer/assets/feather/style.svg
@@ -0,0 +1,41 @@
+
+
diff --git a/src/renderer/less/macos.less b/src/renderer/less/macos.less
index b7cd49e4..4819a263 100644
--- a/src/renderer/less/macos.less
+++ b/src/renderer/less/macos.less
@@ -1,6 +1,6 @@
body[platform="darwin"] {
html {
- background: transparent!important;
+ background: transparent !important;
}
&.notransparency::before {
@@ -11,6 +11,7 @@ body[platform="darwin"] {
&.simplebg {
background: transparent;
}
+
&::before {
display: none;
}
@@ -26,6 +27,7 @@ body[platform="darwin"] {
.app-chrome .app-chrome-item.search {
margin-right: 12px;
}
+
.app-chrome .app-mainmenu {
width: 46px;
}
@@ -35,15 +37,20 @@ body[platform="darwin"] {
}
}
- // &::after {
- // position: fixed;
- // top:0;left:0;right:0;bottom:0;
- // box-shadow: inset 0px 0px .5px 1px rgb(200 200 200 / 40%);
- // border-radius: 10px;
- // content: " ";
- // z-index: 999999;
- // pointer-events: none;
- // }
+ &[window-state="normal"] {
+ &::after {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ box-shadow: inset 0px 0px .5px 1px rgb(200 200 200 / 40%);
+ border-radius: 10px;
+ content: " ";
+ z-index: 999999;
+ pointer-events: none;
+ }
+ }
}
#app-main {
@@ -58,6 +65,13 @@ body[platform="darwin"] {
}
}
+ .settings-window.maxed {
+ .tabs>.col-auto {
+ transition: padding-top .3s linear;
+ padding-top: var(--chromeHeight1);
+ }
+ }
+
#apple-music-video-player-controls #player-exit {
margin-top: 18px;
left: 70px;
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index d9bb93d8..fe6d9d4e 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -23,8 +23,7 @@
.github-themes-page {
display: flex;
flex-direction: column;
- padding: 0px;
- height: calc(100% - var(--navigationBarHeight));
+ height: 100%;
.github-avatar {
height: 42px;
@@ -51,10 +50,12 @@
}
.repos-list {
- height: 100%;
- overflow-y: overlay;
+ height: 85%;
width: 320px;
font-size: 14px;
+ position: absolute;
+ overflow: overlay;
+ padding-bottom: 16px;
> .list-group {
margin: 0px;
@@ -74,11 +75,14 @@
}
.github-preview {
- height: 100%;
+ height: 85%;
flex: 1;
- background: var(--color2);
padding: 16px 32px;
- overflow-y: overlay;
+ overflow: auto;
+ position: fixed;
+ // width: calc(100% - 574px);
+ margin-left: 320px;
+ padding-bottom: 16px;
}
.gh-content {
@@ -90,6 +94,178 @@
.gh-header {
padding: 16px;
+
+ .header-text {
+ position: initial !important;
+ justify-content: left !important;
+ }
+ }
+
+ .installed-themes-page {
+ .style-editor-container {
+ height: 100%;
+ flex: 1;
+ background: var(--color2);
+ padding: 0px;
+ overflow-y: overlay;
+
+ .list-group-item {
+ border-radius: 0px;
+ }
+ }
+ }
+}
+
+//Styles Page
+.installed-themes-page {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ overflow: hidden;
+ .themeContextMenu {
+ background: transparent;
+ color: var(--keyColor);
+ border: 0px;
+ }
+
+ .list-group-item {
+ &.addon {
+ background: rgb(86 86 86 / 20%);
+ }
+
+ &.applied {
+ background: var(--keyColor-disabled);
+ pointer-events: none;
+ }
+ }
+
+ .repo-header {
+ font-size: 16px;
+ position: sticky;
+ top: 0;
+ left: 0;
+ right: 0;
+ width: 100%;
+ height: 50px;
+ z-index: 1;
+ background: rgba(36, 36, 36, 0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ backdrop-filter: var(--glassFilter);
+ overflow: hidden;
+ border-bottom: 1px solid rgb(0 0 0 / 18%);
+ border-top: 1px solid rgb(135 135 135 / 18%);
+ }
+
+ .gh-header {
+ z-index: 5;
+ padding: 16px;
+ flex: 0 0 auto;
+ height: 64px;
+ display: grid;
+ align-content: center;
+ .header-text {
+ position: initial !important;
+ justify-content: left !important;
+ }
+ }
+
+ .gh-content {
+ display: flex;
+ flex-direction: row;
+ padding: 0px;
+ height: 100%;
+ flex: 0 0 auto;
+
+ .repos-list {
+ width: 320px;
+ overflow: overlay;
+ height: 90%;
+ font-size: 14px;
+ white-space: nowrap;
+
+ > .list-group {
+ margin: 0px;
+ padding-bottom: 16px;
+ }
+
+ .list-group-item {
+ padding: 12px 6px;
+
+ &:hover {
+ filter: brightness(1.2);
+ }
+
+ &:active {
+ filter: brightness(0.8);
+ }
+ }
+ }
+
+ .style-editor-container {
+ height: 100%;
+ flex: 1;
+ padding: 0px;
+ width: 100%;
+ overflow: hidden;
+
+ .stylestack-editor {
+ padding-bottom: 16px;
+ }
+
+ .list-group-item {
+ border-radius: 0px;
+ }
+ }
+ }
+
+ .stylestack-editor {
+ width: 100%;
+
+ .btn,
+ .btn-group {
+ width: 100%;
+ }
+
+ .themeLabel {
+ display: flex;
+ align-items: center;
+ }
+
+ .handle {
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .list-group-item {
+
+ &:hover {
+ cursor: grab;
+ }
+
+ &:active {
+ cursor: grabbing;
+ }
+ }
+
+ .removeItem {
+ border: 0px;
+ background: transparent;
+ height: 32px;
+ font-weight: bold;
+ color: var(--textColor);
+ cursor: pointer;
+ }
+
+ .stylesDropdown {
+ > .dropdown-menu {
+ height: 300px;
+ overflow-y: overlay;
+ }
+ }
}
}
@@ -1286,107 +1462,6 @@
/* Artist Page End */
-
-.installed-themes-page {
-
- .themeContextMenu {
- background: transparent;
- color: var(--keyColor);
- border: 0px;
- }
-
- .list-group-item {
- &.addon {
- background: rgb(86 86 86 / 20%);
- }
-
- &.applied {
- background: var(--keyColor-disabled);
- pointer-events: none;
- }
- }
-
- .repo-header {
- font-size: 16px;
- position: sticky;
- top: 0;
- left: 0;
- right: 0;
- width: 100%;
- height: 50px;
- z-index: 1;
- background: rgba(36, 36, 36, 0.5);
- display: flex;
- justify-content: center;
- align-items: center;
- backdrop-filter: var(--glassFilter);
- overflow: hidden;
- border-bottom: 1px solid rgb(0 0 0 / 18%);
- border-top: 1px solid rgb(135 135 135 / 18%);
- }
-
- .style-editor-container {
- height: 100%;
- flex: 1;
- background: var(--color2);
- padding: 0px;
- overflow-y: overlay;
-
- .list-group-item {
- border-radius: 0px;
- }
- }
-
-
- .stylestack-editor {
- width: 100%;
-
- .btn,
- .btn-group {
- width: 100%;
- }
-
- .themeLabel {
- display: flex;
- align-items: center;
- }
-
- .handle {
- height: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-
- .list-group-item {
-
- &:hover {
- cursor: grab;
- }
-
- &:active {
- cursor: grabbing;
- }
- }
-
- .removeItem {
- border: 0px;
- background: transparent;
- height: 32px;
- font-weight: bold;
- color: var(--textColor);
- cursor: pointer;
- }
-
- .stylesDropdown {
- > .dropdown-menu {
- height: 300px;
- overflow-y: overlay;
- }
- }
- }
-}
-
// Settings page
.settings-page {
padding: 0px;
@@ -2000,7 +2075,7 @@
.settings-window {
background: var(--baseColorMix);
- max-width: 80%;
+ max-width: 90%;
max-height: 90%;
width: 100%;
height: 100%;
@@ -2037,6 +2112,9 @@
display: flex;
gap: 10px;
align-items: center;
+
+ :nth-child(2) {
+ }
}
@@ -2095,6 +2173,11 @@
background-color: rgb(196, 43, 28)
}
+ &.back-btn {
+ left: 10px;
+ right: unset;
+ }
+
&.minmax-btn {
right: 52px;
@@ -2122,6 +2205,9 @@
> .col-auto {
width: 230px;
+ overflow-x: hidden;
+ overflow-y: overlay;
+ transition: width 0.25s ease-in-out;
}
.tab-content {
@@ -2133,9 +2219,48 @@
overflow-y: overlay;
height: 100%;
background-color: var(--panelColor2);
+ padding:0px;
padding-top: 48px;
border-left: 1px solid var(--borderColor);
}
+
+ .github-themes-page, .installed-themes-page {
+ .header-text {
+ font-size: 1.25em;
+ }
+ }
+
+ .tab-pane {
+ height:100%;
+ }
+
+ .settings-tab-content {
+ height:100%;
+ }
+
+ &.no-sidebar {
+ .gh-header {
+ >.row {
+ &:last-child {
+ padding-right: 90px;
+ }
+ }
+ }
+ .tab-content {
+ padding-top:0px;
+ }
+
+ .tabs {
+ .nav-pills .nav-link {
+ :nth-child(2) {
+ display: none;
+ }
+ }
+ >.col-auto {
+ width: 80px;
+ }
+ }
+ }
}
}
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index c1b4026c..36e18c36 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1120,7 +1120,7 @@ const app = new Vue({
message: `[Themes] ${theme.name} has an update available.`
})
notify.on("click", () => {
- app.appRoute("themes-github")
+ app.openSettingsPage("github-themes")
notyf.dismiss(notify)
})
}
@@ -4441,21 +4441,33 @@ const app = new Vue({
case "audiolabs":
this.$store.state.pageState.settings.currentTabIndex = 2
break;
- case "visual":
+ case "styles":
this.$store.state.pageState.settings.currentTabIndex = 3
break;
- case "lyrics":
+ case "visual":
this.$store.state.pageState.settings.currentTabIndex = 4
break;
- case "connectivity":
+ case "plugins":
this.$store.state.pageState.settings.currentTabIndex = 5
break;
- case "advanced":
+ case "lyrics":
this.$store.state.pageState.settings.currentTabIndex = 6
break;
- case "keybindings":
+ case "connectivity":
this.$store.state.pageState.settings.currentTabIndex = 7
break;
+ case "advanced":
+ this.$store.state.pageState.settings.currentTabIndex = 8
+ break;
+ case "keybindings":
+ this.$store.state.pageState.settings.currentTabIndex = 9
+ break;
+ case "github-themes":
+ this.$store.state.pageState.settings.currentTabIndex = 10
+ break;
+ case "github-plugins":
+ this.$store.state.pageState.settings.currentTabIndex = 11
+ break;
}
app.modals.settings = true
},
diff --git a/src/renderer/style.css b/src/renderer/style.css
index cc9b934e..1b2e42da 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -12985,8 +12985,7 @@ input[type=checkbox][switch]:checked:active::before {
.github-themes-page {
display: flex;
flex-direction: column;
- padding: 0px;
- height: calc(100% - var(--navigationBarHeight));
+ height: 100%;
}
.github-themes-page .github-avatar {
height: 42px;
@@ -13009,10 +13008,12 @@ input[type=checkbox][switch]:checked:active::before {
margin: 0px;
}
.github-themes-page .repos-list {
- height: 100%;
- overflow-y: overlay;
+ height: 85%;
width: 320px;
font-size: 14px;
+ position: absolute;
+ overflow: overlay;
+ padding-bottom: 16px;
}
.github-themes-page .repos-list > .list-group {
margin: 0px;
@@ -13027,11 +13028,13 @@ input[type=checkbox][switch]:checked:active::before {
filter: brightness(0.8);
}
.github-themes-page .github-preview {
- height: 100%;
+ height: 85%;
flex: 1;
- background: var(--color2);
padding: 16px 32px;
- overflow-y: overlay;
+ overflow: auto;
+ position: fixed;
+ margin-left: 320px;
+ padding-bottom: 16px;
}
.github-themes-page .gh-content {
display: flex;
@@ -13042,6 +13045,143 @@ input[type=checkbox][switch]:checked:active::before {
.github-themes-page .gh-header {
padding: 16px;
}
+.github-themes-page .gh-header .header-text {
+ position: initial !important;
+ justify-content: left !important;
+}
+.github-themes-page .installed-themes-page .style-editor-container {
+ height: 100%;
+ flex: 1;
+ background: var(--color2);
+ padding: 0px;
+ overflow-y: overlay;
+}
+.github-themes-page .installed-themes-page .style-editor-container .list-group-item {
+ border-radius: 0px;
+}
+.installed-themes-page {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ overflow: hidden;
+}
+.installed-themes-page .themeContextMenu {
+ background: transparent;
+ color: var(--keyColor);
+ border: 0px;
+}
+.installed-themes-page .list-group-item.addon {
+ background: rgba(86, 86, 86, 0.2);
+}
+.installed-themes-page .list-group-item.applied {
+ background: var(--keyColor-disabled);
+ pointer-events: none;
+}
+.installed-themes-page .repo-header {
+ font-size: 16px;
+ position: sticky;
+ top: 0;
+ left: 0;
+ right: 0;
+ width: 100%;
+ height: 50px;
+ z-index: 1;
+ background: rgba(36, 36, 36, 0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ backdrop-filter: var(--glassFilter);
+ overflow: hidden;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.18);
+ border-top: 1px solid rgba(135, 135, 135, 0.18);
+}
+.installed-themes-page .gh-header {
+ z-index: 5;
+ padding: 16px;
+ flex: 0 0 auto;
+ height: 64px;
+ display: grid;
+ align-content: center;
+}
+.installed-themes-page .gh-header .header-text {
+ position: initial !important;
+ justify-content: left !important;
+}
+.installed-themes-page .gh-content {
+ display: flex;
+ flex-direction: row;
+ padding: 0px;
+ height: 100%;
+ flex: 0 0 auto;
+}
+.installed-themes-page .gh-content .repos-list {
+ width: 320px;
+ overflow: overlay;
+ height: 90%;
+ font-size: 14px;
+ white-space: nowrap;
+}
+.installed-themes-page .gh-content .repos-list > .list-group {
+ margin: 0px;
+ padding-bottom: 16px;
+}
+.installed-themes-page .gh-content .repos-list .list-group-item {
+ padding: 12px 6px;
+}
+.installed-themes-page .gh-content .repos-list .list-group-item:hover {
+ filter: brightness(1.2);
+}
+.installed-themes-page .gh-content .repos-list .list-group-item:active {
+ filter: brightness(0.8);
+}
+.installed-themes-page .gh-content .style-editor-container {
+ height: 100%;
+ flex: 1;
+ padding: 0px;
+ width: 100%;
+ overflow: hidden;
+}
+.installed-themes-page .gh-content .style-editor-container .stylestack-editor {
+ padding-bottom: 16px;
+}
+.installed-themes-page .gh-content .style-editor-container .list-group-item {
+ border-radius: 0px;
+}
+.installed-themes-page .stylestack-editor {
+ width: 100%;
+}
+.installed-themes-page .stylestack-editor .btn,
+.installed-themes-page .stylestack-editor .btn-group {
+ width: 100%;
+}
+.installed-themes-page .stylestack-editor .themeLabel {
+ display: flex;
+ align-items: center;
+}
+.installed-themes-page .stylestack-editor .handle {
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.installed-themes-page .stylestack-editor .list-group-item:hover {
+ cursor: grab;
+}
+.installed-themes-page .stylestack-editor .list-group-item:active {
+ cursor: grabbing;
+}
+.installed-themes-page .stylestack-editor .removeItem {
+ border: 0px;
+ background: transparent;
+ height: 32px;
+ font-weight: bold;
+ color: var(--textColor);
+ cursor: pointer;
+}
+.installed-themes-page .stylestack-editor .stylesDropdown > .dropdown-menu {
+ height: 300px;
+ overflow-y: overlay;
+}
.library-page {
padding: 0px;
}
@@ -14037,81 +14177,6 @@ input[type=checkbox][switch]:checked:active::before {
background: rgba(200, 200, 200, 0.1);
}
/* Artist Page End */
-.installed-themes-page .themeContextMenu {
- background: transparent;
- color: var(--keyColor);
- border: 0px;
-}
-.installed-themes-page .list-group-item.addon {
- background: rgba(86, 86, 86, 0.2);
-}
-.installed-themes-page .list-group-item.applied {
- background: var(--keyColor-disabled);
- pointer-events: none;
-}
-.installed-themes-page .repo-header {
- font-size: 16px;
- position: sticky;
- top: 0;
- left: 0;
- right: 0;
- width: 100%;
- height: 50px;
- z-index: 1;
- background: rgba(36, 36, 36, 0.5);
- display: flex;
- justify-content: center;
- align-items: center;
- backdrop-filter: var(--glassFilter);
- overflow: hidden;
- border-bottom: 1px solid rgba(0, 0, 0, 0.18);
- border-top: 1px solid rgba(135, 135, 135, 0.18);
-}
-.installed-themes-page .style-editor-container {
- height: 100%;
- flex: 1;
- background: var(--color2);
- padding: 0px;
- overflow-y: overlay;
-}
-.installed-themes-page .style-editor-container .list-group-item {
- border-radius: 0px;
-}
-.installed-themes-page .stylestack-editor {
- width: 100%;
-}
-.installed-themes-page .stylestack-editor .btn,
-.installed-themes-page .stylestack-editor .btn-group {
- width: 100%;
-}
-.installed-themes-page .stylestack-editor .themeLabel {
- display: flex;
- align-items: center;
-}
-.installed-themes-page .stylestack-editor .handle {
- height: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-.installed-themes-page .stylestack-editor .list-group-item:hover {
- cursor: grab;
-}
-.installed-themes-page .stylestack-editor .list-group-item:active {
- cursor: grabbing;
-}
-.installed-themes-page .stylestack-editor .removeItem {
- border: 0px;
- background: transparent;
- height: 32px;
- font-weight: bold;
- color: var(--textColor);
- cursor: pointer;
-}
-.installed-themes-page .stylestack-editor .stylesDropdown > .dropdown-menu {
- height: 300px;
- overflow-y: overlay;
-}
.settings-page {
padding: 0px;
}
@@ -14624,7 +14689,7 @@ input[type=checkbox][switch]:checked:active::before {
}
.settings-panel .settings-window {
background: var(--baseColorMix);
- max-width: 80%;
+ max-width: 90%;
max-height: 90%;
width: 100%;
height: 100%;
@@ -14708,6 +14773,10 @@ input[type=checkbox][switch]:checked:active::before {
.settings-panel .settings-window .close-btn:hover {
background-color: #c42b1c;
}
+.settings-panel .settings-window .close-btn.back-btn {
+ left: 10px;
+ right: unset;
+}
.settings-panel .settings-window .close-btn.minmax-btn {
right: 52px;
}
@@ -14728,6 +14797,9 @@ input[type=checkbox][switch]:checked:active::before {
}
.settings-panel .settings-window .tabs > .col-auto {
width: 230px;
+ overflow-x: hidden;
+ overflow-y: overlay;
+ transition: width 0.25s ease-in-out;
}
.settings-panel .settings-window .tabs .tab-content {
margin: 0 !important;
@@ -14736,9 +14808,32 @@ input[type=checkbox][switch]:checked:active::before {
overflow-y: overlay;
height: 100%;
background-color: var(--panelColor2);
+ padding: 0px;
padding-top: 48px;
border-left: 1px solid var(--borderColor);
}
+.settings-panel .settings-window .github-themes-page .header-text,
+.settings-panel .settings-window .installed-themes-page .header-text {
+ font-size: 1.25em;
+}
+.settings-panel .settings-window .tab-pane {
+ height: 100%;
+}
+.settings-panel .settings-window .settings-tab-content {
+ height: 100%;
+}
+.settings-panel .settings-window.no-sidebar .gh-header > .row:last-child {
+ padding-right: 90px;
+}
+.settings-panel .settings-window.no-sidebar .tab-content {
+ padding-top: 0px;
+}
+.settings-panel .settings-window.no-sidebar .tabs .nav-pills .nav-link :nth-child(2) {
+ display: none;
+}
+.settings-panel .settings-window.no-sidebar .tabs > .col-auto {
+ width: 80px;
+}
#hid___BV_tab_button__ {
display: none;
}
@@ -17973,7 +18068,7 @@ body[platform='darwin'] .app-chrome .app-chrome-item > .app-mainmenu {
padding: 15px;
}
body[platform="darwin"] html {
- background: transparent!important;
+ background: transparent !important;
}
body[platform="darwin"].notransparency::before {
display: none;
@@ -18000,6 +18095,18 @@ body[platform="darwin"] #app.twopanel .app-chrome .app-mainmenu {
body[platform="darwin"] #app.twopanel .app-chrome.chrome-bottom {
background-color: var(--macOSChromeColor);
}
+body[platform="darwin"] #app[window-state="normal"]::after {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ box-shadow: inset 0px 0px 0.5px 1px rgba(200, 200, 200, 0.4);
+ border-radius: 10px;
+ content: " ";
+ z-index: 999999;
+ pointer-events: none;
+}
body[platform="darwin"] #app-main {
background-color: transparent;
}
@@ -18009,6 +18116,10 @@ body[platform="darwin"] #app-main .app-navigation {
body[platform="darwin"] #app-main #app-content {
background-color: #1e1e1e6b;
}
+body[platform="darwin"] .settings-window.maxed .tabs > .col-auto {
+ transition: padding-top 0.3s linear;
+ padding-top: var(--chromeHeight1);
+}
body[platform="darwin"] #apple-music-video-player-controls #player-exit {
margin-top: 18px;
left: 70px;
diff --git a/src/renderer/views/components/settings-keybinds.ejs b/src/renderer/views/components/settings-keybinds.ejs
new file mode 100644
index 00000000..24805c29
--- /dev/null
+++ b/src/renderer/views/components/settings-keybinds.ejs
@@ -0,0 +1,323 @@
+
+
+
\ No newline at end of file
diff --git a/src/renderer/views/components/settings-plugins-github.ejs b/src/renderer/views/components/settings-plugins-github.ejs
new file mode 100644
index 00000000..4bd927ed
--- /dev/null
+++ b/src/renderer/views/components/settings-plugins-github.ejs
@@ -0,0 +1,188 @@
+
+
diff --git a/src/renderer/views/components/settings-themes-github.ejs b/src/renderer/views/components/settings-themes-github.ejs
new file mode 100644
index 00000000..24f4aec9
--- /dev/null
+++ b/src/renderer/views/components/settings-themes-github.ejs
@@ -0,0 +1,197 @@
+
+
\ No newline at end of file
diff --git a/src/renderer/views/components/settings-themes.ejs b/src/renderer/views/components/settings-themes.ejs
new file mode 100644
index 00000000..57f38d10
--- /dev/null
+++ b/src/renderer/views/components/settings-themes.ejs
@@ -0,0 +1,367 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs
index 1236d71d..876fad04 100644
--- a/src/renderer/views/components/settings-window.ejs
+++ b/src/renderer/views/components/settings-window.ejs
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs
index dbb99395..453fd424 100644
--- a/src/renderer/views/pages/installed-themes.ejs
+++ b/src/renderer/views/pages/installed-themes.ejs
@@ -1,5 +1,7 @@
- -->
\ No newline at end of file
diff --git a/src/renderer/views/pages/plugins-github.ejs b/src/renderer/views/pages/plugins-github.ejs
index 15a08986..fb4d46d7 100644
--- a/src/renderer/views/pages/plugins-github.ejs
+++ b/src/renderer/views/pages/plugins-github.ejs
@@ -1,5 +1,7 @@
-