Browse Source

fix: auto beautify css injection in admin

NGPixel 5 years ago
parent
commit
95e79a7316
2 changed files with 10 additions and 3 deletions
  1. 2 2
      dev/build/Dockerfile
  2. 8 1
      server/graph/resolvers/theming.js

+ 2 - 2
dev/build/Dockerfile

@@ -1,7 +1,7 @@
 # ====================
 # --- Build Assets ---
 # ====================
-FROM node:12.13-alpine AS assets
+FROM node:12.14-alpine AS assets
 
 RUN apk add yarn g++ make python --no-cache
 
@@ -23,7 +23,7 @@ RUN yarn --production --frozen-lockfile --non-interactive
 # ===============
 # --- Release ---
 # ===============
-FROM node:12.13-alpine
+FROM node:12.14-alpine
 LABEL maintainer="requarks.io"
 
 RUN apk add bash curl git openssh gnupg sqlite --no-cache && \

+ 8 - 1
server/graph/resolvers/theming.js

@@ -20,7 +20,14 @@ module.exports = {
       }]
     },
     async config(obj, args, context, info) {
-      return _.pick(WIKI.config.theming, ['theme', 'iconset', 'darkMode', 'injectCSS', 'injectHead', 'injectBody'])
+      return {
+        theme: WIKI.config.theming.theme,
+        iconset: WIKI.config.theming.iconset,
+        darkMode: WIKI.config.theming.darkMode,
+        injectCSS: new CleanCSS({ format: 'beautify' }).minify(WIKI.config.theming.injectCSS).styles,
+        injectHead: WIKI.config.theming.injectHead,
+        injectBody: WIKI.config.theming.injectBody
+      }
     }
   },
   ThemingMutation: {