Browse Source

refactor: build styles

charlie 4 years ago
parent
commit
b40b5925f7
4 changed files with 10 additions and 6 deletions
  1. 7 4
      gulpfile.js
  2. 1 1
      resources/css/common.css
  3. 1 1
      resources/css/style.css
  4. 1 0
      src/main/frontend/components/block.css

+ 7 - 4
gulpfile.js

@@ -13,8 +13,10 @@ const resourcesPath = path.join(__dirname, 'resources')
 const sourcePath = path.join(__dirname, 'src/main/frontend')
 const resourceFilePath = path.join(resourcesPath, '**')
 
+const tailwindCoreEntry = path.join(__dirname, 'tailwind.css')
+const tailwindBuildEntry = path.join(sourcePath, '**/*.css')
 const tailwind = {
-  paths: [path.join(__dirname, 'tailwind.css'), path.join(sourcePath, '**/*.css')],
+  paths: [tailwindCoreEntry, tailwindBuildEntry],
   outputDir: path.join(outputPath, 'css'),
   outputName: 'tailwind.build.css',
 }
@@ -36,7 +38,10 @@ const css = {
   },
 
   buildCSS (...params) {
-    return gulp.series(css._buildTailwind.bind(null, void 0, void 0), css._optimizeCSSForRelease)(...params)
+    return gulp.series(
+      css._buildTailwind.bind(null, tailwindCoreEntry, 'tailwind.core.css'),
+      css._buildTailwind.bind(null, tailwindBuildEntry, 'tailwind.build.css'),
+      css._optimizeCSSForRelease)(...params)
   },
 
   _buildTailwind (entry, output) {
@@ -49,8 +54,6 @@ const css = {
   },
 
   _optimizeCSSForRelease () {
-    // tailwind.core.css placeholder
-    fs.writeFileSync(path.join(outputPath, 'css', 'tailwind.core.css'), '')
     return gulp.src(path.join(outputPath, 'css', 'style.css'))
       .pipe(cleanCSS())
       .pipe(gulp.dest(path.join(outputPath, 'css')))

+ 1 - 1
resources/css/common.css

@@ -244,7 +244,7 @@ blockquote {
   background-color: var(--ls-page-blockquote-bg-color, #f7f7f7);
   margin: 1rem 0;
   color: var(--ls-page-blockquote-color, #24292e);
-  font-size: 1.25rem;
+  font-size: 1rem;
 }
 
 input {

+ 1 - 1
resources/css/style.css

@@ -10,5 +10,5 @@
 @import "./datepicker.css";
 @import "./highlight.css";
 @import "../../static/css/tailwind.core.css"; /* Build by gulp. Check `_buildTailwind` for more detail */
-@import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */
 @import "./common.css";
+@import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */

+ 1 - 0
src/main/frontend/components/block.css

@@ -6,6 +6,7 @@
   max-width: 100%;
   overflow: initial;
   cursor: text;
+  word-break: break-word;
 
   img {
     max-width: 100%;