revert to one css file

nbwzlyd · Jul 24, 2020 · d7806ed · d7806ed
1 parent 60105b6
commit d7806ed
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 37 deletions.
diff --git a/WebView/app/src/main/assets/dark.css b/WebView/app/src/main/assets/dark.css
diff --git a/WebView/app/src/main/assets/index.html b/WebView/app/src/main/assets/index.html
@@ -18,23 +18,6 @@
   <head>
     <script async src="main.js"></script>
     <meta name="color-scheme" content="dark light">
-    <script>
-      // If dark mode is not supported then load light.css
-      if (window.matchMedia('(prefers-color-scheme: dark)').media === 'not all') {
-      document.head.insertAdjacentHTML(
-        'beforeend',
-        '<link rel="stylesheet" href="light.css" onload="document.documentElement.style.display = \'\'">'
-       );
-     }
-    </script>
-    <!--
-      If dark mode is supported, conditionally either load the light or the dark stylesheet. If
-      `prefers-color-scheme` is not supported the media query is unknown and the files are loaded
-       with `lowest` priority.
-    -->
-    <link rel="stylesheet" href="dark.css" media="(prefers-color-scheme: dark)">
-    <link rel="stylesheet" href="light.css" media="(prefers-color-scheme: light)">
-    <!-- The main stylesheet with generic rules used universally -->
     <link rel="stylesheet" href="style.css">
   </head>
   <body onload="getData()">

diff --git a/WebView/app/src/main/assets/light.css b/WebView/app/src/main/assets/light.css
diff --git a/WebView/app/src/main/assets/style.css b/WebView/app/src/main/assets/style.css
@@ -13,8 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+body {
+  background-color: white;
+}
 h1, h2 {
   text-align: center;
+  color: black;
+  text-align: center;
 }
 p {
   font-family: verdana;
@@ -80,4 +85,20 @@ img {
   padding-top: 20%;
   padding-left: 5%;
   padding-right: 5%;
+}
+@media (prefers-color-scheme: dark) {
+  body {
+    background: #383838;
+  }
+  h1 {
+    color: white;
+  }
+  h2 {
+    color: white;
+  }
+  select {
+    color: white;
+    background-color: #1f1f1f;
+    border-color: #121212;
+  }
 }