Skip to content

Commit 251cfe6

Browse files
szaimenszaimen
committed
Use the color-primary-element* variables
Signed-off-by: Simon L <szaimen@e.mail.de>
1 parent 701e409 commit 251cfe6

25 files changed

Lines changed: 81 additions & 81 deletions

File tree

‎apps/dashboard/src/DashboardApp.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ export default {
386386
background-attachment: fixed;
387387
388388
> h2 {
389-
color: var(--color-primary-text);
389+
color: var(--color-primary-element-text);
390390
text-align: center;
391391
font-size: 32px;
392392
line-height: 130%;
@@ -561,7 +561,7 @@ export default {
561561
}
562562
563563
&:hover {
564-
border-color: var(--color-primary);
564+
border-color: var(--color-primary-element);
565565
}
566566
}
567567
@@ -577,7 +577,7 @@ export default {
577577
}
578578
579579
input:focus + label {
580-
border-color: var(--color-primary);
580+
border-color: var(--color-primary-element);
581581
}
582582
}
583583

‎apps/files/css/files.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
background-color: var(--color-background-hover);
2424
}
2525
.actions .button a:active {
26-
background-color: var(--color-primary-light);
26+
background-color: var(--color-primary-element-light);
2727
}
2828

2929
.actions.creatable {
@@ -117,7 +117,7 @@
117117
}
118118

119119
.file-drag, .file-drag .files-filestable tbody tr, .file-drag .files-filestable tbody tr:hover {
120-
background-color: var(--color-primary-light) !important;
120+
background-color: var(--color-primary-element-light) !important;
121121
}
122122

123123
.app-files #app-content.dir-drop {
@@ -129,7 +129,7 @@
129129
}
130130

131131
.app-files #app-content.dir-drop .files-filestable tbody tr.dropping-to-dir{
132-
background-color: var(--color-primary-light) !important;
132+
background-color: var(--color-primary-element-light) !important;
133133
}
134134

135135
/* icons for sidebar */
@@ -202,7 +202,7 @@ table tr.mouseOver td {
202202
.files-filestable tbody tr.highlighted .name:focus,
203203
.files-filestable tbody tr.selected,
204204
.files-filestable tbody tr.searchresult {
205-
background-color: var(--color-primary-light);
205+
background-color: var(--color-primary-element-light);
206206
}
207207

208208
tbody a { color: var(--color-main-text); }
@@ -551,7 +551,7 @@ table td.selection {
551551
background-color: var(--color-background-hover);
552552
border-radius: var(--border-radius-pill);
553553
outline: none !important;
554-
border: 2px solid var(--color-primary) !important;
554+
border: 2px solid var(--color-primary-element) !important;
555555
padding: 14px;
556556
}
557557
}
@@ -1303,7 +1303,7 @@ table.dragshadow td.size {
13031303

13041304
&:focus-visible,
13051305
#showgridview:focus-visible + & {
1306-
box-shadow: inset 0 0 0 2px var(--color-primary) !important;
1306+
box-shadow: inset 0 0 0 2px var(--color-primary-element) !important;
13071307
}
13081308
}
13091309

‎apps/files/css/upload.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
left: -1px;
5959
position: absolute;
6060
overflow: hidden;
61-
background-color: var(--color-primary);
61+
background-color: var(--color-primary-element);
6262
}
6363
#uploadprogressbar .label {
6464
top: 8px;
@@ -68,7 +68,7 @@
6868
font-weight: normal;
6969
}
7070
#uploadprogressbar .label.inner {
71-
color: var(--color-primary-text);
71+
color: var(--color-primary-element-text);
7272
position: absolute;
7373
display: block;
7474
width: 200px;

‎apps/files/src/components/TemplatePreview.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export default {
182182
border-radius: var(--border-radius-large);
183183
184184
input:checked + label > & {
185-
border-color: var(--color-primary);
185+
border-color: var(--color-primary-element);
186186
}
187187
188188
&--failed {

‎apps/files_sharing/src/components/SharingEntryLink.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ export default {
904904
}
905905
906906
::v-deep .avatar-link-share {
907-
background-color: var(--color-primary);
907+
background-color: var(--color-primary-element);
908908
}
909909
910910
.sharing-entry__action--public-upload {

‎apps/settings/css/settings.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,18 @@ select {
135135
display: inline-block;
136136
margin: 16px;
137137
padding: 14px 20px;
138-
background-color: var(--color-primary);
138+
background-color: var(--color-primary-element);
139139
color: #fff;
140140
border-radius: var(--border-radius-pill);
141-
border: 1px solid var(--color-primary);
141+
border: 1px solid var(--color-primary-element);
142142
box-shadow: 0 2px 9px var(--color-box-shadow);
143143

144144
&:active,
145145
&:hover,
146146
&:focus {
147-
color: var(--color-primary);
148-
background-color: var(--color-primary-text);
149-
border-color: var(--color-primary) !important;
147+
color: var(--color-primary-element);
148+
background-color: var(--color-primary-element-text);
149+
border-color: var(--color-primary-element) !important;
150150
}
151151

152152
&.icon-file {
@@ -281,7 +281,7 @@ select {
281281
}
282282

283283
&.active {
284-
box-shadow: inset 2px 0 var(--color-primary);
284+
box-shadow: inset 2px 0 var(--color-primary-element);
285285

286286
.menuitem-text {
287287
font-weight: bold;

‎apps/settings/src/components/BasicSettings/BackgroundJob.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,15 @@ export default {
196196
margin-top: 8px;
197197
padding: 5px;
198198
border-radius: var(--border-radius);
199-
color: var(--color-primary-text);
199+
color: var(--color-primary-element-text);
200200
background-color: var(--color-error);
201201
width: initial;
202202
}
203203
.warning {
204204
margin-top: 8px;
205205
padding: 5px;
206206
border-radius: var(--border-radius);
207-
color: var(--color-primary-text);
207+
color: var(--color-primary-element-text);
208208
background-color: var(--color-warning);
209209
width: initial;
210210
}

‎apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ export default {
161161
&__header {
162162
height: 70px;
163163
border-radius: var(--border-radius-large) var(--border-radius-large) 0 0;
164-
background-color: var(--color-primary);
164+
background-color: var(--color-primary-element);
165165
background-image: var(--gradient-primary-background);
166166
167167
span {
168168
bottom: 0;
169-
color: var(--color-primary-text);
169+
color: var(--color-primary-element-text);
170170
font-size: 18px;
171171
font-weight: bold;
172172
margin: 0 4px 8px 0;

‎apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export default {
9898
}
9999
100100
.federation-actions__btn--active {
101-
background-color: var(--color-primary-light) !important;
102-
box-shadow: inset 2px 0 var(--color-primary) !important;
101+
background-color: var(--color-primary-element-light) !important;
102+
box-shadow: inset 2px 0 var(--color-primary-element) !important;
103103
}
104104
</style>

‎apps/theming/src/AdminTheming.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ export default {
299299
/* This is basically https://github.com/nextcloud/server/blob/master/core/css/guest.css
300300
But without the user variables. That way the admin can preview the render as guest*/
301301
/* As guest, there is no user color color-background-plain */
302-
background-color: var(--color-primary-default, #0082c9);
302+
background-color: var(--color-primary-element-default, #0082c9);
303303
/* As guest, there is no user background (--image-background)
304304
1. Empty background if defined
305305
2. Else default background

0 commit comments

Comments
 (0)