From ac05a6d19aa843614e6a1831bef35ea0c275626c Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 1 Apr 2015 11:59:20 +0200 Subject: [PATCH 1/2] Fix cog icon on profile page --- app/styles/app/components/sync-button.sass | 3 +-- app/styles/app/layouts/profile.sass | 6 ++++++ app/templates/account.hbs | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/styles/app/components/sync-button.sass b/app/styles/app/components/sync-button.sass index 900a2bb7..1e43cc0e 100644 --- a/app/styles/app/components/sync-button.sass +++ b/app/styles/app/components/sync-button.sass @@ -1,4 +1,3 @@ - .sync-button padding: 0.8em 0 button @@ -76,4 +75,4 @@ .spinner-container text-align: center - padding: 1.5em 1em \ No newline at end of file + padding: 1.5em 1em diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 2c0e5a54..6f526d65 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -146,6 +146,12 @@ p.profile-user-last width: 14px height: 14px +.profile-hooklist .sync-spinner + display: inline !important + +.profile-settings span + display: inline-block !important + .profile-repo @extend %border-radius-4px position: relative diff --git a/app/templates/account.hbs b/app/templates/account.hbs index 82b7c163..4098d42d 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -77,12 +77,13 @@
{{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}} + {{else}} + {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} {{/if}} + + {{hook.slug}} {{hook.description}} From 5b49f62630d8809aabb220741bce58b285da600e Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 2 Apr 2015 10:11:33 +0200 Subject: [PATCH 2/2] Fix 404 error page --- app/styles/app/layouts/error.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/app/layouts/error.sass b/app/styles/app/layouts/error.sass index 565c890e..ab8c6f0d 100644 --- a/app/styles/app/layouts/error.sass +++ b/app/styles/app/layouts/error.sass @@ -10,6 +10,10 @@ size: $size position: $pos +.application, .application > .error, .application > .error > .main + min-height: 100vh + + .error, .maintenance height: 100%