BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f8c572a2
Commit
f8c572a2
authored
Nov 09, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply styling to ItemCommitComponent
parent
fe72c3fe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
19 deletions
+49
-19
item_commit_component.js.es6
...s/cycle_analytics/components/item_commit_component.js.es6
+29
-2
stage_plan_component.js.es6
...ts/cycle_analytics/components/stage_plan_component.js.es6
+2
-2
cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+18
-0
show.html.haml
app/views/projects/cycle_analytics/show.html.haml
+0
-15
No files found.
app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
View file @
f8c572a2
...
...
@@ -14,9 +14,36 @@
*/
global.cycleAnalytics.ItemCommitComponent = Vue.extend({
template: '#item-commit-component',
props: {
commit: Object,
}
},
template: `
<div class="item-details item-conmmit-component">
<h5 class="item-title">
<a href="commit.url">{{ commit.title }}</a>
</h5>
<span>
First
<span class="commit-icon">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40">
<path fill="#8F8F8F" fill-rule="evenodd" d="M28.7769836,18 C27.8675252,13.9920226 24.2831748,11 20,11 C15.7168252,11 12.1324748,13.9920226 11.2230164,18 L4.0085302,18 C2.90195036,18 2,18.8954305 2,20 C2,21.1122704 2.8992496,22 4.0085302,22 L11.2230164,22 C12.1324748,26.0079774 15.7168252,29 20,29 C24.2831748,29 27.8675252,26.0079774 28.7769836,22 L35.9914698,22 C37.0980496,22 38,21.1045695 38,20 C38,18.8877296 37.1007504,18 35.9914698,18 L28.7769836,18 L28.7769836,18 Z M20,25 C22.7614237,25 25,22.7614237 25,20 C25,17.2385763 22.7614237,15 20,15 C17.2385763,15 15,17.2385763 15,20 C15,22.7614237 17.2385763,25 20,25 L20,25 Z"/>
</svg>
</span>
<a href="#" class="commit-hash-link monospace">{{ commit.hash }}</a>
pushed by
<a href="commit.profile" class="commit-author-link">{{ commit.author }}</a>
</span>
</div>
<div class="item-time">
<span class="hours" v-if="commit.totalTime.hours">
{{ commit.totalTime.hours }}
<abbr title="Hours">hr</abbr>
</span>
<span class="minutes" v-if="commit.totalTime.minutes">
{{ commit.totalTime.minutes }}
<abbr title="Minutes">mins</abbr>
</span>
</div>
`,
});
}(window.gl || (window.gl = {})));
app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
View file @
f8c572a2
...
...
@@ -14,8 +14,8 @@
<div class="events-description">
Time before an issue starts implementation
</div>
<ul class="event-list">
<li class="event-item" v-for="commit in items">
<ul class="
stage-
event-list">
<li class="
stage-
event-item" v-for="commit in items">
<item-commit-component :commit="commit"></item-commit-component>
</li>
</ul>
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
f8c572a2
...
...
@@ -327,5 +327,23 @@
color
:
$gl-text-color
;
}
}
.commit-author-link
{
color
:
$gl-dark-link-color
;
}
// Custom CSS for components
.item-conmmit-component
{
.commit-icon
{
position
:
relative
;
top
:
3px
;
left
:
1px
;
display
:
inline-block
;
svg
{
float
:
left
;
}
}
}
}
}
app/views/projects/cycle_analytics/show.html.haml
View file @
f8c572a2
...
...
@@ -119,7 +119,6 @@
%li
{
"v-for"
=>
"mergeRequest in items"
}
%item-merge-request-component
{
":merge-request"
=>
"mergeRequest"
}
%script
{
type:
'text/x-template'
,
id:
'stage-staging-component'
}
%div
.events-description
...
...
@@ -136,20 +135,6 @@
%li
{
"v-for"
=>
"issue in items"
}
%item-issue-component
{
":issue"
=>
"issue"
}
%script
{
type:
'text/x-template'
,
id:
'item-commit-component'
}
%div
%p
%h5
%a
{
:href
=>
"commit.url"
}
{{ commit.title }}
%span
First
%a
{
:href
=>
"#"
}
{{ commit.hash }}
pushed by
%a
{
:href
=>
"commit.profile"
}
{{ commit.author }}
%script
{
type:
'text/x-template'
,
id:
'item-merge-request-component'
}
%div
%p
...
...
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