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
e077cebe
Commit
e077cebe
authored
Dec 26, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add borderless svgs
parent
c9fad91d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
app/assets/javascripts/vue_pipelines_index/stage.js.es6
app/assets/javascripts/vue_pipelines_index/stage.js.es6
+8
-7
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+8
-0
No files found.
app/assets/javascripts/vue_pipelines_index/stage.js.es6
View file @
e077cebe
...
@@ -16,9 +16,7 @@
...
@@ -16,9 +16,7 @@
this.$http.get(this.endpoint)
this.$http.get(this.endpoint)
.then((response) => {
.then((response) => {
this.request = true;
this.request = true;
setTimeout(() => {
this.builds = JSON.parse(response.body).html;
this.builds = JSON.parse(response.body).html;
}, 100);
}, () => new Flash(
}, () => new Flash(
'Something went wrong on our end.',
'Something went wrong on our end.',
));
));
...
@@ -30,8 +28,7 @@
...
@@ -30,8 +28,7 @@
},
},
computed: {
computed: {
buildsOrSpinner() {
buildsOrSpinner() {
if (this.request) return this.builds;
return this.request ? this.builds : this.spinner;
return this.spinner;
},
},
dropdownClass() {
dropdownClass() {
if (this.request) return 'js-builds-dropdown-container';
if (this.request) return 'js-builds-dropdown-container';
...
@@ -50,7 +47,9 @@
...
@@ -50,7 +47,9 @@
return `has-tooltip ci-status-icon-${this.stage.status.group}`;
return `has-tooltip ci-status-icon-${this.stage.status.group}`;
},
},
svg() {
svg() {
return this.svgs[this.match(this.stage.status.icon)];
const icon = this.stage.status.icon;
icon.replace('icon', 'stageIcon');
return this.svgs[this.match(icon)];
},
},
spanClass() {
spanClass() {
return `ci-status-icon ci-status-icon-${this.stage.status.group}`;
return `ci-status-icon ci-status-icon-${this.stage.status.group}`;
...
@@ -58,10 +57,10 @@
...
@@ -58,10 +57,10 @@
},
},
template: `
template: `
<div class="stage-container mini-pipeline-graph">
<div class="stage-container mini-pipeline-graph">
<div class="dropdown inline build-content">
<div class="dropdown inline build-content">
<button
<button
@click='fetchBuilds'
@click='fetchBuilds'
@blur='clearState'
class="has-tooltip builds-dropdown js-builds-dropdown-button"
class="has-tooltip builds-dropdown js-builds-dropdown-button"
data-placement="top"
data-placement="top"
:title='stageTitle'
:title='stageTitle'
...
@@ -79,6 +78,7 @@
...
@@ -79,6 +78,7 @@
</span>
</span>
</span>
</span>
</button>
</button>
<div class="js-builds-dropdown-container">
<div class="js-builds-dropdown-container">
<div class="dropdown-menu grouped-pipeline-dropdown">
<div class="dropdown-menu grouped-pipeline-dropdown">
<div class="arrow-up"></div>
<div class="arrow-up"></div>
...
@@ -90,6 +90,7 @@
...
@@ -90,6 +90,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
`,
`,
});
});
...
...
app/views/projects/pipelines/index.html.haml
View file @
e077cebe
...
@@ -49,6 +49,14 @@
...
@@ -49,6 +49,14 @@
"icon_status_success"
=>
custom_icon
(
"icon_status_success"
),
"icon_status_success"
=>
custom_icon
(
"icon_status_success"
),
"icon_status_failed"
=>
custom_icon
(
"icon_status_failed"
),
"icon_status_failed"
=>
custom_icon
(
"icon_status_failed"
),
"icon_status_warning"
=>
custom_icon
(
"icon_status_warning"
),
"icon_status_warning"
=>
custom_icon
(
"icon_status_warning"
),
"stage_icon_status_canceled"
=>
custom_icon
(
"icon_status_canceled_borderless"
),
"stage_icon_status_running"
=>
custom_icon
(
"icon_status_running_borderless"
),
"stage_icon_status_skipped"
=>
custom_icon
(
"icon_status_skipped_borderless"
),
"stage_icon_status_created"
=>
custom_icon
(
"icon_status_created_borderless"
),
"stage_icon_status_pending"
=>
custom_icon
(
"icon_status_pending_borderless"
),
"stage_icon_status_success"
=>
custom_icon
(
"icon_status_success_borderless"
),
"stage_icon_status_failed"
=>
custom_icon
(
"icon_status_failed_borderless"
),
"stage_icon_status_warning"
=>
custom_icon
(
"icon_status_warning_borderless"
),
"icon_play"
=>
custom_icon
(
"icon_play"
),
"icon_play"
=>
custom_icon
(
"icon_play"
),
"icon_timer"
=>
custom_icon
(
"icon_timer"
),
"icon_timer"
=>
custom_icon
(
"icon_timer"
),
}
}
}
}
...
...
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