diff options
Diffstat (limited to 'app/assets')
7 files changed, 14 insertions, 32 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6 index 4949743c797..4f83c61b45d 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6 @@ -25,9 +25,7 @@ · <span> Opened - <a :href="mergeRequest.url" class="issue-date"> - {{ mergeRequest.createdAt }} - </a> + <a :href="mergeRequest.url" class="issue-date">{{ mergeRequest.createdAt }}</a> </span> <span> by diff --git a/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6 index 4552eddb1f6..fc3dd043a0b 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6 @@ -21,15 +21,11 @@ {{ issue.title }} </a> </h5> - <a :href="issue.url" class="issue-link"> - #{{ issue.iid }} - </a> + <a :href="issue.url" class="issue-link">#{{ issue.iid }}</a> · <span> Opened - <a :href="issue.url" class="issue-date"> - {{ issue.createdAt }} - </a> + <a :href="issue.url" class="issue-date">{{ issue.createdAt }}</a> </span> <span> by diff --git a/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6 index ee8b96a088a..051271bc053 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6 @@ -21,15 +21,11 @@ {{ issue.title }} </a> </h5> - <a :href="issue.url" class="issue-link"> - #{{ issue.iid }} - </a> + <a :href="issue.url" class="issue-link">#{{ issue.iid }}</a> · <span> Opened - <a :href="issue.url" class="issue-date"> - {{ issue.createdAt }} - </a> + <a :href="issue.url" class="issue-date">{{ issue.createdAt }}</a> </span> <span> by diff --git a/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6 index e6e387e2c6b..78ff0bf069a 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6 @@ -25,9 +25,7 @@ · <span> Opened - <a :href="mergeRequest.url" class="issue-date"> - {{ mergeRequest.createdAt }} - </a> + <a :href="mergeRequest.url" class="issue-date">{{ mergeRequest.createdAt }}</a> </span> <span> by diff --git a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 index f621cfc940b..af0318ffc19 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 @@ -17,9 +17,7 @@ <div class="item-details"> <img class="avatar" :src="build.author.avatarUrl"> <h5 class="item-title"> - <a :href="build.url" class="pipeline-id"> - #{{ build.iid }} - </a> + <a :href="build.url" class="pipeline-id">#{{ build.id }}</a> <i class="fa fa-code-fork"></i> <a :href="build.branch.url" class="branch-name monospace">{{ build.branch.name }}</a> <span class="icon-branch"> @@ -30,9 +28,7 @@ <a :href="build.commitUrl" class="short-sha monospace">da57eb39</a> </h5> <span> - <a :href="build.url" class="issue-date"> - {{ build.createdAt }} - </a> + <a :href="build.url" class="build-date">{{ build.date }}</a> by <a :href="build.author.webUrl" class="issue-author-link"> {{ build.author.name }} diff --git a/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6 index 53cb980d9f2..4cbdfbeb5b7 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6 @@ -24,13 +24,9 @@ </g> </svg> </span> - <a :href="build.url" class="item-build-name"> - {{ build.name }} - </a> + <a :href="build.url" class="item-build-name">{{ build.name }}</a> · - <a href="#" class="pipeline-id"> - #{{ build.id }} - </a> + <a href="#" class="pipeline-id">#{{ build.id }}</a> <i class="fa fa-code-fork"></i> <a :href="build.branch.url" class="branch-name monospace">{{ build.branch.name }}</a> <span class="icon-branch"> @@ -38,7 +34,7 @@ <path fill="#8C8C8C" fill-rule="evenodd" d="M9.678 6.722C9.353 5.167 8.053 4 6.5 4S3.647 5.167 3.322 6.722h-2.6c-.397 0-.722.35-.722.778 0 .428.325.778.722.778h2.6C3.647 9.833 4.947 11 6.5 11s2.853-1.167 3.178-2.722h2.6c.397 0 .722-.35.722-.778 0-.428-.325-.778-.722-.778h-2.6zM4.694 7.5c0-1.09.795-1.944 1.806-1.944 1.01 0 1.806.855 1.806 1.944 0 1.09-.795 1.944-1.806 1.944-1.01 0-1.806-.855-1.806-1.944z"/> </svg> </span> - <a :href="build.commitUrl" class="short-sha monospace">da57eb39</a> + <a :href="build.commitUrl" class="short-sha monospace">{{ build.shortSha }}</a> </h5> <span> <a :href="build.url" class="issue-date"> diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index 72c0f00b37e..50939f55168 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -321,7 +321,7 @@ } } - .issue-date { + .issue-date, .build-date { color: $gl-text-color; } @@ -364,6 +364,8 @@ .icon-build-status { float: left; margin-right: 5px; + position: relative; + top: 2px; } .item-build-name { |