diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index b34f80f2..f5394b08 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -128,12 +128,12 @@ p.profile-user-last clear: both margin-bottom: .8em overflow: auto - > div - width: grid-calc(10, 24) - @media #{$medium-up} - width: grid-calc(7, 24) - @media #{$large-up} - width: grid-calc(5, 24) + .profile-hooks + 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 @@ -194,4 +194,22 @@ p.profile-user-last line-height: $line-height-m a color: #adaaab - text-decoration: underline \ No newline at end of file + text-decoration: underline + +.error + width: 100%; + padding: 0 $column-gutter/2; + p + position: relative + padding: $column-gutter/2; + color: #de4248 + background-color: #f1b6ad + &:after + content: "" + position: absolute + top: -0.5em + left: 1.5em + width: 1.2em + height: 1.2em + background: #f1b6ad + transform: rotate(45deg) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 76a79f94..30026455 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -1,47 +1,47 @@ {{#if allHooks.isLoaded}}
-
-

{{view.name}}

-
+
+

{{view.name}}

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

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

-
- {{#if config.billingEndpoint}} -
- {{#if view.subscribed}} - - Subscription active! - - {{else}} - {{#if view.education}} + {{#if user.isSyncing}} +
+ +
+ {{else}} +
+ +

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

+
+ {{#if config.billingEndpoint}} +
+ {{#if view.subscribed}} - Educational account! + Subscription active! {{else}} - - Sign up this account! - + {{#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}} +

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

{{/if}} -
- {{/if}} - {{#if config.pro}} -

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

- {{else}} -

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

{{/if}} @@ -86,26 +86,26 @@ - {{#if hooksWithoutAdmin.length}} -
-

You require admin rights to enable these repositories

+ {{#if hooksWithoutAdmin.length}} +
+

You require admin rights to enable these repositories

- -
- {{/if}} + +
{{/if}} + {{else}} {{/if}} diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs index 98480303..4a1e485c 100644 --- a/app/templates/components/hooks-list-item.hbs +++ b/app/templates/components/hooks-list-item.hbs @@ -1,4 +1,4 @@ -
+
{{hook-switch hook=hook onToggleError="handleToggleError"}} {{!-- --}} {{#if hook.isSaving}} @@ -13,6 +13,6 @@ {{#if errorMessage}}
- {{errorMessage}} +

{{errorMessage}}

{{/if}}