diff options
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 17 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/performance_bar.scss | 3 | ||||
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | yarn.lock | 8 |
6 files changed, 9 insertions, 27 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index c8357f7751c..271697d6aa1 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -1,23 +1,6 @@ /* * Scss to help with bootstrap 3 to 4 migration */ - -$text-color: $gl-text-color; - -$brand-primary: $blue-500; -$brand-success: $green-500; -$brand-info: $blue-500; -$brand-warning: $orange-500; -$brand-danger: $red-500; - -$border-radius-base: 3px !default; - -$modal-body-bg: $white-light; -$input-border: $border-color; - -$padding-base-vertical: $gl-vert-padding; -$padding-base-horizontal: $gl-padding; - body, .form-control, .search form { diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 216877a4461..a840bcc1087 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -1,8 +1,7 @@ @import 'framework/variables'; -@import 'framework/variables_overrides'; +@import "../../../node_modules/@gitlab/ui/scss/gitlab_ui"; @import 'framework/mixins'; -@import 'bootstrap'; @import 'bootstrap_migration'; @import 'framework/layout'; diff --git a/app/assets/stylesheets/performance_bar.scss b/app/assets/stylesheets/performance_bar.scss index 9c01a2f8bda..4403007d4db 100644 --- a/app/assets/stylesheets/performance_bar.scss +++ b/app/assets/stylesheets/performance_bar.scss @@ -1,5 +1,4 @@ -@import 'framework/variables'; -@import 'framework/variables_overrides'; +@import "../../../node_modules/@gitlab/ui/scss/variables"; @import 'peek/views/rblineprof'; #js-peek { diff --git a/config/application.rb b/config/application.rb index 6bdf61edfb1..6bd74bcdf6d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -153,6 +153,7 @@ module Gitlab # Import gitlab-svgs directly from vendored directory 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.json" config.assets.precompile << "illustrations/*.svg" diff --git a/package.json b/package.json index 7d14ccc5a5e..9b50b3e52aa 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.8.0", "@gitlab/svgs": "^1.54.0", - "@gitlab/ui": "^2.2.3", + "@gitlab/ui": "https://gitlab.com/gitlab-org/gitlab-ui/-/jobs/177393526/artifacts/raw/gitlab-ui.160-bs-css.tgz", "apollo-boost": "^0.3.1", "apollo-client": "^2.5.1", "at.js": "^1.5.4", @@ -186,4 +186,4 @@ "node": ">=8.10.0", "yarn": "^1.10.0" } -} +}
\ No newline at end of file diff --git a/yarn.lock b/yarn.lock index dbd56b387ba..039261358ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -663,12 +663,12 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.54.0.tgz#00320e845efd46716042cde0c348b990d4908daf" integrity sha512-DR17iy8TM5IbXEacqiDP0p8SuC/J8EL+98xbfVz5BKvRsPHpeZJQNlBF/petIV5d+KWM5A9v3GZTY7uMU7z/JQ== -"@gitlab/ui@^2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.2.3.tgz#b3b4d1d785662dfba44ad2a7354fcbe4cee22fc9" - integrity sha512-N1Q1O6zpS4zZhmvWsUCtuGXTzQeHOzRWQZctbFTEJonidIWk6juqIBduYgR0MadG3DZxiovUN12jDGVtCfZKzw== +"@gitlab/ui@https://gitlab.com/gitlab-org/gitlab-ui/-/jobs/177393526/artifacts/raw/gitlab-ui.160-bs-css.tgz": + version "2.3.0" + resolved "https://gitlab.com/gitlab-org/gitlab-ui/-/jobs/177393526/artifacts/raw/gitlab-ui.160-bs-css.tgz#3e456b9d63091d2af8478feeca9c3241576c15d6" dependencies: "@babel/standalone" "^7.0.0" + bootstrap "4.1.3" bootstrap-vue "^2.0.0-rc.11" copy-to-clipboard "^3.0.8" echarts "^4.2.0-rc.2" |