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.

Sign up for GitHub

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

feat: modernize js and add connect bar styles #208

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

feat: modernize js and add connect bar styles #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6264dd2
feat: add styles for now playing connect bar
sanoojes Sep 13, 2024
a2f4a16
fix: comply with biome
sanoojes Sep 13, 2024
7f73f23
fix: comply with biome
sanoojes Sep 13, 2024
271ba34
chore: Migrate from node-sass to sass
sanoojes Sep 13, 2024
7239734
feat: add connect bar styles
sanoojes Sep 13, 2024
1f08962
feat: add Compact Connect Bar Snippet
sanoojes Sep 13, 2024
2efe5a4
chore: lint code
sanoojes Sep 13, 2024
40aeb43
chore: compile app.css
sanoojes Sep 13, 2024
0e49478
feat: add compact connect bar toggle
sanoojes Sep 13, 2024
d9d81f9
revert
ohitstom Sep 25, 2024
b77de42
Merge branch 'Comfy-Themes:main' into main
sanoojes Sep 25, 2024
bf531ec
reformat
ohitstom Sep 25, 2024
f15ee37
Refactor now playing bar width calculation
ohitstom Sep 25, 2024
a69399e
Remove unused connect bar description
ohitstom Sep 25, 2024
8110b3f
fix width issue on 47
ohitstom Sep 25, 2024
c53dc9a
remove unneeded changes
ohitstom Sep 25, 2024
b4630fc
Update package.json and user.css
ohitstom Sep 25, 2024
b46ba94
Merge branch 'main' into main
sanoojes Sep 25, 2024
fa79797
Chore: remove unused template literals
sanoojes Sep 25, 2024
807f161
fix: broken color scheme
sanoojes Sep 25, 2024
62d0ae9
fix: getting panel width from local storage
sanoojes Sep 25, 2024
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
2 changes: 1 addition & 1 deletion Comfy/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
overflow: hidden;

.main-userWidget-dropDownMenu .main-contextMenu-menuItemButton:has(span + svg)::before {
border-bottom: 1px solid rgba(var(--spice-rgb-selected-row), .1);
border-bottom: 1px solid rgba(var(--spice-rgb-selected-row), 0.1);
content: "";
left: 0;
pointer-events: none;
Expand Down
7 changes: 3 additions & 4 deletions Comfy/assets/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
}
}


.main-entityHeader-backgroundColor {
background: none !important;
}
Expand All @@ -41,7 +40,7 @@

.artist-artistOverview-artistOverviewContent,
.main-actionBarBackground-background {
min-height: calc(100vh - min(30vh, clamp(250px, 250px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424*150, 400px)) - 128px - 12px) !important;
min-height: calc(100vh - min(30vh, clamp(250px, 250px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424 * 150, 400px)) - 128px - 12px) !important;
}
}

Expand All @@ -52,7 +51,7 @@
var(--tracklist-gradient-noise) !important;
background-color: transparent !important;
height: calc(100% - 250px);
min-height: calc(100vh - min(30vh, clamp(250px, 250px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424*150, 400px)) - 128px);
min-height: calc(100vh - min(30vh, clamp(250px, 250px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424 * 150, 400px)) - 128px);
background-size: auto 100%, 300px var(--tracklist-gradient-height);
background-repeat: repeat-x;
}
Expand Down Expand Up @@ -202,7 +201,7 @@
margin-left: calc(var(--content-spacing) + 3px);
}

>:first-child:not(:only-child) {
> :first-child:not(:only-child) {
margin-right: calc(var(--content-spacing) + 4px);
}

Expand Down
2 changes: 1 addition & 1 deletion Comfy/assets/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

[role="presentation"]>li>div>div>div>div>div>.x-entityImage-imageContainer {
box-shadow: 0 4px 60px rgba(var(--spice-rgb-shadow), .0) !important;
box-shadow: 0 4px 60px rgba(var(--spice-rgb-shadow), 0) !important;
}
}

Expand Down
10 changes: 8 additions & 2 deletions Comfy/assets/_now_playing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@
}
}
}

// Connect bar
.main-nowPlayingBar-container {
.main-connectBar-connectBar {
margin-left: auto;
width: calc(100vw - var(--cover-art-width) - 32px);
}
}
}

:root #main.Custom-Playbar-Snippet:not(.Playbar-Above-Right-Panel-Snippet) .Root__top-container {
Expand Down Expand Up @@ -139,9 +147,7 @@
}
}
}

}

}
}
}
3 changes: 1 addition & 2 deletions Comfy/assets/_settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
min-height: calc(100% - 60px);

&::after {
content: '';
content: "";
position: absolute;
bottom: 0;
width: calc(100% - 12px);
Expand Down Expand Up @@ -546,5 +546,4 @@
filter: brightness(0.8);
}
}

}
21 changes: 17 additions & 4 deletions Comfy/assets/_snippets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
transition-property: transform, left;
transition-property: transform, left, -webkit-transform;
-webkit-transition-timing-function: linear;
transition-timing-function: linear
transition-timing-function: linear;
}
}
}
Expand All @@ -331,6 +331,19 @@
}
}

&.Compact-Connect-Bar-Snippet {
.main-nowPlayingBar-container {
.main-connectBar-connectBar {
position: absolute;
margin-left: auto;
padding: 0.75rem 1rem;
top: -40%;
right: 0;
width: auto;
}
}
}

&.Remove-Lyrics-Button-Snippet {
.main-nowPlayingBar-lyricsButton {
display: none !important;
Expand Down Expand Up @@ -450,7 +463,7 @@
&.Header-Background {
.main-entityHeader-imageContainerNew {
align-self: center;
left: calc(clamp(128px, 128px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424*104, 232px) + 24px + var(--content-spacing));
left: calc(clamp(128px, 128px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424 * 104, 232px) + 24px + var(--content-spacing));
position: relative;
z-index: 1;
}
Expand All @@ -462,7 +475,7 @@
min-width: fit-content;
box-shadow: 0 2px 4px rgba(var(--spice-rgb-shadow), 0.1);
justify-content: space-evenly !important;
height: calc(clamp(128px, 128px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424*104, 232px) + 48px);
height: calc(clamp(128px, 128px + (100vw - var(--comfy-left-sidebar-width, 0px) - var(--comfy-panel-width, 0px) - 600px)/424 * 104, 232px) + 48px);
}

.main-entityHeader-imageContainerNew+.main-entityHeader-headerText {
Expand All @@ -477,7 +490,7 @@

&.AM-Gradient-Include-Existing-Snippet.Banner-Enabled,
&.Replace-Existing-Banners.Banner-Enabled {
.under-main-view > div:not(.comfy-banner-frame) {
.under-main-view>div:not(.comfy-banner-frame) {
display: none !important;
}
}
Expand Down
7 changes: 4 additions & 3 deletions Comfy/assets/_top_bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
:root .main-topBar-container {

.main-topBar-topbarContent *,
.main-topBar-topbarContentWrapper * {
justify-content: center;
Expand All @@ -7,12 +8,12 @@

.main-topBar-searchBar {
>form input {
height: 32px;
background-color: rgba(var(--spice-rgb-shadow), 0.7);

&::placeholder {
color: rgba(var(--spice-rgb-selected-row), 0.7);
}

height: 32px;
background-color: rgba(var(--spice-rgb-shadow), 0.7);
}
}

Expand Down
Loading