From bd63d16340a16f9691a98616433b7c1c510fb9fc Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 28 Mar 2022 12:14:05 +0200 Subject: [PATCH] change linking from imports --- .../src/assets/scss/custom/_variables.scss | 2 +- frontend/src/assets/scss/gradido.scss | 226 +++--------------- 2 files changed, 36 insertions(+), 192 deletions(-) diff --git a/frontend/src/assets/scss/custom/_variables.scss b/frontend/src/assets/scss/custom/_variables.scss index a17320d1d..ee8616dab 100644 --- a/frontend/src/assets/scss/custom/_variables.scss +++ b/frontend/src/assets/scss/custom/_variables.scss @@ -978,4 +978,4 @@ $btn-border-radius-sm: $input-border-radius !default; // Import Bootstrap variable defaults -@import "~bootstrap/scss/variables"; +@import "../../../../node_modules/bootstrap/scss/variables"; diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 53a296713..f05557c5d 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -1,211 +1,55 @@ // Bootstrap (4.5.3) functions -@import "~bootstrap/scss/functions"; +@import "../../../node_modules/bootstrap/scss/functions"; @import "custom/variables"; // @import "~bootstrap/scss/variables"; wird am // ende der custom/variables angehangen // Bootstrap (4.5.3) mixins -@import "~bootstrap/scss/mixins"; +@import "../../../node_modules/bootstrap/scss/mixins"; // Bootstrap (4.5.3) components -@import "~bootstrap/scss/alert"; -@import "~bootstrap/scss/badge"; -@import "~bootstrap/scss/dropdown"; -@import "~bootstrap/scss/button-group"; -@import "~bootstrap/scss/buttons"; -@import "~bootstrap/scss/card"; -@import "~bootstrap/scss/carousel"; -@import "~bootstrap/scss/close"; -@import "~bootstrap/scss/code"; -@import "~bootstrap/scss/custom-forms"; +@import "../../../node_modules/bootstrap/scss/alert"; +@import "../../../node_modules/bootstrap/scss/badge"; +@import "../../../node_modules/bootstrap/scss/dropdown"; +@import "../../../node_modules/bootstrap/scss/button-group"; +@import "../../../node_modules/bootstrap/scss/buttons"; +@import "../../../node_modules/bootstrap/scss/card"; +@import "../../../node_modules/bootstrap/scss/carousel"; +@import "../../../node_modules/bootstrap/scss/close"; +@import "../../../node_modules/bootstrap/scss/code"; +@import "../../../node_modules/bootstrap/scss/custom-forms"; // @import "~bootstrap/scss/dropdown"; -@import "~bootstrap/scss/forms"; +@import "../../../node_modules/bootstrap/scss/forms"; // @import "~bootstrap/scss/functions"; -@import "~bootstrap/scss/grid"; -@import "~bootstrap/scss/input-group"; -@import "~bootstrap/scss/list-group"; +@import "../../../node_modules/bootstrap/scss/grid"; +@import "../../../node_modules/bootstrap/scss/input-group"; +@import "../../../node_modules/bootstrap/scss/list-group"; // @import "~bootstrap/scss/mixins"; -@import "~bootstrap/scss/modal"; -@import "~bootstrap/scss/nav"; -@import "~bootstrap/scss/navbar"; -@import "~bootstrap/scss/pagination"; -@import "~bootstrap/scss/print"; -@import "~bootstrap/scss/progress"; -@import "~bootstrap/scss/reboot"; -@import "~bootstrap/scss/tables"; -@import "~bootstrap/scss/toasts"; -@import "~bootstrap/scss/tooltip"; -@import "~bootstrap/scss/transitions"; -@import "~bootstrap/scss/type"; -@import "~bootstrap/scss/utilities"; -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/bootstrap-grid"; -@import "~bootstrap/scss/bootstrap-reboot"; -@import "~bootstrap/scss/bootstrap"; +@import "../../../node_modules/bootstrap/scss/modal"; +@import "../../../node_modules/bootstrap/scss/nav"; +@import "../../../node_modules/bootstrap/scss/navbar"; +@import "../../../node_modules/bootstrap/scss/pagination"; +@import "../../../node_modules/bootstrap/scss/print"; +@import "../../../node_modules/bootstrap/scss/progress"; +@import "../../../node_modules/bootstrap/scss/reboot"; +@import "../../../node_modules/bootstrap/scss/tables"; +@import "../../../node_modules/bootstrap/scss/toasts"; +@import "../../../node_modules/bootstrap/scss/tooltip"; +@import "../../../node_modules/bootstrap/scss/transitions"; +@import "../../../node_modules/bootstrap/scss/type"; +@import "../../../node_modules/bootstrap/scss/utilities"; +@import "../../../node_modules/bootstrap/scss/variables"; +@import "../../../node_modules/bootstrap/scss/bootstrap-grid"; +@import "../../../node_modules/bootstrap/scss/bootstrap-reboot"; +@import "../../../node_modules/bootstrap/scss/bootstrap"; // Bootstrap-vue (2.21.1) scss -@import "~bootstrap-vue/src/index"; +@import "../../../node_modules/bootstrap-vue/src/index"; -.alert-success { - color: #155724; - background-color: #d4edda; - border-color: #c3e6cb; -} - -.alert-danger { - color: #721c24; - background-color: #f8d7da; - border-color: #f5c6cb; -} - -.b-toast-danger .toast .toast-header { - color: #721c24; - background-color: rgb(248 215 218 / 85%); - border-bottom-color: rgb(245 198 203 / 85%); -} - -.b-toast-danger .toast .toast-body { - background-color: rgb(252 237 238 / 85%); - border-color: rgb(245 198 203 / 85%); - color: #721c24; -} - -.b-toast-success .toast .toast-header { - color: #155724; - background-color: rgb(212 237 218 / 58%); - border-bottom-color: rgb(195 230 203 / 85%); -} - -.b-toast-success .toast .toast-body { - color: #155724; - background-color: rgb(212 237 218 / 85%); - border-bottom-color: rgb(195 230 203 / 85%); -} - -// .btn-primary pim { -.btn-primary { - background-color: #5a7b02; - border-color: #5e72e4; -} - -.gradido-font-large { - font-size: large; - height: auto !important; -} - -a, -.copyright { - color: #5a7b02; -} - -.font12em { - font-size: 1.2em; -} - -.font2em { - font-size: 1.5em; -} - -.gradido-global-color-text { - color: #3d443b; -} - -.gradido-global-color-accent { - color: #047006; -} - -.gradido-global-color-6e0a9c9e { - color: #000; -} - -.gradido-global-color-2d0fb154 { - color: #047006; -} - -.gradido-global-color-16efe88c { - color: #7ebc55; -} - -.gradido-global-color-1939326 { - color: #f6fff6; -} - -.gradido-global-color-9d79fc1 { - color: #047006; -} - -.gradido-global-color-6347f4d { - color: #5a7b02; -} - -.gradido-global-color-4fbc19a { - color: #014034; -} - -.gradido-global-color-d341874 { - color: #b6d939; -} - -.gradido-global-color-619d338 { - color: #8ebfb1; -} - -.gradido-global-color-44819a9 { - color: #026873; -} - -.gradido-global-color-gray { - color: #858383; -} - -.gradido-custom-background { - background-color: #ebebeba3 !important; -} - -.gradido-max-width { - width: 100%; -} - -.gradido-width-300 { - width: 300px; -} - -.gradido-absolute { - position: absolute; -} - -.gradido-width-95-absolute { - width: 95%; - position: absolute; -} - -.gradido-width-96-absolute { - width: 96%; - position: absolute; -} - -.gradido-no-border-radius { - border-radius: 0; -} - -.gradido-no-border { - border: 0; -} - -.gradido-background-f1 { - background-color: #f1f1f1; -} - -.gradido-background-white { - background-color: #fff; -} - -.gradido-font-15rem { - font-size: 1.5rem; -} +@import "gradido-template.scss"; \ No newline at end of file