BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 65e482e7 by Annabel Dunstone Gray
Options

Change size of pipeline status icons and dropdowns

parent ff0f70c0
Showing with 41 additions and 21 deletions
app/assets/stylesheets/pages/pipelines.scss
...@@ -331,9 +331,9 @@ ...@@ -331,9 +331,9 @@
} }
.stage-name { .stage-name {
margin-bottom: 15px; margin: 0 0 15px 10px;
font-weight: bold; font-weight: bold;
width: 150px; width: 176px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -364,12 +364,17 @@ ...@@ -364,12 +364,17 @@
.build-content { .build-content {
width: 164px; width: 164px;
white-space: nowrap;
overflow: hidden; .ci-status-icon {
text-overflow: ellipsis;
svg {
height: 20px;
width: 20px;
}
}
.ci-status-text { .ci-status-text {
width: 110px; width: 135px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -397,27 +402,37 @@ ...@@ -397,27 +402,37 @@
color: $layout-link-gray; color: $layout-link-gray;
.ci-status-text { .ci-status-text {
width: 80px; width: 112px;
} }
} }
.grouped-pipeline-dropdown { .grouped-pipeline-dropdown {
padding: 8px 0; padding: 8px 0;
width: 200px; width: 168px;
left: auto; left: auto;
right: -214px; right: -180px;
top: -9px; top: -9px;
max-height: 245px; max-height: 245px;
overflow-y: scroll; overflow-y: scroll;
a:hover { a {
.ci-status-text { padding: 7px 8px;
text-decoration: none; margin: 0 8px;
&:hover {
.ci-status-text {
text-decoration: none;
}
} }
} }
svg {
width: 14px;
height: 14px;
}
.ci-status-text { .ci-status-text {
width: 145px; width: 112px;
} }
.arrow { .arrow {
...@@ -482,7 +497,7 @@ ...@@ -482,7 +497,7 @@
position: absolute; position: absolute;
border-bottom: 2px solid $border-color; border-bottom: 2px solid $border-color;
width: 25px; width: 25px;
height: 65px; height: 69px;
} }
// Right connecting curves // Right connecting curves
...@@ -504,7 +519,7 @@ ...@@ -504,7 +519,7 @@
&:nth-child(2) { &:nth-child(2) {
&::after, &::before { &::after, &::before {
height: 29px; height: 29px;
top: -10px; top: -7px;
} }
.curve { .curve {
display: block; display: block;
...@@ -562,7 +577,7 @@ ...@@ -562,7 +577,7 @@
width: 21px; width: 21px;
height: 25px; height: 25px;
position: absolute; position: absolute;
top: -30px; top: -31.5px;
border-top: 2px solid $border-color; border-top: 2px solid $border-color;
} }
......
app/views/projects/ci/builds/_build_pipeline.html.haml
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
.ci-status-text= subject.name .ci-status-text= subject.name
- elsif can?(current_user, :read_build, @project) - elsif can?(current_user, :read_build, @project)
= link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do
= render_status_with_link('build', subject.status) %span.ci-status-icon
= render_status_with_link('build', subject.status)
.ci-status-text= subject.name .ci-status-text= subject.name
- else - else
= render_status_with_link('build', subject.status) %span.ci-status-icon
= render_status_with_link('build', subject.status)
= ci_icon_for_status(subject.status) = ci_icon_for_status(subject.status)
app/views/projects/commit/_pipeline_status_group.html.haml
- group_status = CommitStatus.where(id: subject).status - group_status = CommitStatus.where(id: subject).status
= render_status_with_link('build', group_status) %span.ci-status-icon
= render_status_with_link('build', group_status)
.dropdown.inline .dropdown.inline
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
%span.ci-status-text %span.ci-status-text
......
app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
- if subject.target_url - if subject.target_url
= link_to subject.target_url do = link_to subject.target_url do
= render_status_with_link('commit status', subject.status) %span.ci-status-icon
= render_status_with_link('commit status', subject.status)
%span.ci-status-text= subject.name %span.ci-status-text= subject.name
- else - else
= render_status_with_link('commit status', subject.status) %span.ci-status-icon
= render_status_with_link('commit status', subject.status)
%span.ci-status-text= subject.name %span.ci-status-text= subject.name
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment