Home Explore Help
Register Sign In
Apq
/
logseq
mirror of https://github.com/logseq/logseq.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

refactor: merge both vendor.css and main.css

Import all used CSS modules into tailwind.all.css
Tienson Qin 4 years ago
parent
817bf9aec0
commit
e06ee2290f
8 changed files with 17 additions and 34 deletions
Split View Show Diff Stats
  1. 1 12
      gulpfile.js
  2. 2 2
      package.json
  3. 0 0
      public/index.html
  4. 0 13
      resources/css/vendor.css
  5. 1 2
      resources/electron-dev.html
  6. 1 2
      resources/electron.html
  7. 12 0
      tailwind.all.css
  8. 0 3
      tailwind.css

+ 1 - 12
gulpfile.js
View File 

@@ -20,8 +20,7 @@ const css = {
 
   buildCSS (...params) {
 
     return gulp.series(
 
       () => exec(`yarn css:build`, {}),
 
-      css._optimizeVendorCSSForRelease,
 
-      css._optimizeMainCSSForRelease
 
+      css._optimizeCSSForRelease
 
     )(...params)
 
   },
 
 
@@ -29,16 +28,6 @@ const css = {
 
     return gulp.src(path.join(outputPath, 'css', 'style.css'))
 
       .pipe(cleanCSS())
 
       .pipe(gulp.dest(path.join(outputPath, 'css')))
 
-  },
 
-  _optimizeVendorCSSForRelease () {
 
-    return gulp.src(path.join(outputPath, 'css', 'vendor.css'))
 
-      .pipe(cleanCSS())
 
-      .pipe(gulp.dest(path.join(outputPath, 'css')))
 
-  },
 
-  _optimizeMainCSSForRelease () {
 
-    return gulp.src(path.join(outputPath, 'css', 'main.css'))
 
-      .pipe(cleanCSS())
 
-      .pipe(gulp.dest(path.join(outputPath, 'css')))
 
   }
 
 }

+ 2 - 2
package.json
View File 

@@ -41,8 +41,8 @@
 
         "style:lint": "stylelint \"src/**/*.css\" ",
 
         "gulp:watch": "gulp watch",
 
         "gulp:build": "cross-env NODE_ENV=production gulp build",
 
-        "css:build": "postcss tailwind.all.css -o static/css/main.css --verbose --env production",
 
-        "css:watch": "postcss tailwind.all.css -o static/css/main.css --verbose --watch",
 
+        "css:build": "postcss tailwind.all.css -o static/css/style.css --verbose --env production",
 
+        "css:watch": "postcss tailwind.all.css -o static/css/style.css --verbose --watch",
 
         "cljs:watch": "clojure -M:cljs watch app publishing electron",
 
         "cljs:electron-watch": "clojure -M:cljs watch app electron",
 
         "cljs:release": "clojure -M:cljs release app publishing electron",

File diff suppressed because it is too large
+ 0 - 0
public/index.html


+ 0 - 13
resources/css/vendor.css
View File 

@@ -1,13 +0,0 @@
 
-@charset "utf-8";
 
-@import "./inter.css";
 
-@import "./reveal.min.css";
 
-@import "./reveal_black.min.css";
 
-@import "./fonts.css";
 
-@import "./excalidraw.min.css";
 
-@import "./katex.min.css";
 
-@import "./codemirror.min.css";
 
-@import "./animation.css";
 
-@import "./table.css";
 
-@import "./datepicker.css";
 
-@import "./highlight.css";
 
-@import "./tooltip.css";

+ 1 - 2
resources/electron-dev.html
View File 

@@ -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/vendor.css" rel="stylesheet" type="text/css">
 
-  <link href="./css/main.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">

+ 1 - 2
resources/electron.html
View File 

@@ -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/vendor.css" rel="stylesheet" type="text/css">
 
-  <link href="./css/main.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">

+ 12 - 0
tailwind.all.css
View File 

@@ -1,5 +1,17 @@
 
 @import "tailwindcss/base";
 
 @import "tailwindcss/components";
 
+@import "resources/css/inter.css";
 
+@import "resources/css/reveal.min.css";
 
+@import "resources/css/reveal_black.min.css";
 
+@import "resources/css/fonts.css";
 
+@import "resources/css/excalidraw.min.css";
 
+@import "resources/css/katex.min.css";
 
+@import "resources/css/codemirror.min.css";
 
+@import "resources/css/animation.css";
 
+@import "resources/css/table.css";
 
+@import "resources/css/datepicker.css";
 
+@import "resources/css/highlight.css";
 
+@import "resources/css/tooltip.css";
 
 @import "resources/css/common.css";
 
 @import-glob "src/main/frontend/**/*.css";
 
 @import "tailwindcss/utilities";

+ 0 - 3
tailwind.css
View File 

@@ -1,3 +0,0 @@
 
-@tailwind base;
 
-@tailwind components;
 
-@tailwind utilities;

Some files were not shown because too many files changed in this diff