diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
commit | 7915c41e4261719719e791602c8235574157164c (patch) | |
tree | 6c1fc8c4ad4e974878c879fcc2c7c8f7d56d0cee /app/assets | |
parent | 495c22d1245b6212b21b7379a542df73dfa77206 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue | 16 | ||||
-rw-r--r-- | app/assets/stylesheets/utilities.scss | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue index ec077197c9c..82b3c784f96 100644 --- a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue +++ b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue @@ -14,15 +14,18 @@ export default { }, successLabel: { type: String, - required: true, + required: false, + default: 'successful', }, failureLabel: { type: String, - required: true, + required: false, + default: 'failed', }, neutralLabel: { type: String, - required: true, + required: false, + default: 'neutral', }, successCount: { type: Number, @@ -36,6 +39,11 @@ export default { type: Number, required: true, }, + hideTooltips: { + type: Boolean, + required: false, + default: false, + }, }, computed: { neutralCount() { @@ -87,7 +95,7 @@ export default { return `width: ${percent}%;`; }, getTooltip(label, count) { - return `${label}: ${count}`; + return this.hideTooltips ? '' : `${label}: ${count}`; }, }, }; diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 0a1e97d1252..91bed4fc9f2 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -62,6 +62,14 @@ .gl-h-32 { height: px-to-rem($grid-size * 4); } .gl-h-64 { height: px-to-rem($grid-size * 8); } +.gl-shim-h-2 { + height: px-to-rem(4px); +} + +.gl-shim-w-5 { + width: px-to-rem(16px); +} + .gl-text-purple { color: $purple; } .gl-text-gray-800 { color: $gray-800; } .gl-bg-purple-light { background-color: $purple-light; } |