Commit 7f281773 authored by Simon Knox's avatar Simon Knox

Merge branch '239861-remove-pipelines-ci-table-css' into 'master'

Remove unused css code in pipelines.scss -> .ci-table

See merge request gitlab-org/gitlab!43250
parents 691bf3ca 3b9083c8
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
<template> <template>
<div class="branch-commit cgray"> <div class="branch-commit cgray">
<template v-if="shouldShowRefInfo"> <template v-if="shouldShowRefInfo">
<div class="icon-container"> <div class="icon-container gl-display-inline-block">
<gl-icon v-if="tag" name="tag" /> <gl-icon v-if="tag" name="tag" />
<gl-icon v-else-if="mergeRequestRef" name="git-merge" /> <gl-icon v-else-if="mergeRequestRef" name="git-merge" />
<gl-icon v-else name="branch" /> <gl-icon v-else name="branch" />
......
...@@ -111,6 +111,10 @@ ...@@ -111,6 +111,10 @@
white-space: nowrap; white-space: nowrap;
} }
} }
.pipeline-tags .label-container {
white-space: normal;
}
} }
} }
...@@ -124,22 +128,6 @@ ...@@ -124,22 +128,6 @@
} }
.ci-table { .ci-table {
.build.retried {
background-color: $gray-lightest;
}
.commit-link {
a {
&:focus {
text-decoration: none;
}
}
a:hover {
text-decoration: none;
}
}
.avatar { .avatar {
margin-left: 0; margin-left: 0;
float: none; float: none;
...@@ -191,45 +179,12 @@ ...@@ -191,45 +179,12 @@
} }
} }
.icon-container {
display: inline-block;
&.commit-icon {
width: 15px;
text-align: center;
}
}
/**
* Play button with icon in dropdowns
*/
.no-btn {
border: 0;
background: none;
outline: none;
width: 100%;
text-align: left;
.icon-play {
position: relative;
top: 2px;
margin-right: 5px;
height: 13px;
width: 12px;
}
}
.duration, .duration,
.finished-at { .finished-at {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
margin: 0; margin: 0;
white-space: nowrap; white-space: nowrap;
.fa {
font-size: 12px;
margin-right: 4px;
}
svg { svg {
width: 12px; width: 12px;
height: 12px; height: 12px;
...@@ -241,14 +196,6 @@ ...@@ -241,14 +196,6 @@
.build-link a { .build-link a {
color: $gl-text-color; color: $gl-text-color;
} }
.btn-group.open .dropdown-toggle {
box-shadow: none;
}
.pipeline-tags .label-container {
white-space: normal;
}
} }
.stage-cell { .stage-cell {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%span.build-link ##{artifact.job_id} %span.build-link ##{artifact.job_id}
- if artifact.job.ref - if artifact.job.ref
.icon-container{ "aria-label" => artifact.job.tag? ? _('Tag') : _('Branch') } .icon-container.gl-display-inline-block{ "aria-label" => artifact.job.tag? ? _('Tag') : _('Branch') }
= artifact.job.tag? ? sprite_icon('tag', css_class: 'sprite') : sprite_icon('branch', css_class: 'sprite') = artifact.job.tag? ? sprite_icon('tag', css_class: 'sprite') : sprite_icon('branch', css_class: 'sprite')
= link_to artifact.job.ref, project_ref_path(@project, artifact.job.ref), class: 'ref-name' = link_to artifact.job.ref, project_ref_path(@project, artifact.job.ref), class: 'ref-name'
- else - else
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
- if ref - if ref
- if job.ref - if job.ref
.icon-container .icon-container.gl-display-inline-block
= job.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite') = job.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite')
= link_to job.ref, project_ref_path(job.project, job.ref), class: "ref-name" = link_to job.ref, project_ref_path(job.project, job.ref), class: "ref-name"
- else - else
......
.table-mobile-content .table-mobile-content
.branch-commit.cgray .branch-commit.cgray
- if deployment.ref - if deployment.ref
%span.icon-container %span.icon-container.gl-display-inline-block
= deployment.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite') = deployment.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite')
= link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name" = link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name"
.icon-container.commit-icon .icon-container.commit-icon
......
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