update org landing

remove merge conflict

app/components/dashboard-row.js

@@ -1,11 +1,7 @@
 import Ember from 'ember';
 import { githubCommit as githubCommitUrl } from 'travis/utils/urls';
 import config from 'travis/config/environment';
-<<<<<<< HEAD
 import { hasAdminPermission, hasPushPermission } from 'travis/utils/permission';
-=======
-import Permissions from 'travis/mixins/permissions';
->>>>>>> add permissions mixin to dashboard row
 
 export default Ember.Component.extend(Permissions, {
   tagName: 'li',

app/styles/app/pages/landing.sass

@@ -7,20 +7,6 @@
 .top.landing-page .topbar
   background-color: #fff
 
-  .button--signin
-    background-color: #ffffff
-    background-image: inline-image('landing-page/signingithub.svg')
-    background-size: 16px 16px
-    border: 2px solid #e4e7e7
-    color: #a0a8a8
-  .button--signingin
-    border: 2px solid #3FA75F
-  .button--signin:hover
-    background-color: #73c78d
-    background-image: inline-image('landing-page/signingithub-hover.svg')
-    border: 2px solid #73c78d
-    color: #fff
-
 .landing-centered-wrapper
   .button
     .sync-spinner
@@ -37,9 +23,14 @@
     font-size: 5em
     line-height: 1em
     font-weight: 300
-    color: #8f9294
+    color: rgba($asphalt-grey, .8)
     margin-bottom: 0
 
+  .hero,
+  .recent-builds,
+  .features-list
+    background-color: $pebble-grey
+
   .hero, .oss-testing, .customers, .recent-builds, .free-for-oss, .private-repos, .features-list, .build-flows, .user-testimonials
     padding: 70px 0 70px 0
 
@@ -52,11 +43,11 @@
       font-size: 3.3em
       line-height: 1.15em
       font-weight: 300
-      color: #39a85b
+      color: $turf-green
 
     p
       line-height: 1.5em
-      font-color: #606162
+      font-color: $asphalt-grey
       font-size: 1.7em
 
   .hero.z-1
@@ -78,13 +69,12 @@
     margin-bottom: -192px
 
   #laptop img
-    border: 2px solid #d8dadc
+    border: 2px solid rgba($cement-grey, 0.2)
     border-radius: 2px
 
   .hero
-    background-color: #f6f6f6
     h1
-      color: #339999
+      color: $oxide-blue
       line-height: 1.2em
       margin-bottom: 0
 
@@ -96,17 +86,15 @@
       display: none
 
     .button
-      background-color: #39a85b
+      background-color: $turf-green
       color: #fff
       font-size: 2em
       font-weight: 300
-      padding: 0.5em
       margin: 1.3em 0 1.3em 0
       border-radius: 2px
-      border: 0
 
       &:hover
-        background-color: #73c78d
+        background-color: rgba($turf-green, .8)
 
     .sign-in-mascot
       padding-right: 10px
@@ -139,19 +127,15 @@
       padding: 0 0 0 12%
 
   .recent-builds
-    background-color: #f6f6f6
     min-height: 44rem
 
   .recent-builds-text
     text-align: center
     h2
-      color: #db4141
+      color: $brick-red
       text-align: right
       margin: 0
 
-    a
-      color: #828282
-
     p
       text-align: right
       margin-top: 0.5em
@@ -196,7 +180,7 @@
     text-align: center
 
     h2
-      color: #339999
+      color: $oxide-blue
       margin: 0
       text-align: right
 
@@ -206,7 +190,12 @@
       text-align: right
 
     a
-      text-decoration: underline
+      text-decoration: none
+      border-bottom: 1px solid $asphalt-grey
+      transition: all 200ms ease
+      &:hover
+        border-bottom: none
+        color: $cement-grey
 
     .mobile-envelope
       display: none
@@ -215,7 +204,6 @@
       display: inline-block
 
   .features-list
-    background-color: #f6f6f6
 
     h2
       margin: 0
@@ -223,16 +211,11 @@
     h3
       font-size: 1.4em
       font-weight: 300
-      color: #413c3c
-      text-align: center
       margin-bottom: 35px
       padding-top: 40px
 
     p
-      font-size: 1.15em
+      font-size: 16px
-      font-weight: 300
-      color: #606162
-      text-align: center
 
     br.mobile-break
       display: none
@@ -278,7 +261,6 @@
       margin-top: 1.6rem;
 
     li
-      font-color: #606162
       font-size: 1.7em
       line-height: 1.7em
       &:before
@@ -293,7 +275,7 @@
     text-align: center
 
     h2
-      color: #909295
+      color: $cement-grey
 
     h2#pr-bf-margin
       margin-top: 90px
@@ -304,9 +286,8 @@
         width: 120px
 
         p
-          font-size: 1em
+          font-size: 13px
           line-height: 1.5em
-          color: #5f6062
 
     .divider-line-horizontal
       width: 50px
@@ -322,13 +303,11 @@
     margin-bottom: 50px
 
     h2
-      color: #418793
+      color: $oxide-blue
       text-align: right
 
     p
       font-size: 1.2em
-      font-weight: 300
-      color: #606162
       margin: 0
       display: inline-block
 
@@ -407,7 +386,7 @@
     .build-flows .branch-bf .divider-line-vertical
       width: 3px
       height: 40px
-      background: #eaeaec
+      background: $pebble-grey
       display: inline-block
       margin-bottom: 10px
 
@@ -472,7 +451,6 @@
     padding-left: .5rem
     font-size: 18px
 
-
 .landing,
 .landing-pro
   background-color: white

app/templates/components/landing-row.hbs

@@ -1,4 +1,3 @@
-
 <div class="two-line row-header fade-out">
   <div class="row-name row-color">
     <h3>{{#link-to "owner" repo.owner}}
@@ -14,20 +13,9 @@
 
 <div class="two-line">
   <div class="row-number">
-    <div class="row-item row-color">
+    <div class="row-item">
       {{#link-to "build" repo repo.lastBuildId}}
-      <span class="icon">
+      <span class="icon-hash"></span>
-        <svg version="1.1" id="Layer_1" x="0px" y="0px"
-           viewBox="-289 191 20 20" style="enable-background:new -289 191 20 20;" xml:space="preserve">
-        <path fill="#A5ACAD" class="st0" d="M-272.4,198.4C-272.4,198.4-272.4,198.4-272.4,198.4l-3.4,0l0.3-3.3c0-0.3-0.2-0.6-0.5-0.6
-          c-0.3,0-0.6,0.2-0.6,0.5l-0.3,3.4l-3.2,0l0.3-3.6c0-0.3-0.2-0.6-0.5-0.6c-0.3,0-0.6,0.2-0.6,0.5l-0.3,3.7l-3.2,0
-          c-0.3,0-0.5,0.2-0.5,0.6c0,0.3,0.2,0.5,0.5,0.5c0,0,0,0,0,0l3.1,0l-0.2,2.9l-3.5,0c-0.3,0-0.5,0.2-0.5,0.6c0,0.3,0.2,0.5,0.5,0.5
-          c0,0,0,0,0,0l3.4,0l-0.3,3.3c0,0.3,0.2,0.6,0.5,0.6c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5l0.3-3.4l3.2,0l-0.3,3.6
-          c0,0.3,0.2,0.6,0.5,0.6c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5l0.3-3.7l3.2,0c0.3,0,0.5-0.2,0.5-0.6c0-0.3-0.2-0.5-0.5-0.5c0,0,0,0,0,0
-          l-3.1,0l0.2-2.9l3.5,0c0.3,0,0.5-0.2,0.5-0.6C-271.8,198.7-272.1,198.4-272.4,198.4z M-277.2,202.4l-3.2,0l0.2-2.9l3.2,0
-          L-277.2,202.4z"/>
-        </svg>
-      </span>
       <span class="label-align">
         {{repo.lastBuildNumber}} {{repo.lastBuildState}}</span>
       {{/link-to}}
@@ -36,22 +24,7 @@
 
   <div class="row-calendar">
     <div class="row-item" title="{{repo.lastBuildFinishedAt}}">
-      <span class="icon">
+      <span class="icon-calendar"> </span>
-        <svg viewBox="0 0 20 20">
-          <g id="Cal">
-            <path fill="#A7AEAE" d="M16.7,2.5H3.3C3,2.5,2.8,2.7,2.8,3V17c0,0.3,0.2,0.5,0.5,0.5h13.4c0.3,0,0.5-0.2,0.5-0.5V3
-              C17.2,2.7,17,2.5,16.7,2.5z M16.2,3.4v3.1H3.8V3.4H16.2z M3.8,16.6v-9h12.5v9H3.8z"/>
-            <path fill="#A7AEAE" d="M8.7,13.4c-0.1,0-0.3,0-0.4,0c0.2-0.2,0.4-0.4,0.5-0.6c0.2-0.2,0.3-0.4,0.5-0.6c0.1-0.2,0.2-0.4,0.3-0.6
-              c0.1-0.2,0.1-0.4,0.1-0.6c0-0.2,0-0.4-0.1-0.6c-0.1-0.2-0.2-0.3-0.3-0.4C9.2,10,9.1,9.9,8.9,9.8C8.7,9.7,8.5,9.7,8.3,9.7
-              C8,9.7,7.7,9.8,7.5,9.9C7.2,10,7,10.2,6.8,10.4L7.3,11c0.1-0.1,0.2-0.2,0.4-0.3c0.1-0.1,0.3-0.1,0.4-0.1c0.2,0,0.4,0.1,0.5,0.2
-              c0.1,0.1,0.2,0.3,0.2,0.5c0,0.2,0,0.3-0.1,0.5c-0.1,0.2-0.2,0.4-0.4,0.6c-0.2,0.2-0.4,0.4-0.6,0.7c-0.2,0.2-0.5,0.5-0.8,0.8v0.6
-              H10v-0.9H9.1C9,13.4,8.8,13.4,8.7,13.4z"/>
-            <path fill="#A7AEAE" d="M10.6,10.7h2c-0.2,0.3-0.4,0.6-0.5,0.8c-0.1,0.3-0.3,0.6-0.4,0.8c-0.1,0.3-0.2,0.6-0.2,0.9
-              c0,0.3-0.1,0.7-0.1,1h1c0-0.4,0-0.8,0.1-1.2c0-0.3,0.1-0.7,0.2-0.9c0.1-0.3,0.2-0.6,0.4-0.9c0.2-0.3,0.4-0.6,0.6-0.9V9.8h-3.1
-              V10.7z"/>
-          </g>
-        </svg>
-      </span>
       <time class="label-align" datetime="{{repo.lastBuildFinishedAt}}">
         {{landing-page-last-build-time repo.lastBuildFinishedAt}}</time>
     </div>
@@ -61,48 +34,15 @@
 <div class="two-line">
   <div class="row-commit">
     <div class="row-item">
-      <span class="icon">
+      <span class="icon-github"></span>
-        <svg x="0px" y="0px" viewBox="2 0 20 20" xml:space="preserve">
-          <g id="Commit">
-            <path fill="#A7AEAE" d="M7.8,17.5c-0.3,0-0.5-0.2-0.5-0.5l0-1c-0.4,0-1,0.1-1.4-0.1c-0.4-0.1-1.3-0.5-1.8-1.7
-              c-0.1-0.2-0.3-0.4-0.4-0.6c-0.1-0.1-0.2-0.3-0.3-0.4C3,12.8,3,12,3.3,11.5c0.3-0.4,0.7-0.5,1.2-0.3c0.7,0.2,1.1,0.9,1.4,1.3
-              c0.1,0.1,0.1,0.2,0.2,0.2c0.4,0.4,1,0.3,1.4,0.1c0.1-0.1,0.2-0.2,0.3-0.3c-0.1,0-0.1,0-0.2,0c-0.7-0.1-1.3-0.4-1.9-0.7
-              c-0.2-0.2-0.6-0.4-0.8-0.7c-0.3-0.3-0.5-0.7-0.7-1.2C4.1,9.4,4,9,3.9,8.5c0-0.4-0.1-0.9,0-1.4C4,6.5,4.2,6,4.5,5.5
-              c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0-0.1,0-0.1c-0.1-0.3-0.1-0.6-0.1-1c0-0.4,0.1-0.8,0.3-1.2C5,2.6,5.2,2.5,5.5,2.5
-              c0.3,0,0.8,0.1,1.2,0.3c0.4,0.2,0.8,0.4,1.2,0.7c0.5-0.1,1-0.2,1.6-0.2c0.4,0,1.6,0,2,0c0.5,0,1,0.1,1.4,0.2l0.2-0.1
-              c0.2-0.1,0.5-0.3,0.7-0.4c0.4-0.2,0.7-0.3,1.1-0.3c0.1,0,0.2,0,0.3,0c0.3,0,0.5,0.1,0.6,0.4c0.2,0.6,0.4,1.2,0.2,2l0,0.1
-              c0,0.1,0,0.2-0.1,0.3c0.5,0.6,0.7,1.3,0.8,2.1c0,0.3,0,0.6,0,0.9c0,0.5-0.1,1-0.2,1.4c-0.2,0.5-0.4,1-0.7,1.4
-              c-0.3,0.4-0.7,0.6-1,0.8c-0.6,0.3-1.2,0.6-1.8,0.7c0.2,0.4,0.3,0.8,0.3,1.3c0,0,0,0,0,0c0,0.8,0,3.2,0,3.2c0,0.3-0.2,0.5-0.5,0.5
-              L7.8,17.5L7.8,17.5z M7.8,15.1c0.1,0,0.2,0,0.3,0.1c0.1,0.1,0.2,0.2,0.2,0.3l0,1l4.2,0c0-0.7,0-2.1,0-2.7c0-0.4-0.1-0.7-0.2-1
-              c-0.1-0.2-0.1-0.3-0.2-0.3l0.3-0.4l0,0L12,12.5c-0.1-0.1-0.1-0.3-0.1-0.5c0.1-0.2,0.2-0.3,0.4-0.3l0.3,0c0.7-0.1,1.3-0.3,1.9-0.7
-              c0.3-0.2,0.6-0.4,0.7-0.6c0.2-0.3,0.4-0.6,0.5-1C15.9,9,15.9,8.6,16,8.1c0-0.2,0-0.5,0-0.7c-0.1-0.7-0.3-1.2-0.7-1.7
-              c-0.2-0.2-0.2-0.4-0.1-0.6c0-0.1,0.1-0.2,0.1-0.3l0-0.1c0.1-0.4,0-0.8-0.1-1.2c0,0,0,0-0.1,0c-0.2,0-0.5,0.1-0.7,0.2
-              c-0.2,0.1-0.4,0.2-0.7,0.4l-0.4,0.2c-0.1,0.1-0.3,0.1-0.4,0.1c-0.5-0.1-0.9-0.2-1.4-0.2c-0.4,0-1.5,0-1.9,0C9,4.1,8.5,4.2,8,4.4
-              c-0.1,0-0.3,0-0.5-0.1C7.1,4,6.7,3.8,6.3,3.6C6.1,3.5,5.9,3.5,5.7,3.5C5.6,3.7,5.6,4,5.6,4.2c0,0.3,0,0.5,0.1,0.7
-              c0,0.1,0,0.1,0.1,0.2c0.1,0.2,0,0.4-0.1,0.5L5.5,5.8C5.5,5.9,5.4,6,5.3,6.1C5.1,6.4,4.9,6.8,4.8,7.3c-0.1,0.4,0,0.8,0,1.1
-              c0,0.4,0.1,0.8,0.2,1.2c0.1,0.4,0.3,0.7,0.5,0.9C5.8,10.7,6,10.9,6.2,11c0.5,0.3,1,0.5,1.6,0.6c0.2,0,0.7,0.1,0.7,0.1
-              c0.1,0,0.3,0.1,0.3,0.2c0.1,0.1,0.1,0.2,0.1,0.4c0,0.1-0.3,1-0.9,1.4c-0.7,0.4-1.8,0.5-2.5-0.3c-0.1-0.1-0.2-0.2-0.3-0.3
-              c-0.2-0.3-0.6-0.8-1-1c-0.1,0-0.1,0-0.1,0c0,0,0,0-0.1,0.1c0,0.2,0,0.4,0.1,0.6c0.1,0.1,0.2,0.2,0.3,0.4c0.2,0.3,0.4,0.5,0.5,0.8
-              c0.4,0.8,1,1.1,1.2,1.2C6.6,15.2,7.4,15.1,7.8,15.1C7.7,15.1,7.7,15.1,7.8,15.1z"/>
-          </g>
-        </svg>
-      </span>
       <span class="label-align">
         {{format-sha repo.lastBuild.commit.sha}}</span>
     </div>
   </div>
   <div class="row-commiter">
-    <div class="row-item">
+    <div class="row-item color">
-      <span class="icon">
+      {{request-icon event=repo.lastBuild.eventType}}
-        <svg version="1.1" id="Layer_1" x="0px" y="0px"
+      <span class="label-align">{{repo.lastBuild.commit.branch}}</span>
-           viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
-          <g id="Push">
-            <path fill="#A7AEAE" d="M16.9,9.4h-3.5c-0.3-1.6-1.7-2.8-3.4-2.8S6.9,7.8,6.6,9.4H3.1c-0.3,0-0.6,0.3-0.6,0.6s0.3,0.6,0.6,0.6h3.5
-              c0.3,1.6,1.7,2.8,3.4,2.8s3.1-1.2,3.4-2.8h3.5c0.3,0,0.6-0.3,0.6-0.6S17.2,9.4,16.9,9.4z M10,12.2c-1.2,0-2.2-1-2.2-2.2
-              c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2c0,0,0,0,0,0c0,0,0,0,0,0C12.2,11.2,11.2,12.2,10,12.2z"/>
-          </g>
-        </svg>
-      </span><span class="label-align">{{repo.lastBuild.commit.branch}}</span>
     </div>
   </div>
 </div>

app/templates/home.hbs

@@ -7,7 +7,7 @@
 	<p>Easily sync your GitHub projects with Travis CI<br class="mobile-break"> and you’ll be testing your code in minutes!</p>
 
 	{{#if auth.signedOut}}
-				  <button {{action "signIn" target="auth"}} class="button"><img src="../images/landing-page/sign-in-mascot.svg" class="sign-in-mascot">Sign Up</button>
+	<button {{action "signIn" target="auth"}} class="button"><img src="../images/landing-page/sign-in-mascot.svg" class="sign-in-mascot"><span class="label-align">Sign Up</span></button>
 	{{/if}}
 	{{#if auth.signingIn}}
 	<button class="button"><span class="loading-indicator--white"><i></i><i></i><i></i></span>Signing In</button>