Merge branch 'master' into 'production'

fix purgecss remove code pre blocquote tags See merge request Romulus21/portal!57
2020-07-25 11:47:12 +00:00
parent 01f311922b a4af2abb69
commit e3385e00ef
2 changed files with 2 additions and 4 deletions
--- a/resources/sass/pages/memos.scss
+++ b/resources/sass/pages/memos.scss
@@ -31,9 +31,7 @@

    pre,
    code {
-        @apply text-white p-1;
-        background-color: #4A5568;
-        //color: #ffffff;
+        @apply bg-gray-700 text-white p-1;
    }

    pre {
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -10,4 +10,4 @@ mix.js('resources/js/app.js', 'public/js')
        processCssUrls: false,
        postCss: [ tailwindcss('./tailwind.config.js') ],
    })
-    .purgeCss();
+    .purgeCss({whitelistPatterns: [/-active$/, /-enter$/, /-leave-to$/, /show$/, /code$/, /pre$/, /blockquote$/]});