diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-10 10:18:05 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-10 10:18:05 -0600 |
| commit | c7c97c071d13fe7c9ab20bf023308dadc1403e31 (patch) | |
| tree | 1604e14620049e34539d5ffeaf50130f57a286b1 | |
| parent | ce9d41df085428ac7e212e95142f6a6ff0b50ae0 (diff) | |
| download | gitlab-ce-fix-spacing-icons-mr-widget.tar.gz | |
Fix spacing between MR widget icons and textfix-spacing-icons-mr-widget
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-spacing-icons-mr-widget.yml | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 692142c5887..0cbdd015e81 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -85,8 +85,11 @@ -webkit-align-items: center; align-items: center; + .widget-status-label { + margin-left: 8px; + } + svg { - margin-right: 4px; position: relative; top: 1px; overflow: visible; diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index bef76f16ca7..99c8fba3ea7 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -5,7 +5,7 @@ %div{ class: "ci-status-icon-#{status}" } = link_to namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'icon-link' do = ci_icon_for_status(status) - %span + %span.widget-status-label Pipeline = link_to "##{@pipeline.id}", namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'pipeline' = ci_label_for_status(status) @@ -24,7 +24,7 @@ - %w[success skipped canceled failed running pending].each do |status| .ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: "display:none" } = ci_icon_for_status(status) - %span + %span.widget-status-label CI job = ci_label_for_status(status) for @@ -35,15 +35,15 @@ .ci_widget = icon("spinner spin") - Checking CI status for #{@merge_request.diff_head_commit.short_id}… + %span.widget-status-label Checking CI status for #{@merge_request.diff_head_commit.short_id}… .ci_widget.ci-not_found{ style: "display:none" } = icon("times-circle") - Could not find CI status for #{@merge_request.diff_head_commit.short_id}. + %span.widget-status-label Could not find CI status for #{@merge_request.diff_head_commit.short_id}. .ci_widget.ci-error{ style: "display:none" } = icon("times-circle") - Could not connect to the CI server. Please check your settings and try again. + %span.widget-status-label Could not connect to the CI server. Please check your settings and try again. .js-success-icon.hidden = ci_icon_for_status('success') diff --git a/changelogs/unreleased/fix-spacing-icons-mr-widget.yml b/changelogs/unreleased/fix-spacing-icons-mr-widget.yml new file mode 100644 index 00000000000..f048c097027 --- /dev/null +++ b/changelogs/unreleased/fix-spacing-icons-mr-widget.yml @@ -0,0 +1,4 @@ +--- +title: Fix spacing between MR widget icons and text +merge_request: +author: |