chore: remove style.dev.css

Also, place common.css after tailwindcss utilities to make sure our style has a higher priority
logseq · Mar 18, 2021 · 7e08073 · 7e08073
1 parent 8a4fc81
commit 7e08073
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/resources/css/style.css b/resources/css/style.css
@@ -11,5 +11,4 @@
 @import "./datepicker.css";
 @import "./highlight.css";
 @import "./tooltip.css";
-@import "./common.css";
 @import "./tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */
diff --git a/resources/css/style.dev.css b/resources/css/style.dev.css
diff --git a/resources/electron-dev.html b/resources/electron-dev.html
@@ -3,8 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" name="viewport">
-  <link href="./css/style.dev.css" rel="stylesheet" type="text/css">
-  <link href="./css/tailwind.build.css" rel="stylesheet" type="text/css">
+  <link href="./css/style.css" rel="stylesheet" type="text/css">
   <link href="./img/logo.png" rel="shortcut icon" type="image/png">
   <link href="./img/logo.png" rel="shortcut icon" sizes="192x192">
   <link href="./img/logo.png" rel="apple-touch-icon">

diff --git a/tailwind.all.css b/tailwind.all.css
@@ -1,5 +1,5 @@
 @import "tailwindcss/base";
 @import "tailwindcss/components";
 @import "tailwindcss/utilities";
-
-@import-glob "src/main/frontend/**/*.css";
+@import "resources/css/common.css";
+@import-glob "src/main/frontend/**/*.css";