From ae00085f88b587ca6254e7d60354b24b59dad8a2 Mon Sep 17 00:00:00 2001
From: Justine Arreche <justinearreche@gmail.com>
Date: Mon, 8 Dec 2014 21:39:38 +0100
Subject: [PATCH] added pull request and push icons and pushed author to
 baseline of new-summary div

---
 assets/images/icons/pull-request.svg         | 15 +++++++++++
 assets/images/icons/push.svg                 | 11 ++++++++
 assets/scripts/app/templates/builds/show.hbs |  5 ++++
 assets/styles/main/log.sass                  |  1 +
 assets/styles/main/summary.sass              | 27 +++++++++++++++++---
 5 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 assets/images/icons/pull-request.svg
 create mode 100644 assets/images/icons/push.svg

diff --git a/assets/images/icons/pull-request.svg b/assets/images/icons/pull-request.svg
new file mode 100644
index 00000000..dae09224
--- /dev/null
+++ b/assets/images/icons/pull-request.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="63.279px" height="79.172px" viewBox="0 0 63.279 79.172" enable-background="new 0 0 63.279 79.172" xml:space="preserve">
+<path fill="#5F8699" d="M16.757,58.186V25.394c2.975-1.73,4.977-4.951,4.977-8.641c0-5.519-4.474-9.992-9.992-9.992
+	c-5.519,0-9.992,4.474-9.992,9.992c0,3.706,2.019,6.938,5.015,8.663v32.747c-2.996,1.725-5.015,4.958-5.015,8.663
+	c0,5.519,4.474,9.992,9.992,9.992c5.518,0,9.992-4.474,9.992-9.992C21.734,63.137,19.732,59.917,16.757,58.186z M11.742,11.742
+	c2.775,0,5.024,2.25,5.024,5.024s-2.249,5.024-5.024,5.024s-5.024-2.25-5.024-5.024S8.967,11.742,11.742,11.742z M11.742,71.864
+	c-2.775,0-5.024-2.25-5.024-5.024s2.25-5.024,5.024-5.024s5.024,2.249,5.024,5.024S14.517,71.864,11.742,71.864z"/>
+<path fill="#5F8699" d="M56.726,58.158V26.589c0-15.75-14.283-14.791-14.283-14.791h-5.645V1.75l-14.96,15.003l14.96,14.973v-9.992
+	h5.645c4.347,0,4.291,4.855,4.291,4.855v31.602c-2.97,1.732-4.967,4.95-4.967,8.636c0,5.519,4.474,9.992,9.992,9.992
+	c5.519,0,9.992-4.474,9.992-9.992C61.75,63.117,59.727,59.882,56.726,58.158z M51.758,71.864c-2.775,0-5.024-2.25-5.024-5.024
+	s2.249-5.024,5.024-5.024s5.024,2.249,5.024,5.024S54.533,71.864,51.758,71.864z"/>
+</svg>
diff --git a/assets/images/icons/push.svg b/assets/images/icons/push.svg
new file mode 100644
index 00000000..1d6f4b1d
--- /dev/null
+++ b/assets/images/icons/push.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="63.279px" height="37.61px" viewBox="0 0 63.279 37.61" enable-background="new 0 0 63.279 37.61" xml:space="preserve">
+<path fill="#5F8699" d="M48.08,14.523c-1.927-7.34-8.606-12.754-16.55-12.754s-14.624,5.415-16.55,12.754H1.529v8.533h13.403
+	c1.864,7.431,8.587,12.935,16.597,12.935s14.732-5.503,16.596-12.935h13.404v-8.533H48.08z M31.529,27.457
+	c-3.229,0-6.042-1.774-7.52-4.401c-0.702-1.248-1.103-2.688-1.103-4.221c0-1.571,0.42-3.043,1.154-4.312
+	c1.491-2.577,4.277-4.312,7.469-4.312s5.978,1.734,7.469,4.312c0.734,1.269,1.154,2.741,1.154,4.312
+	c0,1.534-0.401,2.974-1.103,4.221C37.571,25.683,34.758,27.457,31.529,27.457z"/>
+</svg>
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index d9ba5756..02d33aba 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -2,6 +2,11 @@
   <span>Loading</span>
 {{else}}
   <div id="new-summary">
+    <div class="request-kind">
+      <div class="kind-icon">
+        <img src="/images/icons/pull-request.svg" width="21" height="21"/>
+      </div>
+    </div>
     <div class="right">
       <div class="build-status">
         {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}}
diff --git a/assets/styles/main/log.sass b/assets/styles/main/log.sass
index 8f310425..1694d326 100644
--- a/assets/styles/main/log.sass
+++ b/assets/styles/main/log.sass
@@ -102,6 +102,7 @@ pre#log
 
 #log-container
   position: relative
+  margin-top: 20px
 
 #log-container
   #tail
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass
index f89deb78..bb9565ad 100644
--- a/assets/styles/main/summary.sass
+++ b/assets/styles/main/summary.sass
@@ -24,9 +24,8 @@
   @include clearfix
   @include border-radius(4px)
   background-color: #fafafa
-  padding: 2px 11px
-  margin-bottom: 20px
-  padding-bottom: 10px
+  padding: 0 11px 0 0
+  position: relative
 
   .branch
     font-weight: bold
@@ -49,12 +48,15 @@
 
   .body
     min-width: 500px
+    max-height: 63px
     display: block
     font-size: 12px
     font-family: Monaco, 'Liberation Mono', Courier, monospace
     margin-bottom: 0px
     margin-top: 10px
-    white-space: pre-wrap
+    text-overflow: ellipsis
+    white-space: nowrap
+    overflow: hidden
 
     a
       text-decoration: underline
@@ -142,6 +144,20 @@
     width: 220px
     font-size: 11px
 
+  .request-kind
+    background-color: #e8e9ea
+    opacity: 0.6
+    float: left
+    position: relative
+    display: block
+    width: 40px
+    height: 145px
+    margin-right: 10px
+
+  .kind-icon
+    padding-top: 13px
+    padding-left: 9px
+
   .footer
     a
       color: #818181
@@ -160,6 +176,9 @@
     .author
       float: left
       margin-top: 10px
+      position: absolute
+      bottom: 7px
+      left: 65px
 
       div
         display: inline