Merge branch 'develop' into 'master'

Add dark theme See merge request minecraft/ConvertJavaTextureToBedrock!31
ModifiedCommand · Jan 28, 2020 · 1f87852 · 1f87852
2 parents c0641eb + 53dab73
commit 1f87852
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [3.2.5]
+- Add dark theme
+
 ## [3.2.4]
 - Keep "Experimental conversions" switch state
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
   "productName": "ConvertJavaTextureToBedrock",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",

diff --git a/src/webapp/css/style.less b/src/webapp/css/style.less
@@ -6,25 +6,8 @@ html, body {
   height: 100%;
 }
 
-#toastMessage {
-  cursor: pointer;
-  margin: 0;
-  opacity: 0;
-  position: fixed;
-  right: 20px;
-  top: 50px;
-  transition-duration: 300ms;
-  transition-property: opacity, top, visibility;
-  visibility: hidden;
-
-  &[data-show] {
-    opacity: 1;
-    top: 20px;
-    visibility: visible;
-  }
-}
-
 main {
+  .white;
   .black-text;
   align-items: center;
   border-color: currentColor;
@@ -78,3 +61,49 @@ footer {
     }
   }
 }
+
+#toastMessage {
+  cursor: pointer;
+  margin: 0;
+  opacity: 0;
+  position: fixed;
+  right: 20px;
+  top: 50px;
+  transition-duration: 300ms;
+  transition-property: opacity, top, visibility;
+  visibility: hidden;
+
+  &[data-show] {
+    opacity: 1;
+    top: 20px;
+    visibility: visible;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  main {
+    .grey.darken-4;
+    .white-text;
+  }
+
+  .swal-modal {
+    .grey.darken-4;
+    .white-text;
+  }
+
+  .swal-title {
+    .white-text;
+  }
+
+  .swal-icon--success {
+    &::before,
+    &::after,
+    &__hide-corners {
+      background-color: transparent;
+    }
+  }
+
+  .log {
+    .grey.darken-3;
+  }
+}