8000 Merge pull request #7621 from fsbraun/fix/dart-sass · django-cms/django-cms@4c7939e · GitHub
[go: up one dir, main page]
Skip to content

Commit 4c7939e

Browse files
fsbraunfsbraun
authored
Merge pull request #7621 from fsbraun/fix/dart-sass
Fix: modal.scss dark-mode compatibilitiy
2 parents 2e31793 + 94cc9b0 commit 4c7939e

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

‎.github/workflows/frontend.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ jobs:
2424
- run: |
2525
gulp unitTest
2626
gulp lint
27+
- run: gulp icons
28+
- run: gulp sass

‎cms/static/cms/sass/components/_modal.scss

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//##############################################################################
22
// MODAL
33

4+
@use "sass:math";
5+
46
// Editing plugins in frontend
57
.cms-modal {
68
display: none;
@@ -151,7 +153,7 @@
151153
display: block;
152154
position: absolute;
153155
top: 50%;
154-
margin-top: -$modal-header-button-area-size / 2;
156+
margin-top: math.div(-$modal-header-button-area-size, 2);
155157
right: $padding-normal;
156158
color: $gray-light;
157159
text-align: center;
@@ -160,7 +162,7 @@
160162
cursor: pointer;
161163
&:before {
162164
position: relative;
163-
top: ($modal-header-button-area-size - $icon-size) / 2;
165+
top: math.div($modal-header-button-area-size - $icon-size, 2);
164166
}
165167
&:hover {
166168
color: $color-primary;
@@ -223,7 +225,7 @@
223225
a {
224226
color: $color-primary;
225227
&:hover {
226-
color: darken($color-primary, 20%);
228+
color: darken($color-primary-fallback, 20%);
227229
}
228230
&:after {
229231
content: "/";
@@ -250,7 +252,7 @@
250252
padding: 0 $modal-resize-size 0 $padding-normal;
251253
}
252254
.cms-modal-item-buttons {
253-
$margin: ($toolbar-height - $toolbar-button-height) / 2;
255+
$margin: math.div($toolbar-height - $toolbar-button-height, 2);
254256
@extend .cms-toolbar-item-buttons;
255257
float: right;
256258
margin-left: $margin;
@@ -266,10 +268,10 @@
266268
// alter footer when html markup is loaded
267269
.cms-modal-markup {
268270
.cms-modal-foot {
269-
height: $modal-footer-height / 2;
271+
height: math.div($modal-footer-height, 2);
270272
}
271273
.cms-modal-body {
272-
bottom: $modal-footer-height / 2;
274+
bottom: math.div($modal-footer-height, 2);
273275
}
274276
}
275277

0 commit comments

Comments
 (0)
0