From 63347a0ff966c7863e5b7431effa1cb0668df893 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 9 Aug 2018 14:55:06 +0200 Subject: Migrate to bootstrap 4 and ng-bootstrap --- client/src/sass/include/_bootstrap.scss | 86 +++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 36 deletions(-) (limited to 'client/src/sass/include') diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss index b56b71536..5abec02d5 100644 --- a/client/src/sass/include/_bootstrap.scss +++ b/client/src/sass/include/_bootstrap.scss @@ -1,37 +1,51 @@ -@import "~bootstrap/scss/functions"; -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/mixins"; -@import "~bootstrap/scss/root"; -@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/modal"; -@import "~bootstrap/scss/tooltip"; -@import "~bootstrap/scss/popover"; -//@import "~bootstrap/scss/carousel"; -//@import "~bootstrap/scss/utilities"; -//@import "~bootstrap/scss/print"; +$dropdown-link-active-bg: inherit; -@import "~@neos21/bootstrap3-glyphicons/assets/stylesheets/bootstrap3-glyphicons"; \ No newline at end of file +$zindex-modal: 10005; +$modal-footer-border-width: 0; +$modal-md: 600px; + +$input-btn-focus-width: 0; +$input-btn-focus-color: inherit; +$input-focus-border-color: #ced4da; + +$nav-pills-link-active-bg: #F0F0F0; +$nav-pills-link-active-color: #000; + +@import '~bootstrap/scss/functions'; +@import '~bootstrap/scss/variables'; + +@import '~bootstrap/scss/mixins'; +@import '~bootstrap/scss/root'; +@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/modal'; +@import '~bootstrap/scss/tooltip'; +@import '~bootstrap/scss/popover'; +//@import '~bootstrap/scss/carousel'; +@import '~bootstrap/scss/utilities'; +//@import '~bootstrap/scss/print'; + +@import '~@neos21/bootstrap3-glyphicons/assets/stylesheets/bootstrap3-glyphicons'; -- cgit v1.2.3