Skip to content

Commit 55d2a1e

Browse files
authored
Merge pull request #49 from jolicode/fix/easyadmin-dark-mode-style
Improve dark mode styles for easyadmin
2 parents ac19f35 + aaa039e commit 55d2a1e

File tree

11 files changed

+140
-16
lines changed

11 files changed

+140
-16
lines changed

src/Bridge/EasyAdmin/assets/styles/base.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,9 @@
1515
--jm-color-red: #dc2626;
1616
--jm-dropzone-color: #293a53;
1717
--jm-dropzone-border-color: #aab6c8;
18+
--jm-code-color: #c44c34;
19+
}
20+
21+
[data-bs-theme="dark"] {
22+
--jm-code-color: #fc4c3f;
1823
}

src/Bridge/EasyAdmin/assets/styles/box.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@
55
/* Custom properties
66
========================================================================== */
77

8+
.jm-box {
9+
--jm-box-background-color: var(--gray-50);
10+
--code-color: var(--jm-code-color);
11+
}
12+
13+
[data-bs-theme="dark"] {
14+
.jm-box {
15+
--jm-box-background-color: var(--true-gray-800);
16+
}
17+
}
18+
819

920
/* Rules
1021
========================================================================== */
@@ -13,5 +24,5 @@
1324
border: solid var(--gray-200) 1px;
1425
padding: 0.625rem;
1526
border-radius: 0.25rem;
16-
background-color: var(--gray-50);
27+
background-color: var(--jm-box-background-color);
1728
}

src/Bridge/EasyAdmin/assets/styles/dropzone.css

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22
Dropzone
33
========================================================================== */
44

5+
/* Custom properties
6+
========================================================================== */
7+
8+
.dropzone-container {
9+
--dropzone-background-color: var(--jm-color-gray-100);
10+
--dropzone-color: var(--jm-dropzone-color);
11+
--dropzone-border-color: var(--jm-dropzone-border-color);
12+
}
13+
14+
[data-bs-theme="dark"] {
15+
.dropzone-container {
16+
--dropzone-background-color: var(--true-gray-800);
17+
--dropzone-color: var(--jm-color-gray-100);
18+
--dropzone-border-color: var(--jm-color-gray);
19+
}
20+
}
21+
522
/* Rules
623
========================================================================== */
724

@@ -25,9 +42,9 @@
2542
flex-wrap: wrap;
2643
min-height: auto;
2744
margin-bottom: 1.5rem;
28-
color: var(--jm-dropzone-color);
29-
background-color: var(--jm-color-gray-100);
30-
border: dashed 1px var(--jm-dropzone-border-color);
45+
color: var(--dropzone-color);
46+
background-color: var(--dropzone-background-color, var(--jm-color-gray-100));
47+
border: dashed 1px var(--dropzone-border-color);
3148
border-radius: 4px;
3249
z-index: 100;
3350
}

src/Bridge/EasyAdmin/assets/styles/header.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/* ==========================================================================
2+
Header
3+
========================================================================== */
4+
5+
/* Custom properties
6+
========================================================================== */
7+
18
.joli-media-header-tools {
29
.btn-group .btn.active {
310
--button-hover-bg: linear-gradient(180deg, var(--button-secondary-color), hsl(from var(--button-secondary-color) h calc(s + 3) calc(l + 5)));
@@ -6,3 +13,16 @@
613
cursor: pointer;
714
}
815
}
16+
17+
[data-bs-theme="dark"] {
18+
.joli-media-header-tools {
19+
.btn-group .btn.active,
20+
.btn-group .btn.disabled.active {
21+
--button-active-bg: var(--true-gray-700);
22+
}
23+
}
24+
25+
.modal-content .content-header {
26+
background-color: transparent;
27+
}
28+
}

src/Bridge/EasyAdmin/assets/styles/new-directory-form.css

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/* ==========================================================================
2+
New directory form
3+
========================================================================== */
4+
5+
/* Custom properties
6+
========================================================================== */
7+
8+
.new-directory-container {
9+
--new-directory-color: var(--jm-dropzone-color);
10+
--new-directory-background-color: var(--jm-color-gray-100);
11+
--new-directory-border-color: var(--jm-dropzone-border-color);
12+
}
13+
14+
[data-bs-theme="dark"] {
15+
.new-directory-container {
16+
--new-directory-background-color: var(--true-gray-800);
17+
--new-directory-color: var(--jm-color-gray-100);
18+
--new-directory-border-color: var(--jm-color-gray);
19+
}
20+
}
21+
22+
/* Rules
23+
========================================================================== */
24+
125
.new-directory-container {
226
display: none;
327
top: 100%;
@@ -6,9 +30,9 @@
630
min-height: auto;
731
margin-bottom: 1.5rem;
832
padding: 1.5rem;
9-
color: var(--jm-dropzone-color);
10-
background-color: var(--jm-color-gray-100);
11-
border: dashed 1px var(--jm-dropzone-border-color);
33+
color: var(--new-directory-color);
34+
background-color: var(--new-directory-background-color);
35+
border: dashed 1px var(--new-directory-border-color);
1236
border-radius: 4px;
1337
z-index: 100;
1438

src/Bridge/EasyAdmin/assets/styles/rename-directory-form.css

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/* ==========================================================================
2+
Rename directory form
3+
========================================================================== */
4+
5+
/* Custom properties
6+
========================================================================== */
7+
8+
.rename-directory-container {
9+
--rename-directory-color: var(--jm-dropzone-color);
10+
--rename-directory-background-color: var(--jm-color-gray-100);
11+
--rename-directory-border-color: var(--jm-dropzone-border-color);
12+
}
13+
14+
[data-bs-theme="dark"] {
15+
.rename-directory-container {
16+
--rename-directory-color: var(--jm-color-gray-100);
17+
--rename-directory-background-color: var(--true-gray-800);
18+
--rename-directory-border-color: var(--jm-color-gray);
19+
}
20+
}
21+
22+
/* Rules
23+
========================================================================== */
24+
125
.rename-directory-container {
226
display: none;
327
top: 100%;
@@ -6,9 +30,9 @@
630
min-height: auto;
731
margin-bottom: 1.5rem;
832
padding: 1.5rem;
9-
color: var(--jm-dropzone-color);
10-
background-color: var(--jm-color-gray-100);
11-
border: dashed 1px var(--jm-dropzone-border-color);
33+
color: var(--rename-directory-color);
34+
background-color: var(--rename-directory-background-color);
35+
border: dashed 1px var(--rename-directory-border-color);
1236
border-radius: 4px;
1337
z-index: 100;
1438

src/Bridge/EasyAdmin/assets/styles/rename-form.css

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/* ==========================================================================
2+
Rename file form
3+
========================================================================== */
4+
5+
/* Custom properties
6+
========================================================================== */
7+
8+
.rename-file-container {
9+
--rename-file-color: var(--jm-dropzone-color);
10+
--rename-file-background-color: var(--jm-color-gray-100);
11+
--rename-file-border-color: var(--jm-dropzone-border-color);
12+
}
13+
14+
[data-bs-theme="dark"] {
15+
.rename-file-container {
16+
--rename-file-color: var(--jm-color-gray-100);
17+
--rename-file-background-color: var(--true-gray-800);
18+
--rename-file-border-color: var(--jm-color-gray);
19+
}
20+
}
21+
22+
/* Rules
23+
========================================================================== */
124
.rename-file-container {
225
display: none;
326
top: 100%;
@@ -6,9 +29,9 @@
629
min-height: auto;
730
margin-bottom: 1.5rem;
831
padding: 1.5rem;
9-
color: var(--jm-dropzone-color);
10-
background-color: var(--jm-color-gray-100);
11-
border: dashed 1px var(--jm-dropzone-border-color);
32+
color: var(--rename-file-color);
33+
background-color: var(--rename-file-background-color);
34+
border: dashed 1px var(--rename-file-border-color);
1235
border-radius: 4px;
1336
z-index: 100;
1437

src/Bridge/EasyAdmin/public/entrypoints.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"entrypoints": {
33
"joli-media-easy-admin": {
44
"css": [
5-
"./joli-media-easy-admin.701f807e.css"
5+
"./joli-media-easy-admin.72f01548.css"
66
],
77
"js": [
88
"./joli-media-easy-admin.d53cb5bd.js"

src/Bridge/EasyAdmin/public/joli-media-easy-admin.701f807e.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)