From 6130376ad6673facb729b78878f9156a29948a5b Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Wed, 20 Jul 2016 09:17:52 -0700 Subject: Bug fixes --- app/assets/stylesheets/pages/commit.scss | 8 ++++++++ app/assets/stylesheets/pages/pipelines.scss | 6 +++++- app/views/projects/ci/builds/_build.html.haml | 10 ++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 35ab28b3fea..29d3bf8ae6f 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -66,6 +66,14 @@ margin-left: 8px; } } + + .ci-status-link { + svg { + position: relative; + top: 2px; + margin: 0 3px; + } + } } .commit-box { diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a404f108dc4..a45c675e307 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -93,7 +93,7 @@ .commit-title { margin-top: 4px; - max-width: 320px; + max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -139,6 +139,10 @@ width: 18px; vertical-align: middle; } + + .light { + width: 3px; + } } .duration, diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 9264289987d..a9fb3c58431 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -14,16 +14,19 @@ %span ##{build.id} - if build.stuck? - = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') + .icon-container + = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') - if defined?(retried) && retried - = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') + .icon-container + = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') - if defined?(ref) && ref - if build.ref = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name" - else .light none - = custom_icon("icon_commit") + .icon-container + = custom_icon("icon_commit") - if defined?(commit_sha) && commit_sha = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace" @@ -88,4 +91,3 @@ - elsif build.playable? = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do = icon('play') - -- cgit v1.2.1 From 23a437f10454125219d5510191d058af7f8afe76 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Wed, 20 Jul 2016 20:43:43 -0700 Subject: Add new fork SVG to fix weird styling of other SVGs --- app/views/shared/icons/_icon_fork.svg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/shared/icons/_icon_fork.svg b/app/views/shared/icons/_icon_fork.svg index 420ffe3a55b..a21f8f3a951 100644 --- a/app/views/shared/icons/_icon_fork.svg +++ b/app/views/shared/icons/_icon_fork.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + -- cgit v1.2.1 From 76a27d7c5803f031a8fe541238ee25f6776aeeab Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 21 Jul 2016 06:51:12 -0700 Subject: Fix icons on commits page and builds page --- app/assets/stylesheets/pages/builds.scss | 8 ++++++++ app/views/projects/commits/_commit.html.haml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 99a2cd306cf..e26f8f7080d 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -53,6 +53,14 @@ left: 70px; } } + + .nav-links { + svg { + position: relative; + top: 2px; + margin-right: 3px; + } + } } .build-header { diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index ab9afb06afb..04cf2965454 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -25,7 +25,7 @@ .commit-actions.hidden-xs - if commit.status - = render_commit_status(commit, cssclass: 'btn btn-transparent') + = render_commit_status(commit) = clipboard_button(clipboard_text: commit.id) = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent" = link_to_browse_code(project, commit) -- cgit v1.2.1 From 0b36dcb8b043e987eca4f5efc75fb00c161d1a2b Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 21 Jul 2016 07:28:41 -0700 Subject: Fix firefox rendering of SVGs --- app/assets/stylesheets/pages/merge_requests.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 4e806e60e7e..db295935b00 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -64,6 +64,7 @@ margin-right: 4px; position: relative; top: 1px; + overflow: visible; } &.ci-success { -- cgit v1.2.1 From 6b5708e073cfb8003b82dc3b6c16fa479973ae87 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 21 Jul 2016 07:37:31 -0700 Subject: Fix ci icons getting cut off --- app/assets/stylesheets/pages/commit.scss | 10 ++++------ app/assets/stylesheets/pages/pipelines.scss | 1 + app/assets/stylesheets/pages/status.scss | 1 + app/helpers/ci_status_helper.rb | 4 ++-- 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 ... -- cgit v1.2.1 From 420f117df98faef0ff06ea7eceabe46994518559 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 21 Jul 2016 08:31:05 -0700 Subject: Mobile view for commit status --- app/assets/stylesheets/pages/status.scss | 8 ++++++++ app/views/projects/commits/_commit.html.haml | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 210ace357c0..587f2d9f3c1 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -75,3 +75,11 @@ color: $gl-gray; } } + +.visible-xs-inline { + .ci-status-link { + position: relative; + top: 2px; + left: 5px; + } +} diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index b195822d184..fd888f41b1e 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -19,7 +19,8 @@ · = commit.short_id - if commit.status - = render_commit_status(commit) + .visible-xs-inline + = render_commit_status(commit) - if commit.description? %a.text-expander.hidden-xs.js-toggle-button ... -- cgit v1.2.1 From a6780a77df17214093166d43799443d4a15ff6ae Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 21 Jul 2016 08:38:19 -0700 Subject: Fix sha icon positioning on safari --- app/assets/stylesheets/pages/pipelines.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 081bd7204fe..843f04ab1f6 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -76,7 +76,7 @@ svg { height: 14px; - width: auto; + width: 14px; vertical-align: middle; fill: $table-text-gray; } @@ -158,7 +158,7 @@ svg { width: 12px; - height: auto; + height: 12px; vertical-align: middle; margin-right: 4px; } -- cgit v1.2.1