Merge branch 'master' into job-matrix

app/styles/app/layouts/buildheader.sass

@@ -56,6 +56,7 @@
     margin-top: 2em
 
 .repo-main-commit
+  position: relative
   &,
   small
     margin: 0
@@ -66,12 +67,19 @@
   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
 
+  p
+    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)
@@ -101,6 +109,8 @@
     white-space: nowrap
     &:hover
       text-decoration: underline
+  li
+    white-space: nowrap
 
 .repo-main-tools
   position: absolute

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

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">

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>
-              <small>{{build.commit.branch}}</small>
+            {{#link-to "build" build.repo build}}
-            {{!-- </a> --}}
+              {{{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>

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 field--switch">
-  <div class="field">
+    {{travis-switch active=public}}
-    {{travis-switch active=public class="value"}}
     {{#label for="secure" class="public"}}Display value in build logs{{/label}}
   </div>