From 3aa3dd5e009f3bbc7850088f8dd7f49f43adc40e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Mar 2015 15:01:18 +0100 Subject: [PATCH] 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 + + + +