Skip to content

Use the color-primary-element* variables #1661

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

Merged
szaimen merged 1 commit into from
May 12, 2023
Merged

Use the color-primary-element* variables #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Use the color-primary-element* variables 
Signed-off-by: Simon L <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
  • Loading branch information
@szaimen @nextcloud-command
szaimen authored and nextcloud-command committed May 12, 2023
commit c0c6e73e0b9c8383f9e9b17a17a8c2956d44ea99
4 changes: 2 additions & 2 deletions js/viewer-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/components/ImageEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ export default {
'bg-secondary': 'var(--color-main-background)',
'bg-primary': 'var(--color-background-dark)',
// Accent
'accent-primary': 'var(--color-primary)',
'accent-primary': 'var(--color-primary-element)',
// Use by the slider
'border-active-bottom': 'var(--color-primary)',
'border-active-bottom': 'var(--color-primary-element)',
'icons-primary': 'var(--color-main-text)',
// Active state
'bg-primary-active': 'var(--color-background-dark)',
'bg-primary-hover': 'var(--color-background-hover)',
'accent-primary-active': 'var(--color-main-text)',
// Used by the save button
'accent-primary-hover': 'var(--color-primary)',
'accent-primary-hover': 'var(--color-primary-element)',

warning: 'var(--color-error)',
},
Expand Down Expand Up @@ -329,7 +329,7 @@ export default {
}
}
&[color='primary'] {
color: var(--color-primary-text) !important;
color: var(--color-primary-element-text) !important;
background-color: var(--color-primary-element) !important;
&:hover,
&:focus {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Videos.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ video {

&:hover,
&:focus {
color: var(--color-primary-text);
color: var(--color-primary-element-text);
background-color: var(--color-primary-element);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/mixins/Plyr.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Shared style between video and audio component for plyr
& {
// https://github.com/sampotts/plyr#customizing-the-css
--plyr-color-main: var(--color-primary);
--plyr-color-main: var(--color-primary-element);
--plyr-control-icon-size: 18px;
--plyr-menu-background: var(--color-main-background);
--plyr-menu-color: var(--color-main-text);
Expand Down Expand Up @@ -46,7 +46,7 @@
&.plyr__control--overlaid {
width: var(--plyr-button-size);
height: var(--plyr-button-size);
color: var(--color-primary-text);
color: var(--color-primary-element-text);
background-color: var(--color-primary-element);

--plyr-button-size: 50px;
Expand Down