Skip to content

Commit 1f87852

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Add dark theme See merge request minecraft/ConvertJavaTextureToBedrock!31
2 parents c0641eb + 53dab73 commit 1f87852

3 files changed

Lines changed: 51 additions & 19 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## [3.2.5]
4+
- Add dark theme
5+
36
## [3.2.4]
47
- Keep "Experimental conversions" switch state
58

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
33
"productName": "ConvertJavaTextureToBedrock",
4-
"version": "3.2.4",
4+
"version": "3.2.5",
55
"description": "Convert Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",

‎src/webapp/css/style.less‎

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,8 @@ html, body {
66
height: 100%;
77
}
88

9-
#toastMessage {
10-
cursor: pointer;
11-
margin: 0;
12-
opacity: 0;
13-
position: fixed;
14-
right: 20px;
15-
top: 50px;
16-
transition-duration: 300ms;
17-
transition-property: opacity, top, visibility;
18-
visibility: hidden;
19-
20-
&[data-show] {
21-
opacity: 1;
22-
top: 20px;
23-
visibility: visible;
24-
}
25-
}
26-
279
main {
10+
.white;
2811
.black-text;
2912
align-items: center;
3013
border-color: currentColor;
@@ -78,3 +61,49 @@ footer {
7861
}
7962
}
8063
}
64+
65+
#toastMessage {
66+
cursor: pointer;
67+
margin: 0;
68+
opacity: 0;
69+
position: fixed;
70+
right: 20px;
71+
top: 50px;
72+
transition-duration: 300ms;
73+
transition-property: opacity, top, visibility;
74+
visibility: hidden;
75+
76+
&[data-show] {
77+
opacity: 1;
78+
top: 20px;
79+
visibility: visible;
80+
}
81+
}
82+
83+
@media (prefers-color-scheme: dark) {
84+
main {
85+
.grey.darken-4;
86+
.white-text;
87+
}
88+
89+
.swal-modal {
90+
.grey.darken-4;
91+
.white-text;
92+
}
93+
94+
.swal-title {
95+
.white-text;
96+
}
97+
98+
.swal-icon--success {
99+
&::before,
100+
&::after,
101+
&__hide-corners {
102+
background-color: transparent;
103+
}
104+
}
105+
106+
.log {
107+
.grey.darken-3;
108+
}
109+
}

0 commit comments

Comments
 (0)