From: Andy Allan Date: Wed, 18 Mar 2020 10:16:03 +0000 (+0100) Subject: Enable remaining bootstrap components X-Git-Tag: live~2196^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b0c50ab344f924e855d9a9003c1b913685d1bb62 Enable remaining bootstrap components Fixes #2511 --- diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss deleted file mode 100644 index d3072d2b5..000000000 --- a/app/assets/stylesheets/_bootstrap-custom.scss +++ /dev/null @@ -1,44 +0,0 @@ -/*! - * Bootstrap v4.3.1 (https://getbootstrap.com/) - * Copyright 2011-2019 The Bootstrap Authors - * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - -@import "bootstrap/functions"; -@import "bootstrap/variables"; -@import "bootstrap/mixins"; -@import "bootstrap/root"; -@import "bootstrap/reboot"; -@import "bootstrap/type"; -// @import "bootstrap/images"; -// @import "bootstrap/code"; -@import "bootstrap/grid"; -// @import "bootstrap/tables"; -// @import "bootstrap/forms"; -@import "bootstrap/buttons"; -// @import "bootstrap/transitions"; -@import "bootstrap/dropdown"; -@import "bootstrap/button-group"; -// @import "bootstrap/input-group"; -// @import "bootstrap/custom-forms"; -@import "bootstrap/nav"; -@import "bootstrap/navbar"; -@import "bootstrap/card"; -// @import "bootstrap/breadcrumb"; -// @import "bootstrap/pagination"; -@import "bootstrap/badge"; -// @import "bootstrap/jumbotron"; -@import "bootstrap/alert"; -// @import "bootstrap/progress"; -// @import "bootstrap/media"; -@import "bootstrap/list-group"; -// @import "bootstrap/close"; -// @import "bootstrap/toasts"; -// @import "bootstrap/modal"; -@import "bootstrap/tooltip"; -// @import "bootstrap/popover"; -// @import "bootstrap/carousel"; -// @import "bootstrap/spinners"; -@import "bootstrap/utilities"; -// @import "bootstrap/print"; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 98b58c998..df0b072e0 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,5 +1,5 @@ @import "parameters"; -@import "bootstrap-custom"; +@import "bootstrap"; /* Styles common to large and small screens */