Skip to content

Commit f1a5532

Browse files
fsbraunfsbraun
committed
fix: SASS variable naming
1 parent 637f90a commit f1a5532

File tree

10 files changed

+32
-49
lines changed

10 files changed

+32
-49
lines changed

‎djangocms_frontend/static/djangocms_frontend/css/base.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎djangocms_frontend/static/djangocms_frontend/css/button_group.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎private/sass/button_group.scss‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,15 @@ form .form-row div.frontend-button-group {
3434
}
3535

3636
input[property="color"] + label.btn-grp[style="--fe-value: ;"] {
37-
color: var(--dca-black, $django-fg) !important;
38-
@media (prefers-color-scheme: dark) {
39-
color: var(--dca-black, $django-dark-color) !important;
40-
}
37+
color: $body-fg !important;
4138
}
4239

4340
input[property="color"][value="transparent"] + label.btn-grp {
44-
color: var(--dca-black, $django-fg) !important;
45-
@media (prefers-color-scheme: dark) {
46-
color: var(--dca-black, $django-dark-color) !important;
47-
}
41+
color: $body-fg !important;
4842
}
4943

5044
input[property="text"] + label.btn-grp {
51-
color: var(--dca-black, $django-fg) !important;
52-
@media (prefers-color-scheme: dark) {
53-
color: var(--dca-black, $django-dark-color) !important;
54-
}
45+
color: $body-fg !important;
5546
}
5647

5748
input[type="radio"]:checked + label.btn-grp,
@@ -75,7 +66,7 @@ form .form-row div.frontend-button-group {
7566
width: 3.5em !important;
7667
padding-inline-start: 0 !important;
7768
padding-inline-end: 0 !important;
78-
color: $black !important;
69+
color: $body-fg !important;
7970
overflow: hidden;
8071
white-space: nowrap;
8172
background: rgba(var(--bs-secondary-rgb), calc(var(--fe-value) / 100));
@@ -94,10 +85,7 @@ form .form-row div.frontend-button-group {
9485
}
9586

9687
input[property="list_state"] + label.btn-grp[style="--fe-value: ;"] {
97-
color: var(--dca-black, $django-fg) !important;
98-
@media (prefers-color-scheme: dark) {
99-
color: var(--dca-black, $django-dark-color);
100-
}
88+
color: $body-fg !important;
10189
}
10290

10391
input[property="list_state"][value="active"] + label.btn-grp {
@@ -147,7 +135,7 @@ form .form-row div.frontend-button-group {
147135

148136
.btn-white {
149137
background: white;
150-
color: $black !important;
138+
color: $body-fg !important;
151139
}
152140

153141
.btn-light {

‎private/sass/components/_bs-buttons.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
background-color: var(--bs-success)
3434
}
3535
.btn-danger {
36-
color: $white;
36+
color: $body-bg;
3737
background-color: var(--bs-danger)
3838
}
3939
.btn-warning {

‎private/sass/components/_button.scss‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,29 @@
1818
&:focus,
1919
&.focus {
2020
color: $color;
21-
background-color: color-mix(in srgb, $background, $black 5%);
22-
border-color: color-mix(in srgb, $background, $black 5%);
21+
background-color: color-mix(in srgb, $background, $body-fg 5%);
22+
border-color: color-mix(in srgb, $background, $body-fg 5%);
2323
text-decoration: none;
2424
}
2525
&:hover {
2626
color: $color;
27-
background-color: color-mix(in srgb, $background, $black 10%);
28-
border-color: color-mix(in srgb, $border, $black 10%);
27+
background-color: color-mix(in srgb, $background, $body-fg 10%);
28+
border-color: color-mix(in srgb, $border, $body-fg 10%);
2929
text-decoration: none;
3030
}
3131
&:active,
3232
&.cms-btn-active {
3333
color: $color;
34-
background-color: color-mix(in srgb, $background, $black 15%);
35-
border-color: color-mix(in srgb, $border, $black 15%);
34+
background-color: color-mix(in srgb, $background, $body-fg 15%);
35+
border-color: color-mix(in srgb, $border, $body-fg 15%);
3636
box-shadow: $btn-active-shadow;
3737

3838
&:hover,
3939
&:focus,
4040
&.focus {
4141
color: $color;
42-
background-color: color-mix(in srgb, $background, $black 20%);
43-
border-color: color-mix(in srgb, $border, $black 25%);
42+
background-color: color-mix(in srgb, $background, $body-fg 20%);
43+
border-color: color-mix(in srgb, $border, $body-fg 25%);
4444
}
4545
}
4646
&:active,
@@ -57,7 +57,7 @@
5757
&.cms-btn-active {
5858
background-color: color-mix(in srgb, $background 40%, transparent);
5959
border-color: color-mix(in srgb, $border 40%, transparent);
60-
color: color-mix(in srgb, $color, $white 50%);
60+
color: color-mix(in srgb, $color, $body-bg 50%);
6161
cursor: not-allowed;
6262
box-shadow: none;
6363
&:before {

‎private/sass/components/_icon-picker.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
.icon-close-indicator {
4646
display: block;
4747
border-radius: 50%;
48-
color: var(--dca-black, var(--body-fg, $black));
49-
background-color: var(--dca-white, var(--body-bg, $white));
48+
color: var(--dca-black, var(--body-fg, $body-fg));
49+
background-color: var(--dca-white, var(--body-bg, $body-bg));
5050
padding: 0.3rem;
51-
border: 1px solid var(--dca-black, var(--body-fg, $black));
51+
border: 1px solid var(--dca-black, var(--body-fg, $body-fg));
5252
transform: translate(-50%, -50%);
5353
top: 0;
5454
inset-inline-start: 100%;

‎private/sass/components/_tabs.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ form ul.djangocms-frontend.nav.nav-pills {
2323
height: $nav-pills-height;
2424
line-height: $nav-pills-height;
2525
display: inline-block;
26-
@include button-variant($black, $white, $color-gray, $btn-border-radius-base);
26+
@include button-variant($body-fg, $body-bg, $color-gray, $btn-border-radius-base);
2727
&.active {
2828
@include button-variant($nav-pills-color, $nav-pills-background, $color-gray, $btn-border-radius-base);
2929
}
@@ -32,7 +32,7 @@ form ul.djangocms-frontend.nav.nav-pills {
3232
.nav-link {
3333
position: relative;
3434
text-decoration: none;
35-
color: $black;
35+
color: $body-fg;
3636

3737
span.indicator {
3838
display: none;
@@ -48,7 +48,7 @@ form ul.djangocms-frontend.nav.nav-pills {
4848
}
4949

5050
padding: 0.5rem;
51-
border: 1px solid var(--dca-white, var(--body-bg, $white));
51+
border: 1px solid var(--dca-white, var(--body-bg, $body-bg));
5252
transform: translate(-50%, -50%);
5353
inset-block-start: 0;
5454
inset-inline-start: 100%;
@@ -89,7 +89,7 @@ body:not(.djangocms-admin-style) ul.djangocms-frontend.nav-tabs + div.tab-conten
8989

9090
div.tab-pk {
9191
align-self: center;
92-
color: var(--dca-gray-darker, var(--body-fg, $django-fg));
92+
color: var(--dca-gray-darker, $body-fg);
9393
font-size: 80%;
9494
margin-inline-start: auto;
9595
margin-bottom: 14px;

‎private/sass/components/_tooltip.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ a[data-pk] {
77
width: auto;
88
font-weight: normal;
99
font-size: 80%;
10-
background-color: var(--dca-white, var(--body-bg, $white));
11-
color: var(--dca-gray, var(--body-fg, $django-fg));
12-
border: solid 1px var(--dca-gray, var(--body-fg, $django-fg));
10+
background-color: var(--dca-white, $body-fg);
11+
color: var(--dca-gray, $body-fg);
12+
border: solid 1px var(--dca-gray, $body-fg);
1313
text-align: center;
1414
padding: 5px 10px;
1515
position: absolute;

‎private/sass/components/_variables.scss‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@ $color-secondary: var(--dca-action-bg, var(--header-bg));
33
$color-gray: var(--dca-gray, var(--breadcrumbs-fg, #999));
44
$dark-fg: var(--dca-dark-fg, #333);
55

6-
$django-dark-bg: #121212;
7-
$django-dark-select: #00363a;
8-
$django-dark-color: #eee;
9-
$django-fg: #333;
10-
$white: var(--body-bg);
11-
$black: var(--body-fg);
6+
$body-bg: var(--body-bg);
7+
$body-fg: var(--body-fg);
128
$font-size-base: 0.8125rem;
139

14-
$nav-pills-color: var(--dca-action-text, $white);
10+
$nav-pills-color: var(--dca-action-text, $body-bg);
1511
$nav-pills-background: $color-secondary;
1612
$nav-link-padding-y: 0.3rem;
1713
$nav-pills-padding: 1px 12px;

‎tests/test_plugin_tag.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ def test_complex_tags(self):
7575
</div>"""
7676

7777
result = template.render({"request": None})
78-
for item in plugin_tag_pool:
79-
print(item)
78+
8079
self.assertIn("cardinner", plugin_tag_pool)
8180

8281
self.assertInHTML(expected_result, result)

0 commit comments

Comments
 (0)