Import bootstrap styles from gitlab-ui
Use gitlab_ui.scss instead of all the bootstrap imports Allow the ../node_modules path from gitlab_ui.scss to resolve
This commit is contained in:
parent
d2929d6edb
commit
b8a0f1e646
|
@ -1,37 +0,0 @@
|
||||||
/*
|
|
||||||
* Includes specific styles from the bootstrap4 folder in node_modules
|
|
||||||
*/
|
|
||||||
|
|
||||||
@import "../../../node_modules/bootstrap/scss/functions";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/variables";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/mixins";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/root";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/reboot";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/type";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/images";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/code";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/grid";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/tables";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/forms";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/buttons";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/transitions";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/dropdown";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/button-group";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/input-group";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/custom-forms";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/nav";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/navbar";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/card";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/breadcrumb";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/pagination";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/badge";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/alert";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/progress";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/media";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/list-group";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/close";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/modal";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/tooltip";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/popover";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/utilities";
|
|
||||||
@import "../../../node_modules/bootstrap/scss/print";
|
|
|
@ -1,7 +1,3 @@
|
||||||
/*
|
|
||||||
* Scss to help with bootstrap 3 to 4 migration
|
|
||||||
*/
|
|
||||||
|
|
||||||
$text-color: $gl-text-color;
|
$text-color: $gl-text-color;
|
||||||
|
|
||||||
$brand-primary: $blue-500;
|
$brand-primary: $blue-500;
|
||||||
|
@ -18,6 +14,9 @@ $input-border: $border-color;
|
||||||
$padding-base-vertical: $gl-vert-padding;
|
$padding-base-vertical: $gl-vert-padding;
|
||||||
$padding-base-horizontal: $gl-padding;
|
$padding-base-horizontal: $gl-padding;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Scss to help with bootstrap 3 to 4 migration
|
||||||
|
*/
|
||||||
body,
|
body,
|
||||||
.form-control,
|
.form-control,
|
||||||
.search form {
|
.search form {
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
@import 'framework/variables_overrides';
|
@import 'framework/variables_overrides';
|
||||||
@import 'framework/mixins';
|
@import 'framework/mixins';
|
||||||
|
|
||||||
@import 'bootstrap';
|
@import '../../../node_modules/@gitlab/ui/scss/gitlab_ui';
|
||||||
|
|
||||||
@import 'bootstrap_migration';
|
@import 'bootstrap_migration';
|
||||||
@import 'framework/layout';
|
@import 'framework/layout';
|
||||||
|
|
||||||
|
|
|
@ -153,6 +153,7 @@ module Gitlab
|
||||||
|
|
||||||
# Import gitlab-svgs directly from vendored directory
|
# Import gitlab-svgs directly from vendored directory
|
||||||
config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"
|
config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"
|
||||||
|
config.assets.paths << "#{config.root}/node_modules"
|
||||||
config.assets.precompile << "icons.svg"
|
config.assets.precompile << "icons.svg"
|
||||||
config.assets.precompile << "icons.json"
|
config.assets.precompile << "icons.json"
|
||||||
config.assets.precompile << "illustrations/*.svg"
|
config.assets.precompile << "illustrations/*.svg"
|
||||||
|
|
Loading…
Reference in New Issue