kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Aligns text content instead of div

Browse source
This commit is contained in:
Filipa Lacerda 2017-02-23 11:34:38 +00:00
parent aeed48cf15
commit 7676b1fc93
2 changed files with 82 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
View file

@ -54,8 +54,7 @@ require('../lib/utils/datetime_utility');
},
},
template: `
<td>
<div class="pull-right">
<td class="pipelines-time-ago">
<p class="duration" v-if='duration'>
<span v-html='svgs.iconTimer'></span>
{{duration}}
@ -70,7 +69,6 @@ require('../lib/utils/datetime_utility');
{{timeStopped.words}}
</time>
</p>
</div>
</td>
`,
});

152
app/assets/stylesheets/pages/pipelines.scss
View file

@ -35,6 +35,69 @@
.stage-cell {
width: 20%;
}
.pipelines-time-ago {
text-align: right;
}
.pipeline-actions {
padding-right: 0;
min-width: 170px; //Guarantees buttons don't break in several lines.
.btn-default {
color: $gl-text-color-secondary;
}
.btn.btn-retry:hover,
.btn.btn-retry:focus {
border-color: $gray-darkest;
background-color: $white-normal;
}
svg path {
fill: $gl-text-color-secondary;
}
.dropdown-menu {
max-height: 250px;
overflow-y: auto;
}
.dropdown-toggle,
.dropdown-menu {
color: $gl-text-color-secondary;
.fa {
color: $gl-text-color-secondary;
font-size: 14px;
}
svg,
.fa {
margin-right: 0;
}
}
.btn-group {
&.open {
.btn-default {
background-color: $white-normal;
border-color: $border-white-normal;
}
}
.btn {
.icon-play {
height: 13px;
width: 12px;
}
}
}
.tooltip {
white-space: nowrap;
}
}
}
}
@ -50,12 +113,9 @@
.table.ci-table {
&.builds-page {
tr {
&.builds-page tr {
height: 71px;
}
}
tr {
th {
@ -179,65 +239,6 @@
}
}
.pipeline-actions {
padding-right: 0;
min-width: 170px; //Guarantees buttons don't break in several lines.
.btn-default {
color: $gl-text-color-secondary;
}
.btn.btn-retry:hover,
.btn.btn-retry:focus {
border-color: $gray-darkest;
background-color: $white-normal;
}
svg path {
fill: $gl-text-color-secondary;
}
.dropdown-menu {
max-height: 250px;
overflow-y: auto;
}
.dropdown-toggle,
.dropdown-menu {
color: $gl-text-color-secondary;
.fa {
color: $gl-text-color-secondary;
font-size: 14px;
}
svg,
.fa {
margin-right: 0;
}
}
.btn-group {
&.open {
.btn-default {
background-color: $white-normal;
border-color: $border-white-normal;
}
}
.btn {
.icon-play {
height: 13px;
width: 12px;
}
}
}
.tooltip {
white-space: nowrap;
}
}
.build-link a {
color: $gl-text-color;
}
@ -303,32 +304,9 @@
}
.tab-pane {
&.pipelines {
.ci-table {
min-width: 900px;
}
.content-list.pipelines {
overflow: auto;
}
.stage {
max-width: 100px;
width: 100px;
}
.pipeline-actions {
min-width: 170px;
}
}
&.builds {
.ci-table {
tr {
&.builds .ci-table tr {
height: 71px;
}
}
}
}
// Pipeline graph