From d1c56364c0d8e0793bce3ab6479f6b8380f392a2 Mon Sep 17 00:00:00 2001
From: Lisa Passing <mail@lislis.de>
Date: Thu, 12 Mar 2015 12:44:43 +0100
Subject: [PATCH 1/4] fix broken switch on env_var settings

---
 app/styles/app/settings.sass     | 20 +++++++++++++++-----
 app/templates/env-vars/_form.hbs | 11 ++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/styles/app/settings.sass b/app/styles/app/settings.sass
index 9e8dadf1..bea3d151 100644
--- a/app/styles/app/settings.sass
+++ b/app/styles/app/settings.sass
@@ -52,7 +52,6 @@
 
     .travis-switch
       display: block
-      margin-top: 4px
 
     label
       display: inline-block
@@ -222,16 +221,15 @@
       float: left
       padding-bottom: 0
       min-height: 33px
-      line-height: 33px
+      line-height: 2
 
     span.equals
       float: left
       display: block
-      line-height: 33px
+      line-height: 2
       margin: 0 10px 0 14px
 
     .field.name
-      width: 242px
       margin-bottom: 10px
       input
         width: 97%
@@ -241,6 +239,7 @@
         width: 97%
     .actions
       margin-bottom: 10px
+      clear: both
 
   ul.env-vars
     display: block
@@ -279,7 +278,6 @@
 
     .name
       width: 250px
-      margin: 0 10px 0 20px
       text-align: left
 
     .value
@@ -294,3 +292,15 @@
       .value,
       .name
         display: inline-block
+        vertical-align: middle
+
+  .field--switch
+    display: inline-block
+    vertical-align: middle
+    label.public
+      width: auto
+      line-height: 1.8
+
+  .value--extra
+    padding: 0 !important
+    width: 250px !important
diff --git a/app/templates/env-vars/_form.hbs b/app/templates/env-vars/_form.hbs
index 646a6df0..b63210a3 100644
--- a/app/templates/env-vars/_form.hbs
+++ b/app/templates/env-vars/_form.hbs
@@ -5,16 +5,17 @@
   {{/travis-field}}
   <span class="equals">=</span>
   {{#if showValueField}}
-    <div class="field value">
+    <div class="field value value--extra">
       {{#label for="value" class="value"}}Value:{{/label}}
       {{input value=value class="env-value" placeholder="Value"}}
     </div>
   {{else}}
-    <span class="value value-display secure">{{value}}</span>
+    <div class="field name">
+      <span class="value value-display secure">{{value}}</span>
+    </div>
   {{/if}}
-  <div class="clear"></div>
-  <div class="field">
-    {{travis-switch active=public class="value"}}
+  <div class="field field--switch">
+    {{travis-switch active=public}}
     {{#label for="secure" class="public"}}Display value in build logs{{/label}}
   </div>
 

From 1539113371ab0756c059e8f8a02d7fb1119ce421 Mon Sep 17 00:00:00 2001
From: Lisa Passing <mail@lislis.de>
Date: Thu, 12 Mar 2015 15:05:54 +0100
Subject: [PATCH 2/4] add the changes if build is a pull request

---
 app/styles/app/layouts/buildheader.sass |  2 ++
 app/templates/build.hbs                 |  8 +++++++-
 app/templates/builds.hbs                | 13 +++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass
index aa938ce6..d19ed38d 100644
--- a/app/styles/app/layouts/buildheader.sass
+++ b/app/styles/app/layouts/buildheader.sass
@@ -69,6 +69,8 @@
 
 .repo-main-description
 
+  p
+    margin: .5em 0 0
   @media #{$medium-up}
     position: relative
     max-height: 4.9em
diff --git a/app/templates/build.hbs b/app/templates/build.hbs
index 94ebeb1b..61f26288 100644
--- a/app/templates/build.hbs
+++ b/app/templates/build.hbs
@@ -1,7 +1,7 @@
 {{#if loading}}
   <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
 {{else}}
-  <section {{bind-attr class=":tile :tile--pass :row build.state"}} {{!-- id="new-summary" --}}>
+  <section {{bind-attr class=":tile :tile--pass :row build.state"}}>
     <div class="tile-status">
       <span {{bind-attr class=":icon :icon-status build.state"}}></span>
       <span {{bind-attr class=":request-kind build.eventType :icon"}}></span>
@@ -9,10 +9,16 @@
 
     <div class="tile-main medium-8 columns">
       <h2 class="repo-main-commit">
+      {{#if build.pullRequest}}
+        <small class="repo-main-branch" {{bind-attr title="build.pullRequestTitle"}}>Pull Request #{{build.pullRequestNumber}}</small>
+        {{build.pullRequestTitle}}
+      {{else}}
         <small class="repo-main-branch" {{bind-attr title="build.commit.branch"}}>{{build.commit.branch}}</small>
         {{format-message build.commit.subject repoBinding=build.repo}}
+      {{/if}}
       </h2>
       <div class="repo-main-description">
+        <p>{{format-message build.commit.subject repoBinding=build.repo}}</p>
         <pre class="body">{{format-message build.commit.body repoBinding=build.repo pre=true}}</pre>
       </div>
       <div class="tile-author">
diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs
index 1281333d..454dc28b 100644
--- a/app/templates/builds.hbs
+++ b/app/templates/builds.hbs
@@ -10,14 +10,15 @@
         <h2>
           {{#if isPullRequestsList}}
             <small>PR #{{build.pullRequestNumber}}</small>
+            {{#link-to "build" build.repo build}}
+              {{{format-message build.pullRequestTitle short="true" repoBinding=build.repo}}}
+            {{/link-to}}
           {{else}}
-            {{!-- <a {{bind-attr href="build.urlGithubPullRequest"}}> --}}
-              <small>{{build.commit.branch}}</small>
-            {{!-- </a> --}}
+            <small>{{build.commit.branch}}</small>
+            {{#link-to "build" build.repo build}}
+              {{{format-message build.commit.message short="true" repoBinding=build.repo}}}
+            {{/link-to}}
           {{/if}}
-          {{#link-to "build" build.repo build}}
-            {{{format-message build.commit.message short="true" repoBinding=build.repo}}}
-          {{/link-to}}
         </h2>
         <p class="tile-author"><img {{bind-attr src="build.urlAuthorGravatarImage"}} alt="">{{build.commit.committerName}} commited</p>
       </div>

From 82e8d94207ea6e2e4378ac4086d2fe1db6ba9410 Mon Sep 17 00:00:00 2001
From: Lisa Passing <mail@lislis.de>
Date: Thu, 12 Mar 2015 15:35:57 +0100
Subject: [PATCH 3/4] fix title overflow

---
 app/styles/app/layouts/buildheader.sass | 4 +++-
 app/styles/app/modules/tiles.sass       | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass
index d19ed38d..d1c83113 100644
--- a/app/styles/app/layouts/buildheader.sass
+++ b/app/styles/app/layouts/buildheader.sass
@@ -73,7 +73,7 @@
     margin: .5em 0 0
   @media #{$medium-up}
     position: relative
-    max-height: 4.9em
+    height: 4.9em
     overflow: hidden
     &:after
       @include fadeOut(bottom, 0deg, $cream-light)
@@ -103,6 +103,8 @@
     white-space: nowrap
     &:hover
       text-decoration: underline
+  li
+    white-space: nowrap
 
 .repo-main-tools
   position: absolute
diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass
index fd0f93c3..8900444e 100644
--- a/app/styles/app/modules/tiles.sass
+++ b/app/styles/app/modules/tiles.sass
@@ -44,6 +44,7 @@
 
 // todo refactor
 .tile-main
+  position: relative
   h2,
   small
     margin: 0
@@ -51,11 +52,15 @@
     font-size: $font-size-m
     color: $grey3
     line-height: 1
+    white-space: nowrap
   small
     margin-right: .3em
     font-weight: 600
   a:hover
     text-decoration: underline
+  h2
+    @media #{$medium-up}
+      @include fadeOut(right, -90deg, $cream-light)
 
   @media #{$xlarge-up}
     @include grid-column(9)

From 79b3f5fd3bf1c4166d9c21aa2524802d430d1c32 Mon Sep 17 00:00:00 2001
From: Lisa Passing <mail@lislis.de>
Date: Thu, 12 Mar 2015 16:08:01 +0100
Subject: [PATCH 4/4] truly fix the commit message overflow

---
 app/styles/app/layouts/buildheader.sass | 6 ++++++
 app/styles/app/modules/tiles.sass       | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass
index d1c83113..51d425c1 100644
--- a/app/styles/app/layouts/buildheader.sass
+++ b/app/styles/app/layouts/buildheader.sass
@@ -56,6 +56,7 @@
     margin-top: 2em
 
 .repo-main-commit
+  position: relative
   &,
   small
     margin: 0
@@ -66,6 +67,11 @@
   small
     margin-right: .3em
     font-weight: 600
+  @media #{$medium-up}
+    white-space: nowrap
+    overflow: hidden
+    &:after
+      @include fadeOut(right, -90deg, $cream-light)
 
 .repo-main-description
 
diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass
index 8900444e..fd0f93c3 100644
--- a/app/styles/app/modules/tiles.sass
+++ b/app/styles/app/modules/tiles.sass
@@ -44,7 +44,6 @@
 
 // todo refactor
 .tile-main
-  position: relative
   h2,
   small
     margin: 0
@@ -52,15 +51,11 @@
     font-size: $font-size-m
     color: $grey3
     line-height: 1
-    white-space: nowrap
   small
     margin-right: .3em
     font-weight: 600
   a:hover
     text-decoration: underline
-  h2
-    @media #{$medium-up}
-      @include fadeOut(right, -90deg, $cream-light)
 
   @media #{$xlarge-up}
     @include grid-column(9)