Fix style for event titles

6 files changed, 14 insertions, 11 deletions

diff --git a/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6
index c08a94b4521..d56ab58670a 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6
@@ -45,7 +45,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.commit_url" class="short-sha monospace">da57eb39</a>
+            <a :href="build.commitUrl" class="short-sha monospace">da57eb39</a>
           </h5>
           <span>
             <a :href="build.url" class="issue-date">
diff --git a/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
index 3c3f2a650ef..e05995c406a 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
@@ -21,8 +21,8 @@
       <div>
         <div class="item-details item-conmmit-component">
           <img class="avatar" :src="commit.author.avatarUrl">
-          <h5 class="item-title">
-            <a :href="commit.url">
+          <h5 class="item-title commit-title">
+            <a :href="commit.commitUrl">
               {{ commit.title }}
             </a>
           </h5>
@@ -33,7 +33,7 @@
                 <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="commit.url" class="commit-hash-link monospace">{{ commit.shortSha }}</a>
+            <a :href="commit.commitUrl" class="commit-hash-link monospace">{{ commit.shortSha }}</a>
             pushed by
             <a :href="commit.author.webUrl" class="commit-author-link">
               {{ commit.author.name }}
diff --git a/app/assets/javascripts/cycle_analytics/components/item_issue_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_issue_component.js.es6
index e02ad1419a9..17a77cf4369 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_issue_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_issue_component.js.es6
@@ -22,7 +22,7 @@
       <div>
         <div class="item-details">
           <img class="avatar" :src="issue.author.avatarUrl">
-          <h5 class="item-title">
+          <h5 class="item-title issue-title">
             <a class="issue-title" :href="issue.url">
               {{ issue.title }}
             </a>
diff --git a/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6
index 2ceadcb61a5..36da613cccf 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6
@@ -22,7 +22,7 @@
       <div>
         <div class="item-details">
           <img class="avatar" :src="mergeRequest.author.avatarUrl">
-          <h5 class="item-title">
+          <h5 class="item-title merge-merquest-title">
             <a :href="mergeRequest.url">
               {{ mergeRequest.title }}
             </a>
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
index 5812f2952b9..3329ea6a161 100644
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
@@ -59,15 +59,15 @@
         item.author.webUrl = item.author.web_url;
         item.author.avatarUrl = item.author.avatar_url;
 
-        if (item.short_sha) {
-          item.shortSha = item.short_sha;
-        }
+        if (item.short_sha) item.shortSha = item.short_sha;
+        if (item.commit_url) item.commitUrl = item.commit_url;
 
         delete item.author.web_url;
         delete item.author.avatar_url;
         delete item.total_time;
         delete item.created_at;
         delete item.short_sha;
+        delete item.commit_url;
       });
 
       return newEvents;
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index 3bedb16cc56..b29f3f5be23 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -295,11 +295,14 @@
     .item-title {
       margin: 0 0 2px 0;
 
-      .issue-title {
-        color: $gl-dark-link-color;
+      &.issue-title, &.commit-title, &.merge-merquest-title {
         max-width: 100%;
         display: block;
         @include text-overflow();
+
+        a {
+          color: $gl-dark-link-color;
+        }
       }
     }