Merge remote-tracking branch 'origin/dev' into dev

quasarframework · Jun 4, 2020 · 39ec983 · 39ec983
2 parents 6e1fb62 + 5d48bf2
commit 39ec983
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/demo/quasar.conf.js b/demo/quasar.conf.js
@@ -56,8 +56,6 @@ module.exports = function (/* ctx */) {
         dark: 'auto'
       },
 
-
-
       // Quasar plugins
       plugins: [
         'Dark',
@@ -103,7 +101,6 @@ module.exports = function (/* ctx */) {
           ui: path.resolve(__dirname, '../ui/src/index.js'),
           '@quasar/quasar-ui-qmarkdown/src/index.sass': path.resolve(__dirname, '../ui/src/index.sass'),
           '@quasar/quasar-ui-qmarkdown': path.resolve(__dirname, '../ui/src'),
-          sass: path.resolve(__dirname, '../ui/src/index.sass'),
           examples: path.resolve(__dirname, './src/examples')
         })
 

diff --git a/demo/src/css/app.sass b/demo/src/css/app.sass
@@ -1,5 +1,5 @@
 // app global css
-@import 'sass'
+@import '@quasar/quasar-ui-qmarkdown/src/index.sass'
 
 $fgColor: #155799
 $bgColor: #c83349