From 80aa01f3b0b5b17346ed9d7f2bb66bf9c2466d09 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 18 Mar 2015 15:36:18 +0100 Subject: [PATCH 01/57] start topbar revamp --- app/styles/app.scss | 3 ++- app/styles/app/layouts/top.sass | 21 +++++++++++++++++++++ app/templates/top.hbs | 29 ++++++++++++----------------- 3 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 app/styles/app/layouts/top.sass diff --git a/app/styles/app.scss b/app/styles/app.scss index 439c22b4..9cea74ef 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -64,4 +64,5 @@ @import "app/layouts/sidebar"; @import "app/layouts/build-job"; @import "app/layouts/sidebar"; -@import "app/top"; +@import "app/layouts/top"; +// @import "app/top"; diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass new file mode 100644 index 00000000..eb54df8b --- /dev/null +++ b/app/styles/app/layouts/top.sass @@ -0,0 +1,21 @@ +$top-height: 55px + + + +.topbar + background-color: $cream-light + color: $grey1 + + a + color: $grey1 + + @media #{$medium-up} + height: $top-height + + .burger + display: none + + + .navigation + li + @extend %inline-block diff --git a/app/templates/top.hbs b/app/templates/top.hbs index cd09b2a9..6abb3e6c 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -1,16 +1,11 @@ -
- {{#link-to "main"}} - - {{/link-to}} - +
+

{{#link-to "main"}}Travis{{/link-to}}

- {{!--

{{view.name}}

- {{#if config.billingEndpoint}} {{#if view.subscribed}} @@ -62,8 +60,8 @@ {{/if}} {{/if}} - {{view 'profile-tabs'}} - +{{!-- {{view 'profile-tabs'}} --}} +{{!--
{{outlet}}
--}} diff --git a/public/images/svg/hooks-on.svg b/public/images/svg/hooks-on.svg index 9691e791..54167549 100644 --- a/public/images/svg/hooks-on.svg +++ b/public/images/svg/hooks-on.svg @@ -3,8 +3,8 @@ - + From 7584af6e52361db824c6d8cfe4ea9fcf00f0f688 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 23 Mar 2015 18:30:26 +0100 Subject: [PATCH 15/57] nudge profile sidebar --- app/styles/app/layouts/profile.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 66c251b0..1d262b83 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -96,7 +96,7 @@ border-bottom: solid 2px #f3f2f2 .profile-user - margin-bottom: 2rem + margin: 1rem 0 2rem p.profile-user-last margin-top: .5em \ No newline at end of file From 92e0b4a54c1cfc8420d51dc496b2fa1307af3532 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 10:40:26 +0100 Subject: [PATCH 16/57] show timestamp when hovering over finishedAt in build header --- app/templates/build.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/build.hbs b/app/templates/build.hbs index bc4998ae..d467cdb4 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -61,7 +61,7 @@
  • {{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}} -
  • +
  • {{format-time build.finishedAt}}
    • From 4eb3aa25ad0e69d0c3cd7df194f6db4e623a9415 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 12:22:56 +0100 Subject: [PATCH 17/57] styles for profile repo list --- app/styles/app/layouts/profile.sass | 48 +++++++++++++++++++++++++++-- app/styles/app/modules/icons.sass | 5 +-- app/templates/profile/show.hbs | 20 +++++++----- 3 files changed, 58 insertions(+), 15 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 1d262b83..fece423a 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -26,7 +26,6 @@ .sync-button margin-top: .5em - .profile-getstarted position: relative margin-bottom: 3rem @@ -57,7 +56,6 @@ padding: 0 3.2em border-right: solid 2px #f3f2f2 - .profile-orgs, .profile-user @@ -99,4 +97,48 @@ margin: 1rem 0 2rem p.profile-user-last - margin-top: .5em \ No newline at end of file + margin-top: .5em + + +.profile-hooklist + @include resetul + font-size: $font-size-m + color: #7a7a7a + li + clear: both + margin-bottom: .8em + overflow: auto + > div + width: grid-calc(5, 24) + .switch + display: inline-block + .profile-settings + display: inline-block + margin-left: 1rem; + padding: .2em .2em .2em .5em; + height: 28px; + vertical-align: bottom; + .icon + width: 14px + height: 14px + +.profile-repo + @extend %border-radius-4px + width: grid-calc(19, 24) + padding: .25em .5em .3em + span + display: none + margin-left: 2rem + font-size: $font-size-sm + color: #484849 + &:hover + background-color: #ededec + span + display: inline-block + .is-active &:hover + background-color: #e2eee2 + @media #{$medium-up} + height: 30px + + + diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 89843ee7..131bd5fa 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -39,7 +39,7 @@ .icon-cog, .icon--cog - background-image: inline-image('icons/settings.svg') + background-image: inline-image('svg/settings_gray.svg') .icon-star background-image: inline-image('dashboard/star-off.svg') @@ -148,9 +148,6 @@ .icon-hook-off background-image: inline-image('svg/hooks-off.svg') -.icon-cog - background-image: inline-image('svg/settings_gray.svg') - .icon--plus &:after content: "+" diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs index 4487065e..85933281 100644 --- a/app/templates/profile/show.hbs +++ b/app/templates/profile/show.hbs @@ -29,15 +29,19 @@
    From c1e6934fc61aac1b115c46bffb4906b2a1d1e777 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 12:30:03 +0100 Subject: [PATCH 18/57] some responsove tweaks --- app/styles/app/layouts/profile.sass | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index fece423a..8066b098 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -109,7 +109,11 @@ p.profile-user-last margin-bottom: .8em overflow: auto > div - width: grid-calc(5, 24) + width: grid-calc(10, 24) + @media #{$medium-up} + width: grid-calc(7, 24) + @media #{$large-up} + width: grid-calc(5, 24) .switch display: inline-block .profile-settings @@ -124,7 +128,7 @@ p.profile-user-last .profile-repo @extend %border-radius-4px - width: grid-calc(19, 24) + width: grid-calc(14, 24) padding: .25em .5em .3em span display: none @@ -133,12 +137,16 @@ p.profile-user-last color: #484849 &:hover background-color: #ededec - span - display: inline-block .is-active &:hover background-color: #e2eee2 @media #{$medium-up} + width: grid-calc(17, 24) height: 30px + &:hover + span + display: inline-block + @media #{$large-up} + width: grid-calc(19, 24) From 88b128fc3ece71dc9a5c9bd4632b7b27715633b3 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 12:46:09 +0100 Subject: [PATCH 19/57] trying to make sense to templates --- app/styles/app/layouts/profile.sass | 2 +- app/templates/account.hbs | 101 +++++++++++++++++----------- app/templates/profile/show.hbs | 52 +------------- 3 files changed, 67 insertions(+), 88 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 8066b098..8cbac5d2 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -137,7 +137,7 @@ p.profile-user-last color: #484849 &:hover background-color: #ededec - .is-active &:hover + .active &:hover background-color: #e2eee2 @media #{$medium-up} width: grid-calc(17, 24) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 54c9119e..9bc68795 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -1,19 +1,40 @@ -

    - {{#if config.pro}} - We're only showing your private repositories below. - You can find your public projects on travis-ci.org. - {{else}} - We're only showing your public repositories below. - You can find your private projects on travis-ci.com. - {{/if}} -

    - -

    - Enable your projects below by flicking the switch, add a .travis.yml to your project, and push a new commit to - GitHub. -

    - {{#if allHooks.isLoaded}} +
    + +

    {{view.name}}

    + {{!-- {{sync-button user=auth.currentUser}} --}} + + {{#if config.pro}} +

    We're only showing you private repositories. You can find your public projects on travis-ci.org.

    + {{else}} +

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    + {{/if}} +
    +
    + +
      +
    1. +
      + +
      Flick the repository switch on
      +
      +
      2. +
    2. +
      + +
      Add .travis.yml file to your repository
      +
      +
      3. +
    3. +
      + +
      Trigger your first build with a git push
      +
      +
      4. +
    +
    + + {{#if user.isSyncing}}

    Please wait while we synchronize your data from GitHub @@ -26,30 +47,34 @@

    -
      - {{#each hook in hooks}} -
    • - {{hook.slug}} - {{#if hook.isSaving}}{{/if}} -

      {{hook.description}}

      +
      +
        + {{#each hook in hooks}} +
      • +
        + {{travis-switch action="toggle" target=hook toggleAutomatically="false"}} + {{!-- --}} + {{#link-to "settings" hook.ownerName hook.name class=":profile-settings" title="Repository settings"}}{{/link-to}} +
        + {{#if hook.isSaving}}{{/if}} + {{hook.slug}} + {{hook.description}} +
        • + {{else}} +
      • + {{#if hooksWithoutAdmin.length}} + Sorry, but we can't find any repositories you have admin access to. + {{else}} + Sorry, it seems like we couldn't find any repositories you have access to on GitHub. + {{/if}} +
        • + {{/each}} +
      +
      -
      - {{#link-to "settings" hook.ownerName hook.name class="repo-settings-icon tool-tip" title="Repository settings"}}{{/link-to}} - {{travis-switch action="toggle" target=hook toggleAutomatically="false"}} -
      -
      • - {{else}} -
    • - {{#if hooksWithoutAdmin.length}} - Sorry, but we can't find any repositories you have admin access to. - {{else}} - Sorry, it seems like we couldn't find any repositories you have access to on GitHub. - {{/if}} -
      • - {{/each}} -
    - {{#if hooksWithoutAdmin.length}} + + {{!-- {{#if hooksWithoutAdmin.length}}

    Repositories without admin access

    @@ -66,7 +91,7 @@ {{/each}}
    - {{/if}} + {{/if}} --}} {{/if}} {{else}}

    diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs index 85933281..fdb71e78 100644 --- a/app/templates/profile/show.hbs +++ b/app/templates/profile/show.hbs @@ -1,50 +1,4 @@

    -
    -

    {{view.name}}

    - {{sync-button user=auth.currentUser}} -

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    -
    -
    - -
      -
    1. -
      - -
      Flick the repository switch on
      -
      -
      2. -
    2. -
      - -
      Add .travis.yml file to your repository
      -
      -
      3. -
    3. -
      - -
      Trigger your first build with a git push
      -
      -
      4. -
    -
    -
    - -
    {{#if config.billingEndpoint}} {{#if view.subscribed}} @@ -64,9 +18,9 @@ {{/if}} {{/if}} -{{!-- {{view 'profile-tabs'}} --}} -{{!-- + {{!-- {{view 'profile-tabs'}} --}} +
    {{outlet}} -
    --}} +
    From d0234d5011809089f7ee387d568c8f16aec73bec Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 14:06:30 +0100 Subject: [PATCH 20/57] more template nudging --- app/templates/account.hbs | 116 ++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 60 deletions(-) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 9bc68795..5e144d3b 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -3,49 +3,47 @@

    {{view.name}}

    {{!-- {{sync-button user=auth.currentUser}} --}} - - {{#if config.pro}} -

    We're only showing you private repositories. You can find your public projects on travis-ci.org.

    + {{#if user.isSyncing}} +

    + Please wait while we synchronize your data from GitHub +

    {{else}} -

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    - {{/if}} - -
    - -
      -
    1. -
      - -
      Flick the repository switch on
      -
      -
      2. -
    2. -
      - -
      Add .travis.yml file to your repository
      -
      -
      3. -
    3. -
      - -
      Trigger your first build with a git push
      -
      -
      4. -
    -
    +

    + Last synchronized from GitHub: {{format-time user.syncedAt}} + + Sync now + +

    + {{#if config.pro}} +

    We're only showing you private repositories. You can find your public projects on travis-ci.org.

    + {{else}} +

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    + {{/if}} + - - {{#if user.isSyncing}} -

    - Please wait while we synchronize your data from GitHub -

    - {{else}} -

    - Last synchronized from GitHub: {{format-time user.syncedAt}} - - Sync now - -

    +
    + +
      +
    1. +
      + +
      Flick the repository switch on
      +
      +
      2. +
    2. +
      + +
      Add .travis.yml file to your repository
      +
      +
      3. +
    3. +
      + +
      Trigger your first build with a git push
      +
      +
      4. +
    +
      @@ -72,27 +70,25 @@
    + {{!-- {{#if hooksWithoutAdmin.length}} +
    +

    Repositories without admin access

    +

    + You only have pull or push access to the repositories below. +

    - {{!-- {{#if hooksWithoutAdmin.length}} -
    -

    Repositories without admin access

    - -

    - You only have pull or push access to the repositories below. -

    - -
      - {{#each hook in hooksWithoutAdmin}} -
    • - {{hook.slug}} -

      {{hook.description}}

      -
      • - {{/each}} -
    -
    - {{/if}} --}} - {{/if}} +
      + {{#each hook in hooksWithoutAdmin}} +
    • + {{hook.slug}} +

      {{hook.description}}

      +
      • + {{/each}} +
    +
    + {{/if}} --}} + {{/if}} {{else}}

    Loading From cc95e7a4e65c44fab2d91ff6939a6aecccbd5a56 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 14:13:45 +0100 Subject: [PATCH 21/57] new grey --- app/styles/app/layouts/top.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 96e08484..44155f8b 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -37,7 +37,7 @@ $top-height: 55px .topbar font-size: $font-size-m - background-color: $cream-light + background-color: #eaebe7 color: $grey1 a From 26aa5c64ab3cf214067a20eb23e385781eccd514 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 14:17:29 +0100 Subject: [PATCH 22/57] also update hover states --- app/styles/app/layouts/top.sass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 44155f8b..c65e114b 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -43,7 +43,7 @@ $top-height: 55px a display: block color: $grey1 - border-bottom: solid 1px $cream-dark + border-bottom: solid 1px #eaebe7 @media #{$small-only} .navigation @@ -84,6 +84,8 @@ $top-height: 55px height: $top-height line-height: $top-height + 2px border: none + &:hover + text-decoration: underline .navigation--profile float: right @@ -99,7 +101,8 @@ $top-height: 55px line-height: 35px padding: 0 2em &:hover - background-color: $cream-dark + text-decoration: none + background-color: $cream-light .navigation--profile.signed-in .navigation-handle:hover + .navigation-nested, @@ -109,4 +112,4 @@ $top-height: 55px right: 1rem display: block z-index: 90 - background-color: $cream-light + background-color: #eaebe7 From 3aa3dd5e009f3bbc7850088f8dd7f49f43adc40e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:01:18 +0100 Subject: [PATCH 23/57] new switches and more template nudging --- app/components/travis-switch.coffee | 2 +- app/styles/app/layouts/profile.sass | 2 + app/styles/app/modules/switch.sass | 2 +- app/templates/account.hbs | 41 +- app/templates/components/travis-switch.hbs | 6 - public/images/svg/hooks-step-1-01.svg | 123 +- public/images/svg/hooks-step-2-01.svg | 1232 ++++++++++---------- public/images/svg/hooks-step-3-01.svg | 215 ++-- 8 files changed, 836 insertions(+), 787 deletions(-) diff --git a/app/components/travis-switch.coffee b/app/components/travis-switch.coffee index a9e98a0c..2f990612 100644 --- a/app/components/travis-switch.coffee +++ b/app/components/travis-switch.coffee @@ -2,7 +2,7 @@ Component = Ember.Component.extend tagName: 'a' - classNames: ['travis-switch'] + classNames: ['travis-switch', 'switch'] classNameBindings: ['_active:active'] # TODO: how to handle overriding properties to diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 8cbac5d2..2dc76f71 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -114,6 +114,8 @@ p.profile-user-last width: grid-calc(7, 24) @media #{$large-up} width: grid-calc(5, 24) + a + text-decoration: none .switch display: inline-block .profile-settings diff --git a/app/styles/app/modules/switch.sass b/app/styles/app/modules/switch.sass index dd11b21a..6f85298f 100644 --- a/app/styles/app/modules/switch.sass +++ b/app/styles/app/modules/switch.sass @@ -28,7 +28,7 @@ $switch-inner-width: 27px @extend .icon-hook-off @extend %border-radius-4px - &.is-on + &.active background-color: #b6d5b6 &:after right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 5e144d3b..404b862d 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -3,23 +3,28 @@

    {{view.name}}

    {{!-- {{sync-button user=auth.currentUser}} --}} - {{#if user.isSyncing}} -

    - Please wait while we synchronize your data from GitHub -

    - {{else}} -

    - Last synchronized from GitHub: {{format-time user.syncedAt}} - - Sync now - -

    - {{#if config.pro}} + + {{#if user.isSyncing}} +
    + +
    + + {{else}} +
    + +

    last synced {{format-time user.syncedAt}}

    +
    + + {{#if config.pro}}

    We're only showing you private repositories. You can find your public projects on travis-ci.org.

    {{else}}

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    - {{/if}} - + {{/if}} +
    @@ -52,7 +57,7 @@
    {{travis-switch action="toggle" target=hook toggleAutomatically="false"}} {{!-- --}} - {{#link-to "settings" hook.ownerName hook.name class=":profile-settings" title="Repository settings"}}{{/link-to}} + {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}}
    {{#if hook.isSaving}}{{/if}} {{hook.slug}} @@ -88,11 +93,9 @@ {{/if}} --}} - {{/if}} + {{/if}} {{else}} -

    - Loading -

    + {{/if}} diff --git a/app/templates/components/travis-switch.hbs b/app/templates/components/travis-switch.hbs index dbed063c..e69de29b 100644 --- a/app/templates/components/travis-switch.hbs +++ b/app/templates/components/travis-switch.hbs @@ -1,6 +0,0 @@ - - ON - - - OFF - diff --git a/public/images/svg/hooks-step-1-01.svg b/public/images/svg/hooks-step-1-01.svg index e2e0a8da..86e0bc95 100644 --- a/public/images/svg/hooks-step-1-01.svg +++ b/public/images/svg/hooks-step-1-01.svg @@ -5,14 +5,16 @@ width="95.5px" height="102.167px" viewBox="0 0 95.5 102.167" enable-background="new 0 0 95.5 102.167" xml:space="preserve"> - - - - - - - - + + + + + + + + + + @@ -21,75 +23,88 @@ - 1 + + + - tra + + + + + - + c0-0.638,0-1.174,0-1.194s-0.018-0.036-0.037-0.036c-0.019,0-0.53,0-1.139,0c-0.607,0-1.119,0-1.141,0 + c-0.018,0-0.035,0.016-0.035,0.036s0,0.556,0,1.194c0,0.636-0.369,0.79-0.818,0.339c-0.451-0.451-0.83-0.83-0.846-0.844 + c-0.014-0.014-0.037-0.014-0.051,0s-0.377,0.377-0.805,0.806c-0.431,0.43-0.793,0.792-0.808,0.806 + c-0.014,0.014-0.014,0.037,0,0.051c0.015,0.014,0.396,0.394,0.847,0.845c0.45,0.45,0.297,0.819-0.341,0.819 + c-0.639,0-1.176,0-1.192,0c-0.021,0-0.037,0.017-0.037,0.037c0,0.019,0,0.532,0,1.139s0,1.12,0,1.138 + c0,0.021,0.016,0.037,0.037,0.037c0.018,0,0.555,0,1.192,0s0.791,0.368,0.341,0.819c-0.451,0.45-0.832,0.83-0.847,0.845 + c-0.014,0.014-0.014,0.037,0,0.051c0.015,0.014,0.377,0.377,0.808,0.806c0.428,0.429,0.791,0.792,0.805,0.806s0.037,0.014,0.051,0 + c0.016-0.014,0.395-0.395,0.846-0.844c0.449-0.451,0.818-0.299,0.818,0.338c0,0.639,0,1.174,0,1.195 + c0,0.02,0.018,0.035,0.035,0.035c0.021,0,0.533,0,1.141,0c0.608,0,1.119,0,1.139,0c0.021,0,0.037-0.017,0.037-0.035 + c0-0.021,0-0.557,0-1.195c0-0.637,0.369-0.789,0.818-0.338c0.451,0.449,0.832,0.83,0.844,0.843c0.016,0.015,0.037,0.015,0.051,0 + c0.017-0.013,0.377-0.376,0.808-0.805c0.43-0.429,0.793-0.792,0.805-0.806c0.017-0.014,0.017-0.037,0-0.051 + c-0.012-0.015-0.393-0.395-0.844-0.845c-0.451-0.451-0.297-0.819,0.34-0.819c0.638,0,1.175,0,1.195,0 + c0.02,0,0.034-0.016,0.034-0.037c0-0.019,0-0.531,0-1.138s0-1.12,0-1.139C73.025,45.864,73.01,45.847,72.991,45.847z + M67.877,48.743c-0.969,0-1.756-0.787-1.756-1.755c0-0.97,0.787-1.756,1.756-1.756s1.756,0.786,1.756,1.756 + C69.633,47.956,68.846,48.743,67.877,48.743z"/> - + - - - - - - + + - + - - - + + + diff --git a/public/images/svg/hooks-step-2-01.svg b/public/images/svg/hooks-step-2-01.svg index 1bb67a0f..e75dc516 100644 --- a/public/images/svg/hooks-step-2-01.svg +++ b/public/images/svg/hooks-step-2-01.svg @@ -5,14 +5,16 @@ width="95.5px" height="102.167px" viewBox="0 0 95.5 102.167" enable-background="new 0 0 95.5 102.167" xml:space="preserve"> - - - - - - - - + + + + + + + + + + @@ -20,601 +22,619 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -622,7 +642,11 @@ - 2 + + + diff --git a/public/images/svg/hooks-step-3-01.svg b/public/images/svg/hooks-step-3-01.svg index fd4fb5fb..62f9f37e 100644 --- a/public/images/svg/hooks-step-3-01.svg +++ b/public/images/svg/hooks-step-3-01.svg @@ -7,106 +7,111 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -116,8 +121,14 @@ - - 3 + + + + From 797bf28823796fa052501fe4199a38c2fdf7deb1 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:04:05 +0100 Subject: [PATCH 24/57] new colors --- app/styles/app/layouts/top.sass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index c65e114b..23e6d3f3 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -14,7 +14,7 @@ $top-height: 55px transition: background-color 200ms ease background : inline-image('svg/travis-ci-logo.svg') no-repeat 0 50% &:hover - background : #eaeaea inline-image('svg/travis-ci-logo-hover.svg') no-repeat 50% + background : $cream-light inline-image('svg/travis-ci-logo-hover.svg') no-repeat 50% .burger overflow: auto @@ -37,13 +37,13 @@ $top-height: 55px .topbar font-size: $font-size-m - background-color: #eaebe7 + background-color: #eff0ec color: $grey1 a display: block color: $grey1 - border-bottom: solid 1px #eaebe7 + border-bottom: solid 1px #eff0ec @media #{$small-only} .navigation @@ -112,4 +112,4 @@ $top-height: 55px right: 1rem display: block z-index: 90 - background-color: #eaebe7 + background-color: #eff0ec From 13fc4e83e53598cf900e3e02d275a70425bf485b Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:14:52 +0100 Subject: [PATCH 25/57] fadeout repos descriptions --- app/styles/app/layouts/profile.sass | 16 ++-- app/templates/account.hbs | 125 ++++++++++++++-------------- 2 files changed, 74 insertions(+), 67 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 2dc76f71..50cc0468 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -16,9 +16,9 @@ font-size: $font-size-sm color: #adaaab margin: 2rem 0 1rem 0 - a - color: #adaaab - text-decoration: underline + a + color: #adaaab + text-decoration: underline @media #{$medium-up} h1, .sync-button, .ember-view display: inline-block @@ -114,8 +114,6 @@ p.profile-user-last width: grid-calc(7, 24) @media #{$large-up} width: grid-calc(5, 24) - a - text-decoration: none .switch display: inline-block .profile-settings @@ -130,8 +128,10 @@ p.profile-user-last .profile-repo @extend %border-radius-4px + position: relative width: grid-calc(14, 24) padding: .25em .5em .3em + white-space: nowrap span display: none margin-left: 2rem @@ -139,8 +139,14 @@ p.profile-user-last color: #484849 &:hover background-color: #ededec + &:after + content: "" + @include fadeOut(right, -90deg, #ededec) .active &:hover background-color: #e2eee2 + &:after + content: "" + @include fadeOut(right, -90deg, #e2eee2) @media #{$medium-up} width: grid-calc(17, 24) height: 30px diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 404b862d..556d9cb6 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -24,75 +24,76 @@ {{else}}

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    {{/if}} + -
    - -
      -
    1. -
      - -
      Flick the repository switch on
      -
      +
      + +
        +
      1. +
        + +
        Flick the repository switch on
        +
        +
        2. +
      2. +
        + +
        Add .travis.yml file to your repository
        +
        +
        3. +
      3. +
        + +
        Trigger your first build with a git push
        +
        +
        4. +
      +
      + +
      +
        + {{#each hook in hooks}} +
      • +
        + {{travis-switch action="toggle" target=hook toggleAutomatically="false"}} + {{!-- --}} + {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} +
        + {{#if hook.isSaving}}{{/if}} + {{hook.slug}} + {{hook.description}}
        • -
      • -
        - -
        Add .travis.yml file to your repository
        -
        + {{else}} +
      • + {{#if hooksWithoutAdmin.length}} + Sorry, but we can't find any repositories you have admin access to. + {{else}} + Sorry, it seems like we couldn't find any repositories you have access to on GitHub. + {{/if}}
        • -
      • -
        - -
        Trigger your first build with a git push
        -
        -
        • -
    -
    + {{/each}} + + -
    -
      - {{#each hook in hooks}} -
    • -
      - {{travis-switch action="toggle" target=hook toggleAutomatically="false"}} - {{!-- --}} - {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} -
      - {{#if hook.isSaving}}{{/if}} - {{hook.slug}} - {{hook.description}} -
      • - {{else}} -
    • - {{#if hooksWithoutAdmin.length}} - Sorry, but we can't find any repositories you have admin access to. - {{else}} - Sorry, it seems like we couldn't find any repositories you have access to on GitHub. - {{/if}} -
      • - {{/each}} -
    -
    + {{!-- {{#if hooksWithoutAdmin.length}} +
    +

    Repositories without admin access

    - {{!-- {{#if hooksWithoutAdmin.length}} -
    -

    Repositories without admin access

    +

    + You only have pull or push access to the repositories below. +

    -

    - You only have pull or push access to the repositories below. -

    - -
      - {{#each hook in hooksWithoutAdmin}} -
    • - {{hook.slug}} -

      {{hook.description}}

      -
      • - {{/each}} -
    -
    - {{/if}} --}} +
      + {{#each hook in hooksWithoutAdmin}} +
    • + {{hook.slug}} +

      {{hook.description}}

      +
      • + {{/each}} +
    +
    + {{/if}} --}} {{/if}} {{else}} From 89baf93c62447c12d17fc5b906a26df64ac8eb5f Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:19:01 +0100 Subject: [PATCH 26/57] contrast for the anchors --- app/styles/app/layouts/top.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 23e6d3f3..00275823 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -42,7 +42,7 @@ $top-height: 55px a display: block - color: $grey1 + color: #898989 border-bottom: solid 1px #eff0ec @media #{$small-only} From 1c58ab9a1ff83f877121b5a9ee278776d90939e7 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:26:47 +0100 Subject: [PATCH 27/57] add darker logo --- public/images/svg/travis-ci-logo.svg | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/public/images/svg/travis-ci-logo.svg b/public/images/svg/travis-ci-logo.svg index 0ae350a5..f6631801 100644 --- a/public/images/svg/travis-ci-logo.svg +++ b/public/images/svg/travis-ci-logo.svg @@ -4,25 +4,25 @@ - - - + + - - + + - - - + + From 5ddb4df521fe1ff728387d2765adf3a8e52ee4db Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:58:16 +0100 Subject: [PATCH 28/57] tweak font sizes and stuff --- app/styles/app/components/sync-button.sass | 10 ++++++++++ app/styles/app/layout.sass | 2 ++ app/styles/app/layouts/profile.sass | 8 +++++++- app/templates/account.hbs | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/styles/app/components/sync-button.sass b/app/styles/app/components/sync-button.sass index a3dd009b..900a2bb7 100644 --- a/app/styles/app/components/sync-button.sass +++ b/app/styles/app/components/sync-button.sass @@ -29,6 +29,16 @@ .sync-spinner margin-right: .5em +.profile-main + .sync-button + button + max-width: none + font-size: $font-size-sm + .sync-last + font-size: $font-size-sm + color: #adaaab + margin-left: .8rem + .sync-last display: inline-block margin: 0 diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index dbe3e267..a3ba40f0 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -5,6 +5,8 @@ .main margin: auto max-width: 1024px + padding-left: 0 !important + padding-right: 0 !important .main, .profile-view diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 50cc0468..8b90fb32 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -4,7 +4,6 @@ .profile-main - header h1 margin: 0 1.7rem 0 0 @@ -100,6 +99,12 @@ p.profile-user-last margin-top: .5em +.profile-orglist + @media #{$large-up} + padding-right: 10em + aside + padding: 0 + .profile-hooklist @include resetul font-size: $font-size-m @@ -132,6 +137,7 @@ p.profile-user-last width: grid-calc(14, 24) padding: .25em .5em .3em white-space: nowrap + overflow: hidden span display: none margin-left: 2rem diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 556d9cb6..8597c362 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -14,7 +14,7 @@ {{else}}

    last synced {{format-time user.syncedAt}}

    From 5dc699b49fda12ba06d0e3f0b37d31521a4c380d Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 16:34:00 +0100 Subject: [PATCH 29/57] give repos without permissions some styling, but dont show them yet --- app/templates/account.hbs | 14 ++++++++------ app/templates/profile/accounts.hbs | 2 +- app/templates/profile/show.hbs | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 8597c362..6c4c90b4 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -76,19 +76,21 @@ - {{!-- {{#if hooksWithoutAdmin.length}} +{{!-- {{#if hooksWithoutAdmin.length}}
    -

    Repositories without admin access

    +

    Repositories without admin access

    You only have pull or push access to the repositories below.

    -
      + diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index a3ef8c76..b31d60a3 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -5,7 +5,7 @@
    -

    Justiine Arreche

    +

    Justine Arreche

    Repositories 12

    Token: dfigsd90u34r2hwa9ru239ur2

    diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs index fdb71e78..09994c18 100644 --- a/app/templates/profile/show.hbs +++ b/app/templates/profile/show.hbs @@ -20,7 +20,7 @@ {{!-- {{view 'profile-tabs'}} --}} -
    + {{!--
    --}} {{outlet}} -
    + {{!--
    --}} From 45fbd5a341bd584553592e14ea86b79348205c9e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 17:21:00 +0100 Subject: [PATCH 30/57] bring back some navigation points --- app/styles/app/layouts/top.sass | 23 ++++++++++--------- app/templates/top.hbs | 40 ++++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 00275823..e157e017 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -61,7 +61,7 @@ $top-height: 55px .navigation-handle position: relative margin: 0 - + .navigation--profile img border-radius: 50%; @@ -70,10 +70,11 @@ $top-height: 55px margin-left: 1rem; transform: translateY(-0.1rem); + .navigation-sub + position: relative @media #{$medium-up} height: $top-height - // padding: 0 0 0 1rem .navigation height: $top-height @@ -96,20 +97,20 @@ $top-height: 55px .navigation-nested display: none + position: absolute + top: $top-height + left: -1em + z-index: 90 + background-color: #eff0ec a height: 35px line-height: 35px padding: 0 2em + white-space: nowrap &:hover text-decoration: none background-color: $cream-light - .navigation--profile.signed-in - .navigation-handle:hover + .navigation-nested, - .navigation-nested:hover - position: absolute - top: $top-height - right: 1rem - display: block - z-index: 90 - background-color: #eff0ec + .navigation-handle:hover + .navigation-nested, + .navigation-nested:hover + display: block diff --git a/app/templates/top.hbs b/app/templates/top.hbs index 497de5d8..f9193e2c 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -6,13 +6,43 @@ \ No newline at end of file From aa9f2262992cfb7be16773d4f66f4ed941ba6f34 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 11:17:46 +0100 Subject: [PATCH 32/57] try to mark user accoutn --- app/templates/profile/accounts.hbs | 4 ++++ app/views/accounts-list.coffee | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index b31d60a3..cb270984 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -14,6 +14,10 @@

    Organizations

    {{#collection "accounts-list" contentBinding="controller"}} + + {{#if view.account.type == user}} + hello user + {{/if}} {{#link-to "account" view.account class="name"}}
    diff --git a/app/views/accounts-list.coffee b/app/views/accounts-list.coffee index 20871935..1440a5f2 100644 --- a/app/views/accounts-list.coffee +++ b/app/views/accounts-list.coffee @@ -21,6 +21,10 @@ View = Ember.CollectionView.extend @get('content.name') || @get('content.login') ).property('content.login', 'content.name') + isUser: (-> + @get('content.type') + ).property('content.type') + urlAccount: (-> accountUrl(@get('account.login')) ).property('account.login') From 20471649ef10f8351550398d8106b9b1938719be Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 11:21:14 +0100 Subject: [PATCH 33/57] use same help dropdown for org and com --- app/templates/top.hbs | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/app/templates/top.hbs b/app/templates/top.hbs index 7e9bc7f9..741760d1 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -6,26 +6,23 @@
    -

    Justine Arreche

    -

    Repositories 12

    -

    Token: dfigsd90u34r2hwa9ru239ur2

    +

    {{userName}}

    +

    Repositories {{user.reposCount}}

    +

    Token: {{user.token}}

    Organizations

    - {{#collection "accounts-list" contentBinding="controller"}} + {{#collection "accounts-list" contentBinding="organizations"}} {{#link-to "account" view.account class="name"}}
    From c2c5e7ff5cf28280080d63f2c9cf9b4f260d7bc3 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 25 Mar 2015 11:46:23 +0100 Subject: [PATCH 36/57] Use token from currentUser on profile accounts list --- app/templates/profile/accounts.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index fbf46e11..e35f69d3 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -7,7 +7,7 @@

    {{userName}}

    Repositories {{user.reposCount}}

    -

    Token: {{user.token}}

    +

    Token: {{auth.currentUser.token}}

    From dfbd57cacdbca79c826d0e1b2fb723da296f3473 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 13:03:56 +0100 Subject: [PATCH 37/57] remove my shot at seperate user account --- app/views/accounts-list.coffee | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/accounts-list.coffee b/app/views/accounts-list.coffee index 1440a5f2..20871935 100644 --- a/app/views/accounts-list.coffee +++ b/app/views/accounts-list.coffee @@ -21,10 +21,6 @@ View = Ember.CollectionView.extend @get('content.name') || @get('content.login') ).property('content.login', 'content.name') - isUser: (-> - @get('content.type') - ).property('content.type') - urlAccount: (-> accountUrl(@get('account.login')) ).property('account.login') From 6e2887b868c00cbcb3faabfe5d17a24fcfddcc91 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 14:31:41 +0100 Subject: [PATCH 38/57] fix weird things after topbar merge --- app/styles/app/layout.sass | 2 ++ app/styles/app/layouts/top.sass | 2 ++ app/templates/layouts/profile.hbs | 9 +++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index a3ba40f0..e75034fb 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -7,6 +7,8 @@ max-width: 1024px padding-left: 0 !important padding-right: 0 !important + padding-top: 30px !important + .main, .profile-view diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 2fc8f5a1..0137157f 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -15,6 +15,8 @@ $top-height: 55px background : inline-image('svg/travis-ci-logo.svg') no-repeat 0 50% &:hover background : $cream-light inline-image('svg/travis-ci-logo-hover.svg') no-repeat 50% + .centered & + margin-left: 0 .burger overflow: auto diff --git a/app/templates/layouts/profile.hbs b/app/templates/layouts/profile.hbs index e93c3cd4..9b6bd508 100644 --- a/app/templates/layouts/profile.hbs +++ b/app/templates/layouts/profile.hbs @@ -1,10 +1,11 @@ -
    -
    +
    +
    {{render "top"}} -
    +
    + +
    {{render "flash"}} -
    {{yield}} From e82abcc1d7a55c92ad870b308e26cf21071f82c8 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 14:41:57 +0100 Subject: [PATCH 39/57] add user gravatar --- app/templates/profile/accounts.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index e35f69d3..178db733 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -2,7 +2,8 @@
    - + +

    {{userName}}

    From d32a121ba28612520cc9ecd7b4ffa92a663c5ef6 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 14:50:33 +0100 Subject: [PATCH 40/57] show repos without access rights and improvised styles --- app/templates/account.hbs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 6c4c90b4..bf6a6b7c 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -67,23 +67,19 @@ {{else}}
  • {{#if hooksWithoutAdmin.length}} - Sorry, but we can't find any repositories you have admin access to. +

    Sorry, but we can't find any repositories you have admin access to.

    {{else}} - Sorry, it seems like we couldn't find any repositories you have access to on GitHub. +

    Sorry, it seems like we couldn't find any repositories you have access to on GitHub.

    {{/if}}
    • {{/each}}
    -{{!-- {{#if hooksWithoutAdmin.length}} + {{#if hooksWithoutAdmin.length}}

    Repositories without admin access

    -

    - You only have pull or push access to the repositories below. -

    -
      {{#each hook in hooksWithoutAdmin}}
    • @@ -95,7 +91,7 @@ {{/each}}
    - {{/if}} --}} + {{/if}} {{/if}} {{else}} From 51477b69387aff3e3d293398416d9b3b2e4033c9 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 14:55:27 +0100 Subject: [PATCH 41/57] fix font-size on user profile --- app/styles/app/layouts/top.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 0137157f..d4df65c5 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -47,6 +47,7 @@ $top-height: 55px color: #898989 border-bottom: solid 1px #eff0ec padding: 0 .2em + font-size: $font-size-m @media #{$small-only} .navigation From 6a3a70bfe241bd5499fe12ba5f02fd47b81864bc Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 15:00:53 +0100 Subject: [PATCH 42/57] hide closing icon, make avatars a bit larger --- app/styles/app/layouts/profile.sass | 4 ++-- app/templates/account.hbs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 8b90fb32..81660f09 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -61,8 +61,8 @@ .media-elem width: 12% img - width: 2rem - height: 2rem + width: 2.2rem + height: 2.2rem border-radius: 50% .media-body width: 88% diff --git a/app/templates/account.hbs b/app/templates/account.hbs index bf6a6b7c..39a7168b 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -14,7 +14,7 @@ {{else}}

    last synced {{format-time user.syncedAt}}

    @@ -28,7 +28,7 @@
    - + {{!-- --}}
    1. From d2a7e8bff14861b83a691610dcf0b0db0d80023e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 15:16:35 +0100 Subject: [PATCH 43/57] bigger avatars, disabled switches --- app/styles/app/layouts/profile.sass | 8 ++++---- app/styles/app/modules/switch.sass | 12 ++++++++++++ app/templates/account.hbs | 13 ++++++++----- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 81660f09..5335c4f5 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -59,13 +59,13 @@ .profile-user .media-elem - width: 12% + width: 14% img - width: 2.2rem - height: 2.2rem + width: 2.4rem + height: 2.4rem border-radius: 50% .media-body - width: 88% + width: 86% p margin: 0 ul diff --git a/app/styles/app/modules/switch.sass b/app/styles/app/modules/switch.sass index 6f85298f..fb3857e0 100644 --- a/app/styles/app/modules/switch.sass +++ b/app/styles/app/modules/switch.sass @@ -34,3 +34,15 @@ $switch-inner-width: 27px right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) background-color: #39a85b @extend .icon-hook-on + + &.disabled + cursor: default + pointer-events: none + opacity: .5 + + .active &.disabled + background-color: #b6d5b6 + &:after + right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) + background-color: #39a85b + @extend .icon-hook-on diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 39a7168b..346554bc 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -20,9 +20,9 @@
    {{#if config.pro}} -

    We're only showing you private repositories. You can find your public projects on travis-ci.org.

    +

    We're only showing your private repositories. You can find your public projects on travis-ci.org.

    {{else}} -

    We're only showing you public repositories. You can find your private projects on travis-ci.com.

    +

    We're only showing your public repositories. You can find your private projects on travis-ci.com.

    {{/if}} @@ -67,9 +67,9 @@ {{else}}
  • {{#if hooksWithoutAdmin.length}} -

    Sorry, but we can't find any repositories you have admin access to.

    + Sorry, but we can't find any repositories you have admin access to. {{else}} -

    Sorry, it seems like we couldn't find any repositories you have access to on GitHub.

    + Sorry, it seems like we couldn't find any repositories you have access to on GitHub. {{/if}}
    • {{/each}} @@ -78,11 +78,14 @@ {{#if hooksWithoutAdmin.length}}
    -

    Repositories without admin access

    +

    You require admin rights to enable these repositories

    - + {{#if config.billingEndpoint}} +
    + {{#if view.subscribed}} + + Subscription active! + + {{else}} + {{#if view.education}} + + Educational account! + + {{else}} + + Sign up this account! + + {{/if}} + {{/if}} +
    + {{/if}} {{#if config.pro}}

    We're only showing your private repositories. You can find your public projects on travis-ci.org.

    {{else}} diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs index 09994c18..e14bec3b 100644 --- a/app/templates/profile/show.hbs +++ b/app/templates/profile/show.hbs @@ -1,22 +1,24 @@
    - {{#if config.billingEndpoint}} - {{#if view.subscribed}} - - Subscription active! - - {{else}} - {{#if view.education}} - - Educational account! +{{!-- {{#if config.billingEndpoint}} +
    + {{#if view.subscribed}} + + Subscription active! {{else}} - - Sign up this account! - + {{#if view.education}} + + Educational account! + + {{else}} + + Sign up this account! + + {{/if}} {{/if}} - {{/if}} - {{/if}} +
    + {{/if}} --}} {{!-- {{view 'profile-tabs'}} --}} From 76ac33a28590e75fd5bcc16ba6395bf90dda1bb5 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 16:09:15 +0100 Subject: [PATCH 47/57] add settings hover in teal --- app/styles/app/modules/icons.sass | 2 ++ public/images/svg/settings_teal.svg | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 public/images/svg/settings_teal.svg diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 131bd5fa..1b2ccfab 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -40,6 +40,8 @@ .icon-cog, .icon--cog background-image: inline-image('svg/settings_gray.svg') + &:hover + background-image: inline-image('svg/settings_teal.svg') .icon-star background-image: inline-image('dashboard/star-off.svg') diff --git a/public/images/svg/settings_teal.svg b/public/images/svg/settings_teal.svg new file mode 100644 index 00000000..d5c51853 --- /dev/null +++ b/public/images/svg/settings_teal.svg @@ -0,0 +1,27 @@ + + + + + + + + + + From d3bf48a415bc52d89729c38cd5b35341ef26afd7 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 16:32:22 +0100 Subject: [PATCH 48/57] fadeout long org titles --- app/styles/app/layouts/profile.sass | 10 +++++++++- app/templates/account.hbs | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 22576048..0469997e 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -19,11 +19,19 @@ color: #adaaab text-decoration: underline @media #{$medium-up} - h1, .sync-button, .ember-view + .profile-header, .sync-button, .ember-view display: inline-block vertical-align: middle .sync-button margin-top: .5em + @media #{$large-up} + .profile-header + position: relative + white-space: nowrap; + max-width: 77%; + overflow: hidden; + &:after + @include fadeOut(right, -90deg, $white) .cta-btn text-align: right diff --git a/app/templates/account.hbs b/app/templates/account.hbs index c2f920e0..aae21892 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -1,8 +1,9 @@ {{#if allHooks.isLoaded}}
    +

    {{view.name}}

    - {{!-- {{sync-button user=auth.currentUser}} --}} +
    {{#if user.isSyncing}}
    From a731028dfad8077517f1db2ea5d071ca5bf00502 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 25 Mar 2015 16:35:55 +0100 Subject: [PATCH 49/57] Add avatars on accounts list --- app/models/account.coffee | 1 + app/templates/profile/accounts.hbs | 2 +- app/views/accounts-list.coffee | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/account.coffee b/app/models/account.coffee index 8f371962..5ace3ea6 100644 --- a/app/models/account.coffee +++ b/app/models/account.coffee @@ -4,6 +4,7 @@ Account = Model.extend name: DS.attr() type: DS.attr() + avatarUrl: DS.attr() reposCount: DS.attr('number') subscribed: DS.attr('boolean') education: DS.attr('boolean') diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index 5496e68c..9038b2ad 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -19,7 +19,7 @@ {{#link-to "account" view.account class="name"}}
    - +

    {{view.name}}

    diff --git a/app/views/accounts-list.coffee b/app/views/accounts-list.coffee index 20871935..1a628a46 100644 --- a/app/views/accounts-list.coffee +++ b/app/views/accounts-list.coffee @@ -25,6 +25,10 @@ View = Ember.CollectionView.extend accountUrl(@get('account.login')) ).property('account.login') + avatarUrl: (-> + @get('account.avatarUrl') || "//placehold.it/50x50" + ).property('account.avatarUrl') + click: -> @get('controller').transitionToRoute("account", @get('account.login')) From a9ad4fb70ace8b18140e335f94dad7e37498f103 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 17:17:54 +0100 Subject: [PATCH 50/57] swap old loader for new one --- app/styles/app/layouts/profile.sass | 4 +++- app/templates/account.hbs | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 0469997e..2c0e5a54 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -153,11 +153,13 @@ p.profile-user-last padding: .25em .5em .3em white-space: nowrap overflow: hidden - span + span:not(.sync-spinner) display: none margin-left: 2rem font-size: $font-size-sm color: #484849 + .sync-spinner + vertical-align: top &:hover background-color: #ededec &:after diff --git a/app/templates/account.hbs b/app/templates/account.hbs index aae21892..82b7c163 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -79,8 +79,11 @@ {{!-- --}} {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}}
    - {{#if hook.isSaving}}{{/if}} - {{hook.slug}} + + {{#if hook.isSaving}} + + {{/if}} + {{hook.slug}} {{hook.description}} {{else}} From 125f230ea1effda174054566b3a7fcc920a57d91 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 17:50:52 +0100 Subject: [PATCH 51/57] fix switches --- app/styles/app.scss | 2 +- app/styles/app/modules/switch.sass | 92 ++++++++++++---------- app/templates/components/travis-switch.hbs | 7 ++ 3 files changed, 58 insertions(+), 43 deletions(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index 8aa8626b..529bdc2f 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -37,7 +37,7 @@ // @import "app/tabs"; @import "app/tipsy"; -// @import "app/components/travis-switch"; +@import "app/components/travis-switch"; @import "app/components/sync-button"; @import "app/modules/section"; diff --git a/app/styles/app/modules/switch.sass b/app/styles/app/modules/switch.sass index fb3857e0..cef71fc7 100644 --- a/app/styles/app/modules/switch.sass +++ b/app/styles/app/modules/switch.sass @@ -1,48 +1,56 @@ -$switch-height: 28px -$switch-inner-height: 22px -$switch-width: 62px -$switch-inner-width: 27px +.profile-main -.switch - position: relative - width: $switch-width - height: $switch-height - background-color: #d1d1d1 - border: none - cursor: pointer - @extend %border-radius-4px - &:after - content: "" - display: block - position: absolute - top: ($switch-height - $switch-inner-height) / 2 - right: ($switch-width - ($switch-inner-width * 2)) / 2 - height: $switch-inner-height - width: $switch-inner-width - background-color: #919191 - background-repeat: no-repeat - background-size: 14px 14px - background-position: 6px - transition: right 200ms ease - @extend .icon-hook-off + $switch-height: 28px + $switch-inner-height: 22px + $switch-width: 62px + $switch-inner-width: 27px + + span + display: none + + .switch + box-sizing: border-box + position: relative + width: $switch-width + height: $switch-height + background-color: #d1d1d1 + border: none + cursor: pointer @extend %border-radius-4px - - &.active - background-color: #b6d5b6 + &:before + content: none &:after - right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) - background-color: #39a85b - @extend .icon-hook-on + content: "" + display: block + position: absolute + top: ($switch-height - $switch-inner-height) / 2 + right: ($switch-width - ($switch-inner-width * 2)) / 2 + height: $switch-inner-height + width: $switch-inner-width + background-color: #919191 + background-repeat: no-repeat + background-size: 14px 14px + background-position: 6px + transition: right 200ms ease + @extend .icon-hook-off + @extend %border-radius-4px - &.disabled - cursor: default - pointer-events: none - opacity: .5 + &.active + background-color: #b6d5b6 + &:after + right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) + background-color: #39a85b + @extend .icon-hook-on - .active &.disabled - background-color: #b6d5b6 - &:after - right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) - background-color: #39a85b - @extend .icon-hook-on + &.disabled + cursor: default + pointer-events: none + opacity: .5 + + .active &.disabled + background-color: #b6d5b6 + &:after + right: $switch-width - $switch-inner-width - (($switch-width - ($switch-inner-width * 2)) / 2) + background-color: #39a85b + @extend .icon-hook-on diff --git a/app/templates/components/travis-switch.hbs b/app/templates/components/travis-switch.hbs index e69de29b..c82e3447 100644 --- a/app/templates/components/travis-switch.hbs +++ b/app/templates/components/travis-switch.hbs @@ -0,0 +1,7 @@ + + + ON + + + OFF + \ No newline at end of file From 5e66504b4d50844f1e138d1be3faacc034f1b453 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 17:53:57 +0100 Subject: [PATCH 52/57] fix tabs --- app/styles/app.scss | 2 +- app/styles/app/tabs.sass | 110 +++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index 529bdc2f..3403db9e 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -34,7 +34,7 @@ // @import "app/right/sponsors"; // @import "app/right"; @import "app/settings"; -// @import "app/tabs"; +@import "app/tabs"; @import "app/tipsy"; @import "app/components/travis-switch"; diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass index 37d04e95..9990abe7 100644 --- a/app/styles/app/tabs.sass +++ b/app/styles/app/tabs.sass @@ -4,73 +4,73 @@ */ -.tabs - @include resetul - li - height: 28px - vertical-align: top - background-color: $tab-nav-inactive-bg - border-radius: 4px 4px 0px 0px - padding: 0 12px 0 12px - margin-right: 10px - white-space: nowrap - cursor: pointer - @media #{$medium-up} - height: 29px - li - display: inline-block - &:hover - background-color: $tab-nav-inactive-bg-hover +// .tabs +// @include resetul +// li +// height: 28px +// vertical-align: top +// background-color: $tab-nav-inactive-bg +// border-radius: 4px 4px 0px 0px +// padding: 0 12px 0 12px +// margin-right: 10px +// white-space: nowrap +// cursor: pointer +// @media #{$medium-up} +// height: 29px +// li +// display: inline-block +// &:hover +// background-color: $tab-nav-inactive-bg-hover - .active - background-color: $color-bg-tab-active - border-bottom-color: $color-bg-tab-active +// .active +// background-color: $color-bg-tab-active +// border-bottom-color: $color-bg-tab-active - a - color: $color-text - font-weight: 600 +// a +// color: $color-text +// font-weight: 600 - h5 - margin: 0 - font-size: $font-size-small - font-weight: normal - line-height: 30px - text-align: center +// h5 +// margin: 0 +// font-size: $font-size-small +// font-weight: normal +// line-height: 30px +// text-align: center - a - display: block - color: #a8a9ab +// a +// display: block +// color: #a8a9ab -#left +// #left - .tabs - margin: -28px 20px 0 15px +// .tabs +// margin: -28px 20px 0 15px - #tab_search:not(.active) - display: none +// #tab_search:not(.active) +// display: none - #tab_recent.hidden - display: none +// #tab_recent.hidden +// display: none - #tab_owned - display: none - #tab_owned.display - display: inline-block - #tab_new - display: none - height: 25px - width: 26px - margin-top: 3px - float: right - margin-right: 0 - padding: 0 5px 0 5px +// #tab_owned +// display: none +// #tab_owned.display +// display: inline-block +// #tab_new +// display: none +// height: 25px +// width: 26px +// margin-top: 3px +// float: right +// margin-right: 0 +// padding: 0 5px 0 5px - h5 - line-height: 25px +// h5 +// line-height: 25px - #tab_new.display - display: inline-block +// #tab_new.display +// display: inline-block #main .tabs From 32bdc69e9432d0d35e1c3f6096ba385c0540ce08 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 25 Mar 2015 17:58:23 +0100 Subject: [PATCH 53/57] differ between cog icons --- app/styles/app/modules/dropdown.sass | 2 +- app/styles/app/modules/icons.sass | 3 +++ app/templates/repos/show/tools.hbs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass index c4c0a6a6..10fa393f 100644 --- a/app/styles/app/modules/dropdown.sass +++ b/app/styles/app/modules/dropdown.sass @@ -101,7 +101,7 @@ $dropdown-border: #C3D9DB &:hover, &:focus background-color: lighten($grey, 10) - .icon--cog + .icon-cog-light position: relative top: 0.15em left: -0.2em diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 1b2ccfab..c13230aa 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -43,6 +43,9 @@ &:hover background-image: inline-image('svg/settings_teal.svg') +.icon-cog-light + background-image: inline-image('icons/settings.svg') + .icon-star background-image: inline-image('dashboard/star-off.svg') diff --git a/app/templates/repos/show/tools.hbs b/app/templates/repos/show/tools.hbs index 9b990fdb..e3a35d73 100644 --- a/app/templates/repos/show/tools.hbs +++ b/app/templates/repos/show/tools.hbs @@ -1,5 +1,5 @@
    - Settings + Settings
      {{#if view.displaySettingsLink}}
    • From 9133555efd5657142cbc10ee20fa5117640a77f5 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 27 Mar 2015 08:48:49 +0100 Subject: [PATCH 54/57] Add fallback for setting title in account --- app/routes/account.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/routes/account.coffee b/app/routes/account.coffee index 884e8509..3a440e03 100644 --- a/app/routes/account.coffee +++ b/app/routes/account.coffee @@ -2,7 +2,10 @@ Route = TravisRoute.extend titleToken: (model) -> - model.get('name') || model.get('login') + if model + model.get('name') || model.get('login') + else + 'Account' setupController: (controller, account) -> @_super.apply this, arguments From 74d141525825029791ab2f8d35aa91a5f7158e20 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 27 Mar 2015 09:06:29 +0100 Subject: [PATCH 55/57] Set model on accounts controller for backwards compat --- app/routes/accounts.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/routes/accounts.coffee b/app/routes/accounts.coffee index f5ea8793..127fbb41 100644 --- a/app/routes/accounts.coffee +++ b/app/routes/accounts.coffee @@ -11,6 +11,8 @@ Route = TravisRoute.extend controller.set('user', user) controller.set('organizations', orgs) + controller.set('model', model) + renderTemplate: -> @_super.apply(this, arguments) @render 'profile_accounts', outlet: 'left', into: 'profile' From 54cd5079a8609b1d036f991a26248bbcfc0008c5 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 27 Mar 2015 15:28:59 +0100 Subject: [PATCH 56/57] Plug billingUrl properly --- app/controllers/account.coffee | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/account.coffee b/app/controllers/account.coffee index c4c5af45..f060c8da 100644 --- a/app/controllers/account.coffee +++ b/app/controllers/account.coffee @@ -47,4 +47,9 @@ Controller = Ember.ObjectController.extend @config.show_repos_hint == 'public' ) .property() + billingUrl: (-> + id = if @get('model.type') == 'user' then 'user' else @get('model.login') + "#{@get('config').billingEndpoint}/subscriptions/#{id}" + ).property('model.login', 'model.type') + `export default Controller` From f02d683892364ca81b71d9f778953021a2463490 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 30 Mar 2015 10:00:16 +0200 Subject: [PATCH 57/57] Show Gemfile on jobs matrix --- app/components/jobs-item.coffee | 11 ++++++ app/templates/components/jobs-item.hbs | 4 +-- tests/unit/components/jobs-item-test.coffee | 37 +++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/app/components/jobs-item.coffee b/app/components/jobs-item.coffee index ca085418..d2a60524 100644 --- a/app/components/jobs-item.coffee +++ b/app/components/jobs-item.coffee @@ -15,7 +15,18 @@ JobsItemComponent = Ember.Component.extend if version = config[key] output.push(languageName + ': ' + version) + gemfile = @get('job.config.gemfile') + if gemfile && @get('job.config.env') + output.push "Gemfile: #{gemfile}" + output.join(' ') ).property('job.config') + environment: (-> + if env = @get('job.config.env') + env + else if gemfile = @get('job.config.gemfile') + "Gemfile: #{gemfile}" + ).property('job.config.env', 'job.config.gemfile') + `export default JobsItemComponent` diff --git a/app/templates/components/jobs-item.hbs b/app/templates/components/jobs-item.hbs index e6ec8359..cb4aaf2d 100644 --- a/app/templates/components/jobs-item.hbs +++ b/app/templates/components/jobs-item.hbs @@ -25,10 +25,10 @@ {{/if}}
      - {{#if job.config.env}} + {{#if environment}}

      - {{job.config.env}} + {{environment}}

      {{else}}

      diff --git a/tests/unit/components/jobs-item-test.coffee b/tests/unit/components/jobs-item-test.coffee index 31f0e9aa..39e91d80 100644 --- a/tests/unit/components/jobs-item-test.coffee +++ b/tests/unit/components/jobs-item-test.coffee @@ -37,3 +37,40 @@ test 'ouputs info on not set properties', -> ok component.$('.job-env').text().match(/no environment variables set/), 'a message for no env vars should be displayed' ok component.$('.job-lang').text().match(/no language set/), 'a message about no language being set should be displayed' + +test 'when env is not set, gemfile is displayed in the env section', -> + attributes = { + id: 10 + state: 'passed' + number: '2' + config: { + rvm: '2.1.2' + gemfile: 'foo/Gemfile' + }, + duration: 100 + } + job = Ember.Object.create(attributes) + component = @subject(job: job) + @append() + + equal component.$('.job-lang').text().trim(), 'Ruby: 2.1.2', 'langauges list should be displayed' + equal component.$('.job-env').text().trim(), 'Gemfile: foo/Gemfile', 'env should be displayed' + +test 'when env is set, gemfile is displayed in the language section', -> + attributes = { + id: 10 + state: 'passed' + number: '2' + config: { + rvm: '2.1.2' + gemfile: 'foo/Gemfile' + env: 'FOO=bar' + }, + duration: 100 + } + job = Ember.Object.create(attributes) + component = @subject(job: job) + @append() + + equal component.$('.job-lang').text().trim(), 'Ruby: 2.1.2 Gemfile: foo/Gemfile', 'Gemfile should be displayed in languages section' + equal component.$('.job-env').text().trim(), 'FOO=bar', 'env should be displayed'