diff options
author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-21 21:56:17 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-11 13:03:56 +0000 |
commit | d94c6510d56de1abfefe4477d5cc88a06ff034d3 (patch) | |
tree | cd0c8454a520422fe6cf3fb2303651dbfa660bea | |
parent | a1624833e8c98ed86137551f3534ba64300e44fc (diff) | |
download | gitlab-ce-d94c6510d56de1abfefe4477d5cc88a06ff034d3.tar.gz |
Merge branch 'ps-remove-mr-widget-section-padding' into 'master'
Remove padding for mr-widget-section
See merge request gitlab-org/gitlab-ce!25475
(cherry picked from commit a6d52ff83ff86f88f59f6a231fc4a348640729f7)
7bd65593 Remove padding for mr-widget-section
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index abbbe19c5ef..57c4dfbe3b7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -315,7 +315,7 @@ export default { :endpoint="mr.testResultsPath" /> - <div class="mr-widget-section p-0"> + <div class="mr-widget-section"> <component :is="componentName" :mr="mr" :service="service" /> <section v-if="shouldRenderCollaborationStatus" class="mr-info-list mr-links"> diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 790d438c7e2..5624ac5192d 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -82,7 +82,6 @@ } .mr-widget-body, -.mr-widget-section, .mr-widget-content, .mr-widget-footer { padding: $gl-padding; |