Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
7676b1fc
Commit
7676b1fc
authored
Feb 23, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aligns text content instead of div
parent
aeed48cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
82 additions
and
106 deletions
+82
-106
app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
+15
-17
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+67
-89
No files found.
app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
View file @
7676b1fc
...
...
@@ -54,23 +54,21 @@ require('../lib/utils/datetime_utility');
},
},
template: `
<td>
<div class="pull-right">
<p class="duration" v-if='duration'>
<span v-html='svgs.iconTimer'></span>
{{duration}}
</p>
<p class="finished-at" v-if='timeStopped'>
<i class="fa fa-calendar"></i>
<time
data-toggle="tooltip"
data-placement="top"
data-container="body"
:data-original-title='localTimeFinished'>
{{timeStopped.words}}
</time>
</p>
</div>
<td class="pipelines-time-ago">
<p class="duration" v-if='duration'>
<span v-html='svgs.iconTimer'></span>
{{duration}}
</p>
<p class="finished-at" v-if='timeStopped'>
<i class="fa fa-calendar"></i>
<time
data-toggle="tooltip"
data-placement="top"
data-container="body"
:data-original-title='localTimeFinished'>
{{timeStopped.words}}
</time>
</p>
</td>
`,
});
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
7676b1fc
...
...
@@ -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,11 +113,8 @@
.table.ci-table
{
&
.builds-page
{
tr
{
height
:
71px
;
}
&
.builds-page
tr
{
height
:
71px
;
}
tr
{
...
...
@@ -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,31 +304,8 @@
}
.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
{
height
:
71px
;
}
}
&
.builds
.ci-table
tr
{
height
:
71px
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment