diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue index dffcd78351682..4eb820848a5af 100644 --- a/apps/dashboard/src/DashboardApp.vue +++ b/apps/dashboard/src/DashboardApp.vue @@ -386,7 +386,7 @@ export default { background-attachment: fixed; > h2 { - color: var(--color-primary-text); + color: var(--color-primary-element-text); text-align: center; font-size: 32px; line-height: 130%; @@ -561,7 +561,7 @@ export default { } &:hover { - border-color: var(--color-primary); + border-color: var(--color-primary-element); } } @@ -577,7 +577,7 @@ export default { } input:focus + label { - border-color: var(--color-primary); + border-color: var(--color-primary-element); } } diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 67c8adff89752..6a1a8632ef84e 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -23,7 +23,7 @@ background-color: var(--color-background-hover); } .actions .button a:active { - background-color: var(--color-primary-light); + background-color: var(--color-primary-element-light); } .actions.creatable { @@ -117,7 +117,7 @@ } .file-drag, .file-drag .files-filestable tbody tr, .file-drag .files-filestable tbody tr:hover { - background-color: var(--color-primary-light) !important; + background-color: var(--color-primary-element-light) !important; } .app-files #app-content.dir-drop { @@ -129,7 +129,7 @@ } .app-files #app-content.dir-drop .files-filestable tbody tr.dropping-to-dir{ - background-color: var(--color-primary-light) !important; + background-color: var(--color-primary-element-light) !important; } /* icons for sidebar */ @@ -202,7 +202,7 @@ table tr.mouseOver td { .files-filestable tbody tr.highlighted .name:focus, .files-filestable tbody tr.selected, .files-filestable tbody tr.searchresult { - background-color: var(--color-primary-light); + background-color: var(--color-primary-element-light); } tbody a { color: var(--color-main-text); } @@ -551,7 +551,7 @@ table td.selection { background-color: var(--color-background-hover); border-radius: var(--border-radius-pill); outline: none !important; - border: 2px solid var(--color-primary) !important; + border: 2px solid var(--color-primary-element) !important; padding: 14px; } } @@ -1303,7 +1303,7 @@ table.dragshadow td.size { &:focus-visible, #showgridview:focus-visible + & { - box-shadow: inset 0 0 0 2px var(--color-primary) !important; + box-shadow: inset 0 0 0 2px var(--color-primary-element) !important; } } diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss index 88207e0a84443..a8f02e9122cbf 100644 --- a/apps/files/css/upload.scss +++ b/apps/files/css/upload.scss @@ -58,7 +58,7 @@ left: -1px; position: absolute; overflow: hidden; - background-color: var(--color-primary); + background-color: var(--color-primary-element); } #uploadprogressbar .label { top: 8px; @@ -68,7 +68,7 @@ font-weight: normal; } #uploadprogressbar .label.inner { - color: var(--color-primary-text); + color: var(--color-primary-element-text); position: absolute; display: block; width: 200px; diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue index 832e4d9dda22e..9b7827e1ebe68 100644 --- a/apps/files/src/components/TemplatePreview.vue +++ b/apps/files/src/components/TemplatePreview.vue @@ -182,7 +182,7 @@ export default { border-radius: var(--border-radius-large); input:checked + label > & { - border-color: var(--color-primary); + border-color: var(--color-primary-element); } &--failed { diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue index bf0e94f35c1b2..b3740d4097fe2 100644 --- a/apps/files_sharing/src/components/SharingEntryLink.vue +++ b/apps/files_sharing/src/components/SharingEntryLink.vue @@ -904,7 +904,7 @@ export default { } ::v-deep .avatar-link-share { - background-color: var(--color-primary); + background-color: var(--color-primary-element); } .sharing-entry__action--public-upload { diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss index 38412164dbcbf..40e9c1b60f99c 100644 --- a/apps/settings/css/settings.scss +++ b/apps/settings/css/settings.scss @@ -135,18 +135,18 @@ select { display: inline-block; margin: 16px; padding: 14px 20px; - background-color: var(--color-primary); + background-color: var(--color-primary-element); color: #fff; border-radius: var(--border-radius-pill); - border: 1px solid var(--color-primary); + border: 1px solid var(--color-primary-element); box-shadow: 0 2px 9px var(--color-box-shadow); &:active, &:hover, &:focus { - color: var(--color-primary); - background-color: var(--color-primary-text); - border-color: var(--color-primary) !important; + color: var(--color-primary-element); + background-color: var(--color-primary-element-text); + border-color: var(--color-primary-element) !important; } &.icon-file { @@ -281,7 +281,7 @@ select { } &.active { - box-shadow: inset 2px 0 var(--color-primary); + box-shadow: inset 2px 0 var(--color-primary-element); .menuitem-text { font-weight: bold; diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index 17e77aff6c751..2befc5cce799b 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -196,7 +196,7 @@ export default { margin-top: 8px; padding: 5px; border-radius: var(--border-radius); - color: var(--color-primary-text); + color: var(--color-primary-element-text); background-color: var(--color-error); width: initial; } @@ -204,7 +204,7 @@ export default { margin-top: 8px; padding: 5px; border-radius: var(--border-radius); - color: var(--color-primary-text); + color: var(--color-primary-element-text); background-color: var(--color-warning); width: initial; } diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue index 8016fe9e459ba..960053aafe0d2 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue @@ -161,12 +161,12 @@ export default { &__header { height: 70px; border-radius: var(--border-radius-large) var(--border-radius-large) 0 0; - background-color: var(--color-primary); + background-color: var(--color-primary-element); background-image: var(--gradient-primary-background); span { bottom: 0; - color: var(--color-primary-text); + color: var(--color-primary-element-text); font-size: 18px; font-weight: bold; margin: 0 4px 8px 0; diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue index d5d57c47c016f..8290ece03c46b 100644 --- a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue +++ b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue @@ -98,7 +98,7 @@ export default { } .federation-actions__btn--active { - background-color: var(--color-primary-light) !important; - box-shadow: inset 2px 0 var(--color-primary) !important; + background-color: var(--color-primary-element-light) !important; + box-shadow: inset 2px 0 var(--color-primary-element) !important; } diff --git a/apps/theming/src/AdminTheming.vue b/apps/theming/src/AdminTheming.vue index f922143e04d2f..a190dfb2a6a44 100644 --- a/apps/theming/src/AdminTheming.vue +++ b/apps/theming/src/AdminTheming.vue @@ -299,7 +299,7 @@ export default { /* This is basically https://github.com/nextcloud/server/blob/master/core/css/guest.css But without the user variables. That way the admin can preview the render as guest*/ /* As guest, there is no user color color-background-plain */ - background-color: var(--color-primary-default, #0082c9); + background-color: var(--color-primary-element-default, #0082c9); /* As guest, there is no user background (--image-background) 1. Empty background if defined 2. Else default background diff --git a/apps/theming/src/components/BackgroundSettings.vue b/apps/theming/src/components/BackgroundSettings.vue index 0d07071cb935a..20c7ef622de8c 100644 --- a/apps/theming/src/components/BackgroundSettings.vue +++ b/apps/theming/src/components/BackgroundSettings.vue @@ -356,7 +356,7 @@ export default { &:hover, &:focus { // Use theme color primary, see inline css variable in template - border: 2px solid var(--border-color, var(--color-primary)) !important; + border: 2px solid var(--border-color, var(--color-primary-element)) !important; } // Icon diff --git a/apps/user_status/src/components/OnlineStatusSelect.vue b/apps/user_status/src/components/OnlineStatusSelect.vue index df7d1377ee301..77600346ac950 100644 --- a/apps/user_status/src/components/OnlineStatusSelect.vue +++ b/apps/user_status/src/components/OnlineStatusSelect.vue @@ -122,7 +122,7 @@ $label-padding: 8px; &__input:checked + &__label, &__input:focus + &__label, &__label:hover { - border-color: var(--color-primary); + border-color: var(--color-primary-element); } &__label:active { diff --git a/apps/workflowengine/src/styles/operation.scss b/apps/workflowengine/src/styles/operation.scss index 860258f2851b8..8370c896658f3 100644 --- a/apps/workflowengine/src/styles/operation.scss +++ b/apps/workflowengine/src/styles/operation.scss @@ -48,7 +48,7 @@ small { .colored:not(.more) { background-color: var(--color-primary-element); h3, small { - color: var(--color-primary-text) + color: var(--color-primary-element-text) } } diff --git a/core/css/apps.scss b/core/css/apps.scss index 10572614bea0e..3716a9d315469 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -208,7 +208,7 @@ kbd { } } a:focus-visible { - box-shadow: var(--color-primary) inset 0 0 0 2px; + box-shadow: var(--color-primary-element) inset 0 0 0 2px; outline: none; } &.active, @@ -217,7 +217,7 @@ kbd { a.active { &, > a { - background-color: var(--color-primary-light); + background-color: var(--color-primary-element-light); } } @@ -276,7 +276,7 @@ kbd { &, > a { border-radius: var(--border-radius-pill); - background-color: var(--color-primary-light); + background-color: var(--color-primary-element-light); } } @@ -433,7 +433,7 @@ kbd { &:focus-visible { opacity: 1; border-width: 0; - box-shadow: inset 0 0 0 2px var(--color-primary); + box-shadow: inset 0 0 0 2px var(--color-primary-element); background: none; } } @@ -533,8 +533,8 @@ kbd { span { padding: 2px 5px; border-radius: 10px; - background-color: var(--color-primary); - color: var(--color-primary-text); + background-color: var(--color-primary-element); + color: var(--color-primary-element-text); } } } @@ -860,7 +860,7 @@ $min-content-width: variables.$breakpoint-mobile - variables.$navigation-width - } &:focus-visible { - box-shadow: 0 0 0 2px inset var(--color-primary) !important; + box-shadow: 0 0 0 2px inset var(--color-primary-element) !important; background-position: 12px center; } } @@ -1119,7 +1119,7 @@ $outter-margin: math.div($popoveritem-height - $popovericon-size, 2); } &.active { border-radius: var(--border-radius-pill); - background-color: var(--color-primary-light); + background-color: var(--color-primary-element-light); } /* prevent .action class to break the design */ &.action { diff --git a/core/css/guest.scss b/core/css/guest.scss index f917105d268a6..08137f1c630e1 100644 --- a/core/css/guest.scss +++ b/core/css/guest.scss @@ -28,7 +28,7 @@ body { color: var(--color-text); text-align: center; /* As guest, there is no color-background-plain */ - background-color: var(--color-background-plain, var(--color-primary-default, #0082c9)); + background-color: var(--color-background-plain, var(--color-primary-element-default, #0082c9)); /* As guest, there is no user background (--image-background) 1. User background if logged in ('no' if removed, that way the variable is _defined_) 2. Empty background if enabled ('yes' is used, that way the variable is _defined_) @@ -309,7 +309,7 @@ button.primary:not(:disabled):hover, button.primary:not(:disabled):focus, a.primary:not(:disabled):hover, a.primary:not(:disabled):focus { - color: var(--color-primary-text); + color: var(--color-primary-element-text); } /* Checkboxes - white only for login */ @@ -419,7 +419,7 @@ form input[type='checkbox']+label { form .warning input[type='checkbox']:hover+label, form .warning input[type='checkbox']:focus+label, form .warning input[type='checkbox']+label { - color: var(--color-primary-text) !important; + color: var(--color-primary-element-text) !important; } .body-login-container.two-factor { diff --git a/core/css/header.scss b/core/css/header.scss index a457959bbc992..b2307fce215d8 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -31,7 +31,7 @@ width: 12px; height: 2px; border-radius: 3px; - background-color: var(--color-primary-text); + background-color: var(--color-primary-element-text); left: 50%; opacity: 1; } @@ -207,7 +207,7 @@ /* TODO: move into minimal css file for public shared template */ /* only used for public share pages now as we have the app icons when logged in */ .header-appname { - color: var(--color-primary-text); + color: var(--color-primary-element-text); font-size: 16px; font-weight: bold; margin: 0; @@ -220,7 +220,7 @@ } .header-shared-by { - color: var(--color-primary-text); + color: var(--color-primary-element-text); position: relative; font-weight: 300; font-size: 11px; diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 78569cf474d8d..8f40690fac53c 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -88,7 +88,7 @@ button:not( color: var(--color-text-light); } &:focus-visible { - box-shadow: 0 0 0 2px var(--color-primary); + box-shadow: 0 0 0 2px var(--color-primary-element); } } &:disabled { @@ -107,13 +107,13 @@ button:not( &.primary { background-color: var(--color-primary-element); border-color: var(--color-primary-element); - color: var(--color-primary-text); + color: var(--color-primary-element-text); cursor: pointer; /* Apply border to primary button if on log in page (and not in a dark container) or if in header */ #body-login :not(.body-login-container) &, #header & { - border-color: var(--color-primary-text); + border-color: var(--color-primary-element-text); } &:not(:disabled) { @@ -592,7 +592,7 @@ div.select2-container-multi { padding: 6px; min-height: 44px; &:focus-within { - border-color: var(--color-primary) + border-color: var(--color-primary-element) } .select2-search-choice { line-height: 20px; @@ -643,7 +643,7 @@ div.select2-container { padding: 6px 12px; min-height: 44px; &:focus-within { - border-color: var(--color-primary) + border-color: var(--color-primary-element) } .select2-search-choice { line-height: 20px; @@ -779,12 +779,12 @@ progress:not(.vue) { } &::-moz-progress-bar { border-radius: var(--border-radius); - background: var(--color-primary); + background: var(--color-primary-element); transition: 250ms all ease-in-out; } &::-webkit-progress-value { border-radius: var(--border-radius); - background: var(--color-primary); + background: var(--color-primary-element); transition: 250ms all ease-in-out; } } diff --git a/core/css/public.scss b/core/css/public.scss index ddeb444970d30..11f72dc10f057 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -4,7 +4,7 @@ $footer-height: 65px; .header-right { #header-primary-action a { - color: var(--color-primary-text); + color: var(--color-primary-element-text); } #header-secondary-action { diff --git a/core/css/styles.scss b/core/css/styles.scss index 3776c9b7df1f3..17ed035d2b2bd 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -36,7 +36,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr /** Let vue apps handle the focus themselves */ .content:not(#content-vue) :focus-visible, .app-navigation:not(#app-navigation-vue) :focus-visible { - box-shadow: inset 0 0 0 2px var(--color-primary); + box-shadow: inset 0 0 0 2px var(--color-primary-element); outline: none; } @@ -140,7 +140,7 @@ body { z-index: 9000; text-align: center; background-color: var(--color-background-darker); - color: var(--color-primary-text); + color: var(--color-primary-element-text); line-height: 125%; font-size: 24px; div { @@ -151,7 +151,7 @@ body { margin: 0px auto; } a { - color: var(--color-primary-text); + color: var(--color-primary-element-text); border-bottom: 2px dotted var(--color-main-background); &:hover, &:focus { color: var(--color-primary-element-text-dark); @@ -186,7 +186,7 @@ body { ::selection { background-color: var(--color-primary-element); - color: var(--color-primary-text); + color: var(--color-primary-element-text); } @@ -266,7 +266,7 @@ body { opacity: .8; } #show:focus-visible + label, #dbpassword-toggle:focus-visible + label, #personal-show:focus-visible + label { - box-shadow: var(--color-primary) 0 0 0 2px; + box-shadow: var(--color-primary-element) 0 0 0 2px; opacity: 1; border-radius: 9999px; } @@ -519,8 +519,8 @@ code { &.ui-datepicker-current-day a.ui-state-active, .ui-state-hover, .ui-state-focus { - background-color: var(--color-primary); - color: var(--color-primary-text); + background-color: var(--color-primary-element); + color: var(--color-primary-element-text); font-weight: bold; } @@ -591,8 +591,8 @@ code { &.ui-timepicker-minute-cell a.ui-state-active, .ui-state-hover, .ui-state-focus { - background-color: var(--color-primary); - color: var(--color-primary-text); + background-color: var(--color-primary-element); + color: var(--color-primary-element-text); font-weight: bold; } @@ -684,7 +684,7 @@ code { &:hover, &:active, &:focus { - box-shadow: 0 0 0 2px var(--color-primary); + box-shadow: 0 0 0 2px var(--color-primary-element); opacity: 1; } } diff --git a/core/css/toast.scss b/core/css/toast.scss index 88d9cbc678590..83b2d6b6a4e63 100644 --- a/core/css/toast.scss +++ b/core/css/toast.scss @@ -42,7 +42,7 @@ border-left: 3px solid var(--color-error); } .toast-info { - border-left: 3px solid var(--color-primary); + border-left: 3px solid var(--color-primary-element); } .toast-warning { border-left: 3px solid var(--color-warning); diff --git a/core/src/components/AppMenu.vue b/core/src/components/AppMenu.vue index 012757e155a3b..888a106ed05bf 100644 --- a/core/src/components/AppMenu.vue +++ b/core/src/components/AppMenu.vue @@ -161,7 +161,7 @@ $header-icon-size: 20px; width: 12px; height: 5px; border-radius: 3px; - background-color: var(--color-primary-text); + background-color: var(--color-primary-element-text); left: 50%; bottom: 6px; display: block; @@ -178,7 +178,7 @@ $header-icon-size: 20px; width: calc(100% - 4px); height: calc(100% - 4px); margin: 2px; - color: var(--color-primary-text); + color: var(--color-primary-element-text); position: relative; } @@ -194,7 +194,7 @@ $header-icon-size: 20px; opacity: 0; position: absolute; font-size: 12px; - color: var(--color-primary-text); + color: var(--color-primary-element-text); text-align: center; bottom: -5px; left: 50%; @@ -253,7 +253,7 @@ $header-icon-size: 20px; /* Remove all background and align text color if not expanded */ &:not([aria-expanded="true"]) { - color: var(--color-primary-text); + color: var(--color-primary-element-text); &:hover { opacity: 1; @@ -290,7 +290,7 @@ $header-icon-size: 20px; content: ""; width: 8px; height: 8px; - background-color: var(--color-primary-text); + background-color: var(--color-primary-element-text); border-radius: 50%; position: absolute; display: block; diff --git a/core/src/components/Profile/PrimaryActionButton.vue b/core/src/components/Profile/PrimaryActionButton.vue index 7a1f031b60c9d..dcd28e0c3a112 100644 --- a/core/src/components/Profile/PrimaryActionButton.vue +++ b/core/src/components/Profile/PrimaryActionButton.vue @@ -61,7 +61,7 @@ export default { computed: { colorPrimaryText() { // For some reason the returned string has prepended whitespace - return getComputedStyle(document.body).getPropertyValue('--color-primary-text').trim() + return getComputedStyle(document.body).getPropertyValue('--color-primary-element-text').trim() }, }, } @@ -77,7 +77,7 @@ export default { line-height: 44px; text-align: center; border-radius: var(--border-radius-pill); - color: var(--color-primary-text); + color: var(--color-primary-element-text); background-color: var(--color-primary-element); overflow: hidden; white-space: nowrap; diff --git a/core/src/jquery/css/jquery-ui-fixes.scss b/core/src/jquery/css/jquery-ui-fixes.scss index cb52ecdb2d7b2..4c2241d8d5dc4 100644 --- a/core/src/jquery/css/jquery-ui-fixes.scss +++ b/core/src/jquery/css/jquery-ui-fixes.scss @@ -52,7 +52,7 @@ .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid var(--color-primary); + border: 1px solid var(--color-primary-element); background: var(--color-main-background) none; font-weight: bold; color: var(--color-main-text); @@ -223,9 +223,9 @@ } .ui-button.primary { - background-color: var(--color-primary); - color: var(--color-primary-text); - border: 1px solid var(--color-primary-text); + background-color: var(--color-primary-element); + color: var(--color-primary-element-text); + border: 1px solid var(--color-primary-element-text); } // fix ui-buttons on hover diff --git a/core/src/views/Profile.vue b/core/src/views/Profile.vue index eda6e4284630c..84859f4a971f9 100644 --- a/core/src/views/Profile.vue +++ b/core/src/views/Profile.vue @@ -361,9 +361,9 @@ $content-max-width: 640px; border: none; margin-left: 18px; margin-top: 2px; - color: var(--color-primary-element); - background-color: var(--color-primary-text); - box-shadow: 0 0 0 2px var(--color-primary-text); + color: var(--color-primary-element-text); + background-color: var(--color-primary-element); + box-shadow: 0 0 0 2px var(--color-primary-element); border-radius: var(--border-radius-pill); padding: 0 18px; font-size: var(--default-font-size); @@ -374,7 +374,7 @@ $content-max-width: 640px; &:hover, &:focus, &:active { - color: var(--color-primary-element); + color: var(--color-primary-element-light-text); background-color: var(--color-primary-element-light); } diff --git a/core/src/views/UserMenu.vue b/core/src/views/UserMenu.vue index 5112b8a4eae7c..8602b2faa1df6 100644 --- a/core/src/views/UserMenu.vue +++ b/core/src/views/UserMenu.vue @@ -85,7 +85,7 @@ export default { opacity: 1 !important; &:focus-visible { .user-menu__avatar { - border: 2px solid var(--color-primary-text); + border: 2px solid var(--color-primary-element); } } } @@ -104,7 +104,7 @@ export default { &:active, &:focus, &:hover { - border: 2px solid var(--color-primary-text); + border: 2px solid var(--color-primary-element-text); } } @@ -138,13 +138,13 @@ export default { &:focus-visible { background-color: var(--color-background-hover) !important; - box-shadow: inset 0 0 0 2px var(--color-primary) !important; + box-shadow: inset 0 0 0 2px var(--color-primary-element) !important; outline: none !important; } &:active, &.active { - background-color: var(--color-primary-light); + background-color: var(--color-primary-element-light); } span {