diff --git a/app/components/dashboard-row.js b/app/components/dashboard-row.js index 9d75fb3a..bcc1ced5 100644 --- a/app/components/dashboard-row.js +++ b/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', diff --git a/app/styles/app/pages/landing.sass b/app/styles/app/pages/landing.sass index 8f72749f..41cae658 100644 --- a/app/styles/app/pages/landing.sass +++ b/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-weight: 300 - color: #606162 - text-align: center + font-size: 16px 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 diff --git a/app/templates/components/landing-row.hbs b/app/templates/components/landing-row.hbs index ba598235..b7dd3561 100644 --- a/app/templates/components/landing-row.hbs +++ b/app/templates/components/landing-row.hbs @@ -1,4 +1,3 @@ -

{{#link-to "owner" repo.owner}} @@ -14,20 +13,9 @@
-
+
{{#link-to "build" repo repo.lastBuildId}} - - - - - + {{repo.lastBuildNumber}} {{repo.lastBuildState}} {{/link-to}} @@ -36,22 +24,7 @@
- - - - - - - - - +
@@ -61,48 +34,15 @@
- - - - - - - + {{format-sha repo.lastBuild.commit.sha}}
-
- - - - - - - {{repo.lastBuild.commit.branch}} +
+ {{request-icon event=repo.lastBuild.eventType}} + {{repo.lastBuild.commit.branch}}
diff --git a/app/templates/home.hbs b/app/templates/home.hbs index 44196c2c..8f720fae 100644 --- a/app/templates/home.hbs +++ b/app/templates/home.hbs @@ -1,252 +1,252 @@ {{#travis-layout layoutName="layouts/landing-page"}}
-
-
-
-

Test and Deploy with Confidence

-

Easily sync your GitHub projects with Travis CI
and you’ll be testing your code in minutes!

+
+
+
+

Test and Deploy with Confidence

+

Easily sync your GitHub projects with Travis CI
and you’ll be testing your code in minutes!

- {{#if auth.signedOut}} - - {{/if}} - {{#if auth.signingIn}} - - {{/if}} + {{#if auth.signedOut}} + + {{/if}} + {{#if auth.signingIn}} + + {{/if}} -
-
-
- -
-
-
+
+
+
+ +
+
+
+
+ +
+
+
+

The home of
open source testing

+

Over 200k open source projects
and 126k users are testing on Travis CI.

+ +
+
+
+ +
+
+
+ +
+
+

Some pretty awesome companies
and projects are using us.

+
+
+
+ +
+
+
+
+

Every minute there’s
a new build being run

+

Here are just a few projects
currently running on Travis CI

+
+
+
+
    + {{#each repos as |repo|}} + {{landing-row repo=repo}} + {{else}} + {{loading-indicator}} + {{/each}} +
+
+
+
+ +
+
+
+

Testing your open source
project is 10000% free

+

Seriously. Always. We like to think of it as our way of giving
back to a community that gives us so much as well.

+
+
+
+ +
+
+
+ +
+ +
+
+

Have a private project
you’d like to test?

+

Travis CI for private repositories has
plans for every size project.

+
+
+
+ +
+
+
+ +
+
+
+
+
+

Get set up in seconds

+

Login with GitHub, tell Travis CI to test a project, and then push to GitHub. Could it be any simpler!

+
+
+

Multi-language support

+

Make sure your code runs against all versions of your favorite language without breaking a sweat.

+
+
+

Test your pull requests

+

Make sure every pull request to your project is tested before merging.

+
+
+

Deploy to S3 and Heroku

+

Updating staging or production as soon as your tests pass has never been easier!

+
+
+
+
+

Features created to
help your projects and teams

+
    +
  • Watch your tests as they run
    • +
  • Keep your config with your code
    • +
  • Slack, HipChat, Emails and more
    • +
  • A clean VM for every build
    • +
  • Run your tests in parallel
    • +
  • Linux and Mac (and iOS) supported
    • +
  • Great API and command line tool
    • +
  • Did we say free for Open Source already?
    • +
+
+
+
+ +
+
+
+

Branch build flow

+
+
+ +

You push your
code to GitHub

+
+
+
+
+
+
+ +

GitHub triggers
Travis CI to build

+
+
+
+
+
+
+ +

Hooray!
Your build passes!

+
+
+
+
+
+
+ +

Travis CI deploys
to Heroku

+
+
+
+
+
+
+ +

Travis CI tells the
team all is well

+
+
+

Pull request build flow

+
+
+ +

A pull request
is created

+
+
+
+
+
+
+ +

GitHub tells Travis CI the build is mergeable

+
+
+
+
+
+
+ +

Hooray!
Your build passes!

+
+
+
+
+
+
+ +

Travis CI updates the PR that it passed

+
+
+
+
+
+
+ +

You merge in
the PR goodness

+
+
+
+
+
+ +
+
+
+

Some people have said some pretty nice things about us

+
+
+
+ +
+
+

Travis CI makes it so much easier for us to coordinate the thousands of commits and contributors that flow through the Rails code base. The test suite for such a large project is vast, and we wouldn’t be catching issues as quickly or smoothly without the help of Travis.

+

David Heinemeier Hansson

dhh +

Creator of Ruby on Rails

-
-
-
-

The home of
open source testing

-

Over 200k open source projects
and 126k users are testing on Travis CI.

- -
-
+
+ +
+
+

We love Travis CI at @TwitterOSS and use it for the majority of our open source projects on GitHub. Travis CI is simple to use, we love their API to build tooling and adore the new container infrastructure for speedier builds.

+

Chris Aniszczyk

cra +

Head of Open Source at Twitter

-
-
-
- -
-
-

Some pretty awesome companies
and projects are using us.

-
-
+
+
- -
-
-
-
-

Every minute there’s
a new build being run

-

Here are just a few projects
currently running on Travis CI

-
-
-
-
    - {{#each repos as |repo|}} - {{landing-row repo=repo}} - {{else}} - {{loading-indicator}} - {{/each}} -
-
-
-
- -
-
-
-

Testing your open source
project is 10000% free

-

Seriously. Always. We like to think of it as our way of giving
back to a community that gives us so much as well.

-
-
-
- -
-
-
- -
- -
-
-

Have a private project
you’d like to test?

-

Travis CI for private repositories has
plans for every size project.

-
-
-
- -
-
-
- -
-
-
-
-
-

Get set up in seconds

-

Login with GitHub, tell Travis CI to test a project, and then push to GitHub. Could it be any simpler!

-
-
-

Multi-language support

-

Make sure your code runs against all versions of your favorite language without breaking a sweat.

-
-
-

Test your pull requests

-

Make sure every pull request to your project is tested before merging.

-
-
-

Deploy to S3 and Heroku

-

Updating staging or production as soon as your tests pass has never been easier!

-
-
-
-
-

Features created to
help your projects and teams

-
    -
  • Watch your tests as they run
    • -
  • Keep your config with your code
    • -
  • Slack, HipChat, Emails and more
    • -
  • A clean VM for every build
    • -
  • Run your tests in parallel
    • -
  • Linux and Mac (and iOS) supported
    • -
  • Great API and command line tool
    • -
  • Did we say free for Open Source already?
    • -
-
-
-
- -
-
-
-

Branch build flow

-
-
- -

You push your
code to GitHub

-
-
-
-
-
-
- -

GitHub triggers
Travis CI to build

-
-
-
-
-
-
- -

Hooray!
Your build passes!

-
-
-
-
-
-
- -

Travis CI deploys
to Heroku

-
-
-
-
-
-
- -

Travis CI tells the
team all is well

-
-
-

Pull request build flow

-
-
- -

A pull request
is created

-
-
-
-
-
-
- -

GitHub tells Travis CI the build is mergeable

-
-
-
-
-
-
- -

Hooray!
Your build passes!

-
-
-
-
-
-
- -

Travis CI updates the PR that it passed

-
-
-
-
-
-
- -

You merge in
the PR goodness

-
-
-
-
-
- -
-
-
-

Some people have said some pretty nice things about us

-
-
-
- -
-
-

Travis CI makes it so much easier for us to coordinate the thousands of commits and contributors that flow through the Rails code base. The test suite for such a large project is vast, and we wouldn’t be catching issues as quickly or smoothly without the help of Travis.

-

David Heinemeier Hansson

dhh -

Creator of Ruby on Rails

-
- -
- -
-
-

We love Travis CI at @TwitterOSS and use it for the majority of our open source projects on GitHub. Travis CI is simple to use, we love their API to build tooling and adore the new container infrastructure for speedier builds.

-

Chris Aniszczyk

cra -

Head of Open Source at Twitter

-
- -
- -
-
-

Not only is Travis CI the best way to test your software, it is the right way. rm -rf jenkins && touch .travis.yml

-

Alex Gaynor

alex -

PyPy and Python Core Team Member

-
-
-
+
+

Not only is Travis CI the best way to test your software, it is the right way. rm -rf jenkins && touch .travis.yml

+

Alex Gaynor

alex +

PyPy and Python Core Team Member

+
+
+
{{/travis-layout}}