Commit 7676b1fc authored by Filipa Lacerda's avatar Filipa Lacerda

Aligns text content instead of div

parent aeed48cf
...@@ -54,23 +54,21 @@ require('../lib/utils/datetime_utility'); ...@@ -54,23 +54,21 @@ require('../lib/utils/datetime_utility');
}, },
}, },
template: ` template: `
<td> <td class="pipelines-time-ago">
<div class="pull-right"> <p class="duration" v-if='duration'>
<p class="duration" v-if='duration'> <span v-html='svgs.iconTimer'></span>
<span v-html='svgs.iconTimer'></span> {{duration}}
{{duration}} </p>
</p> <p class="finished-at" v-if='timeStopped'>
<p class="finished-at" v-if='timeStopped'> <i class="fa fa-calendar"></i>
<i class="fa fa-calendar"></i> <time
<time data-toggle="tooltip"
data-toggle="tooltip" data-placement="top"
data-placement="top" data-container="body"
data-container="body" :data-original-title='localTimeFinished'>
:data-original-title='localTimeFinished'> {{timeStopped.words}}
{{timeStopped.words}} </time>
</time> </p>
</p>
</div>
</td> </td>
`, `,
}); });
......
...@@ -35,6 +35,69 @@ ...@@ -35,6 +35,69 @@
.stage-cell { .stage-cell {
width: 20%; 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,11 +113,8 @@ ...@@ -50,11 +113,8 @@
.table.ci-table { .table.ci-table {
&.builds-page { &.builds-page tr {
height: 71px;
tr {
height: 71px;
}
} }
tr { tr {
...@@ -179,65 +239,6 @@ ...@@ -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 { .build-link a {
color: $gl-text-color; color: $gl-text-color;
} }
...@@ -303,31 +304,8 @@ ...@@ -303,31 +304,8 @@
} }
.tab-pane { .tab-pane {
&.pipelines { &.builds .ci-table tr {
.ci-table { height: 71px;
min-width: 900px;
}
.content-list.pipelines {
overflow: auto;
}
.stage {
max-width: 100px;
width: 100px;
}
.pipeline-actions {
min-width: 170px;
}
}
&.builds {
.ci-table {
tr {
height: 71px;
}
}
} }
} }
......
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