diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-21 07:37:31 -0700 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-21 08:14:10 -0700 |
| commit | 6b5708e073cfb8003b82dc3b6c16fa479973ae87 (patch) | |
| tree | 04622d805b39a3b88bd8b24477319d68005c6ce3 | |
| parent | 0b36dcb8b043e987eca4f5efc75fb00c161d1a2b (diff) | |
| download | gitlab-ce-6b5708e073cfb8003b82dc3b6c16fa479973ae87.tar.gz | |
Fix ci icons getting cut off
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/status.scss | 1 | ||||
| -rw-r--r-- | app/helpers/ci_status_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 29d3bf8ae6f..bbe0c6c5f1f 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -66,13 +66,11 @@ margin-left: 8px; } } +} - .ci-status-link { - svg { - position: relative; - top: 2px; - margin: 0 3px; - } +.ci-status-link { + svg { + overflow: visible; } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a45c675e307..081bd7204fe 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -138,6 +138,7 @@ height: 18px; width: 18px; vertical-align: middle; + overflow: visible; } .light { diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 99f64b5e4cc..210ace357c0 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -49,6 +49,7 @@ position: relative; top: 1px; margin: 0 3px; + overflow: visible; } } diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index ffac28f78a0..ea2f5f9281a 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -45,10 +45,10 @@ module CiStatusHelper custom_icon(icon_name) end - def render_commit_status(commit, tooltip_placement: 'auto left', cssclass: '') + def render_commit_status(commit, tooltip_placement: 'auto left') project = commit.project path = builds_namespace_project_commit_path(project.namespace, project, commit) - render_status_with_link('commit', commit.status, path, tooltip_placement, cssclass: cssclass) + render_status_with_link('commit', commit.status, path, tooltip_placement) end def render_pipeline_status(pipeline, tooltip_placement: 'auto left') diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 04cf2965454..b195822d184 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -19,7 +19,7 @@ · = commit.short_id - if commit.status - = render_commit_status(commit, cssclass: 'visible-xs-inline') + = render_commit_status(commit) - if commit.description? %a.text-expander.hidden-xs.js-toggle-button ... |