suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic error message styling and fix {{#if}} nesting in accounts

Browse Source
This commit is contained in:
Lisa Passing 2015-04-22 15:23:31 +02:00
parent 249003d2ff
commit 3703194709
3 changed files with 80 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/styles/app/layouts/profile.sass
View File

@ -128,12 +128,12 @@ p.profile-user-last
clear: both clear: both
margin-bottom: .8em margin-bottom: .8em
overflow: auto overflow: auto
> div .profile-hooks
width: grid-calc(10, 24) width: grid-calc(10, 24)
@media #{$medium-up} @media #{$medium-up}
width: grid-calc(7, 24) width: grid-calc(7, 24)
@media #{$large-up} @media #{$large-up}
width: grid-calc(5, 24) width: grid-calc(5, 24)
.switch .switch
display: inline-block display: inline-block
.profile-settings .profile-settings
@ -194,4 +194,22 @@ p.profile-user-last
line-height: $line-height-m line-height: $line-height-m
a a
color: #adaaab color: #adaaab
text-decoration: underline 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)

106
app/templates/account.hbs
View File

@ -1,47 +1,47 @@
{{#if allHooks.isLoaded}} {{#if allHooks.isLoaded}}
<header> <header>
<div class="profile-header"> <div class="profile-header">
<h1>{{view.name}}</h1> <h1>{{view.name}}</h1>
</div> </div>
{{#if user.isSyncing}} {{#if user.isSyncing}}
<div class="sync-button"> <div class="sync-button">
<button class="button is-syncing"> <button class="button is-syncing">
<span class="sync-spinner"><i></i><i></i><i></i></span>Syncing from GitHub <span class="sync-spinner"><i></i><i></i><i></i></span>Syncing from GitHub
</button> </button>
</div> </div>
</header> {{else}}
{{else}} <div class="sync-button">
<div class="sync-button"> <button {{action sync}} class="button">
<button {{action sync}} class="button"> <span class="icon icon-sync"></span>Sync
<span class="icon icon-sync"></span>Sync </button>
</button> <p class="sync-last">last synced {{format-time user.syncedAt}}</p>
<p class="sync-last">last synced {{format-time user.syncedAt}}</p> </div>
</div> {{#if config.billingEndpoint}}
{{#if config.billingEndpoint}} <div class="cta-btn">
<div class="cta-btn"> {{#if view.subscribed}}
{{#if view.subscribed}}
<a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
Subscription active!
</a>
{{else}}
{{#if view.education}}
<a class="btn btn-activated" {{bind-attr href="billingUrl"}}> <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
Educational account! Subscription active!
</a> </a>
{{else}} {{else}}
<a class="btn btn-activate" {{bind-attr href="billingUrl"}}> {{#if view.education}}
Sign up this account! <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
</a> Educational account!
</a>
{{else}}
<a class="btn btn-activate" {{bind-attr href="billingUrl"}}>
Sign up this account!
</a>
{{/if}}
{{/if}} {{/if}}
</div>
{{/if}}
{{#if config.pro}}
<p>We're only showing your private repositories. You can find your public projects on <a href="https://travis-ci.org" title="travis-ci.org">travis-ci.org</a>.</p>
{{else}}
<p>We're only showing your public repositories. You can find your private projects on <a href="https://travis-ci.com" title="travis-ci.com">travis-ci.com</a>.</p>
{{/if}} {{/if}}
</div>
{{/if}}
{{#if config.pro}}
<p>We're only showing your private repositories. You can find your public projects on <a href="https://travis-ci.org" title="travis-ci.org">travis-ci.org</a>.</p>
{{else}}
<p>We're only showing your public repositories. You can find your private projects on <a href="https://travis-ci.com" title="travis-ci.com">travis-ci.com</a>.</p>
{{/if}} {{/if}}
</header> </header>
@ -86,26 +86,26 @@
</ul> </ul>
</div> </div>
{{#if hooksWithoutAdmin.length}} {{#if hooksWithoutAdmin.length}}
<div id="unadministerable-hooks"> <div id="unadministerable-hooks">
<p>You require admin rights to enable these repositories</p> <p>You require admin rights to enable these repositories</p>
<ul class="profile-hooklist"> <ul class="profile-hooklist">
{{#each hook in hooksWithoutAdmin}} {{#each hook in hooksWithoutAdmin}}
<li {{bind-attr class="hook.active:active :row"}}> <li {{bind-attr class="hook.active:active :row"}}>
<div class="columns"> <div class="columns">
<button class="switch disabled"></button> <button class="switch disabled"></button>
</div> </div>
<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns"> <a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
{{hook.slug}} {{hook.slug}}
<span>{{hook.description}}</span> <span>{{hook.description}}</span>
</a> </a>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
</div> </div>
{{/if}}
{{/if}} {{/if}}
{{else}} {{else}}
<span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span> <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
{{/if}} {{/if}}

4
app/templates/components/hooks-list-item.hbs
View File

@ -1,4 +1,4 @@
<div class="columns"> <div class="profile-hooks columns">
{{hook-switch hook=hook onToggleError="handleToggleError"}} {{hook-switch hook=hook onToggleError="handleToggleError"}}
{{!-- <button class="switch is-on"></button> --}} {{!-- <button class="switch is-on"></button> --}}
{{#if hook.isSaving}} {{#if hook.isSaving}}
@ -13,6 +13,6 @@
{{#if errorMessage}} {{#if errorMessage}}
<div class="error"> <div class="error">
{{errorMessage}} <p>{{errorMessage}}</p>
</div> </div>
{{/if}} {{/if}}