diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-08 18:02:48 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-11 11:09:49 +0100 |
| commit | 2fa9b1fe8bd77b0579ab1373146b21646a92c3e8 (patch) | |
| tree | e7cbc6c5eb096055167c9bb53d96f563d16bd8dc | |
| parent | f5c8923ac29cb0b30442b609d8395ec9caa94d8e (diff) | |
| download | gitlab-ce-2fa9b1fe8bd77b0579ab1373146b21646a92c3e8.tar.gz | |
Fixes styling issues in test reports
In the Merge Request widget, the reports for tests
had an extra border.
The loading icon in the mr widget used in all
report sections had an extra margin causing text
to be misaligned.
This commit fixes both issues
Closes #52147
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/52147-loading-state.yml | 5 |
3 files changed, 9 insertions, 5 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 0e445a29de4..eeb90294f3f 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 @@ -268,11 +268,11 @@ export default { :key="deployment.id" :deployment="deployment" /> + <grouped-test-reports-app + v-if="mr.testResultsPath" + :endpoint="mr.testResultsPath" + /> <div class="mr-section-container"> - <grouped-test-reports-app - v-if="mr.testResultsPath" - :endpoint="mr.testResultsPath" - /> <div class="mr-widget-section"> <component :is="componentName" diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 45382d4ea43..895db89f289 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -201,7 +201,6 @@ .mr-widget-icon { font-size: 22px; - margin-right: $gl-btn-padding; } .ci-status-icon svg { diff --git a/changelogs/unreleased/52147-loading-state.yml b/changelogs/unreleased/52147-loading-state.yml new file mode 100644 index 00000000000..5ae844073f7 --- /dev/null +++ b/changelogs/unreleased/52147-loading-state.yml @@ -0,0 +1,5 @@ +--- +title: Removes extra border from test reports in the merge request widget +merge_request: +author: +type: fixed |