From e8872a8c22608ce0758ff99e80476d0e44049379 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 13 Jan 2019 15:15:28 -0200 Subject: [PATCH] remove theme do sapl frontend project --- sapl-frontend/src/theme/main.js | 9 ------ sapl-frontend/src/theme/scss/app.scss | 1 - sapl-frontend/src/theme/scss/header.scss | 38 ------------------------ sapl-frontend/vue.config.js | 9 +++--- 4 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 sapl-frontend/src/theme/main.js delete mode 100644 sapl-frontend/src/theme/scss/app.scss delete mode 100644 sapl-frontend/src/theme/scss/header.scss diff --git a/sapl-frontend/src/theme/main.js b/sapl-frontend/src/theme/main.js deleted file mode 100644 index 69597209a..000000000 --- a/sapl-frontend/src/theme/main.js +++ /dev/null @@ -1,9 +0,0 @@ -//import "./scss/app.scss"; -//import 'bootstrap'; - -import "sapl-oficial-theme/src/main"; - -//eslint-disable-next-line -let theme_lib = THEME_CUSTOM -console.log(theme_lib); - diff --git a/sapl-frontend/src/theme/scss/app.scss b/sapl-frontend/src/theme/scss/app.scss deleted file mode 100644 index 6053ec318..000000000 --- a/sapl-frontend/src/theme/scss/app.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'header'; diff --git a/sapl-frontend/src/theme/scss/header.scss b/sapl-frontend/src/theme/scss/header.scss deleted file mode 100644 index 80eb1290d..000000000 --- a/sapl-frontend/src/theme/scss/header.scss +++ /dev/null @@ -1,38 +0,0 @@ -@import "~bootstrap/scss/functions"; -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/mixins"; -@import "~bootstrap/scss/reboot"; -@import "~bootstrap/scss/type"; -@import "~bootstrap/scss/images"; -@import "~bootstrap/scss/code"; -@import "~bootstrap/scss/grid"; -@import "~bootstrap/scss/tables"; -@import "~bootstrap/scss/forms"; -@import "~bootstrap/scss/buttons"; -@import "~bootstrap/scss/transitions"; -@import "~bootstrap/scss/dropdown"; -@import "~bootstrap/scss/button-group"; -@import "~bootstrap/scss/input-group"; -@import "~bootstrap/scss/custom-forms"; -@import "~bootstrap/scss/nav"; -@import "~bootstrap/scss/navbar"; -@import "~bootstrap/scss/card"; -@import "~bootstrap/scss/breadcrumb"; -@import "~bootstrap/scss/pagination"; -@import "~bootstrap/scss/badge"; -@import "~bootstrap/scss/jumbotron"; -@import "~bootstrap/scss/alert"; -@import "~bootstrap/scss/progress"; -@import "~bootstrap/scss/media"; -@import "~bootstrap/scss/list-group"; -@import "~bootstrap/scss/close"; -@import "~bootstrap/scss/toasts"; -@import "~bootstrap/scss/modal"; -@import "~bootstrap/scss/tooltip"; -@import "~bootstrap/scss/popover"; -@import "~bootstrap/scss/carousel"; -@import "~bootstrap/scss/spinners"; -@import "~bootstrap/scss/utilities"; -@import "~bootstrap/scss/print"; - -//@import "~bootstrap-material-design/scss/bootstrap-material-design" diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js index 37baba374..ebe82780f 100644 --- a/sapl-frontend/vue.config.js +++ b/sapl-frontend/vue.config.js @@ -36,10 +36,14 @@ module.exports = { path.join(__dirname, 'public'), path.join(__dirname, 'src', 'assets'), path.join(__dirname, 'node_modules', THEME_CUSTOM, 'public'), - ] ) config.entryPoints.delete('app') + + config.entry(THEME_CUSTOM) + //.add('./src/theme/main.js') + .add(THEME_CUSTOM + '/src/main.js') + .end() config.entry('hellow') .add('./src/hellow/main.js') @@ -52,9 +56,6 @@ module.exports = { }]) .end()*/ - config.entry(THEME_CUSTOM) - .add(THEME_CUSTOM + '/src/main.js') - .end() } }