From 75d94c4cd0a31962c604e3632e3d80709b549e6f Mon Sep 17 00:00:00 2001 From: Paul Slaughter Date: Thu, 29 Nov 2018 16:57:30 -0600 Subject: [PATCH] Redesign of MR header sections (CE Port) - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593 - Create mr-widget-icon to encapsulate circle icons - Decouple workflow L&F from mr-widget-heading - Decouple container L&F from mr-widget-heading --- .../components/deployment.vue | 2 +- .../components/mr_widget_container.vue | 6 + .../components/mr_widget_header.vue | 4 +- .../components/mr_widget_icon.vue | 17 +++ .../components/mr_widget_pipeline.vue | 114 +++++++++--------- .../mr_widget_pipeline_container.vue | 74 ++++++++++++ .../mr_widget_options.vue | 48 ++------ app/assets/stylesheets/framework/icons.scss | 12 ++ .../stylesheets/pages/merge_requests.scss | 38 +++--- .../1979-redesign-mr-widget-approvals-ce.yml | 5 + .../user_sees_merge_widget_spec.rb | 2 +- .../components/mr_widget_container_spec.js | 51 ++++++++ .../components/mr_widget_icon_spec.js | 30 +++++ .../mr_widget_pipeline_container_spec.js | 90 ++++++++++++++ spec/javascripts/vue_mr_widget/mock_data.js | 13 ++ 15 files changed, 388 insertions(+), 118 deletions(-) create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/mr_widget_icon.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue create mode 100644 changelogs/unreleased/1979-redesign-mr-widget-approvals-ce.yml create mode 100644 spec/javascripts/vue_mr_widget/components/mr_widget_container_spec.js create mode 100644 spec/javascripts/vue_mr_widget/components/mr_widget_icon_spec.js create mode 100644 spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index 950347d8863..2f2a37347af 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -112,7 +112,7 @@ export default {