refactor and clean profile templates and styles

This commit is contained in:
Lisa Passing 2015-06-30 13:28:45 +02:00
parent e42a4088e7
commit f262ae15f5
4 changed files with 25 additions and 37 deletions

View File

@ -3,6 +3,13 @@
font-weight: 400 font-weight: 400
.profile-main .profile-main
padding: 0 $column-gutter/2
@media #{$medium-up}
width: grid-calc(8, 12)
float: right
padding: 0 0 0 $column-gutter/2
header header
h1 h1
margin: 0 1.7rem 0 0 margin: 0 1.7rem 0 0
@ -55,7 +62,10 @@
figcaption figcaption
width: 90% width: 90%
margin: auto margin: auto
padding: 0 0 0 2.8em padding: 0 1em 0 2.8em
text-align: center
@media #{$medium-up}
text-align: left
img img
display: block display: block
margin: 0 auto 1em margin: 0 auto 1em
@ -125,17 +135,18 @@ p.profile-user-last
.profile-hooklist .profile-hooklist
@include resetul @include resetul
font-size: $font-size-m font-size: $font-size-m
color: #7a7a7a
li li
clear: both clear: both
margin-bottom: .8em margin-bottom: .8em
overflow: auto // overflow: auto
.profile-hooks .profile-hooks
width: grid-calc(10, 24) width: grid-calc(10, 24)
display: inline-block
vertical-align: middle
@media #{$medium-up} @media #{$medium-up}
width: grid-calc(7, 24) width: grid-calc(5, 24) - 1%
@media #{$large-up} @media #{$large-up}
width: grid-calc(5, 24) width: grid-calc(5, 24) - 1%
.switch .switch
display: inline-block display: inline-block
vertical-align: middle vertical-align: middle
@ -158,7 +169,8 @@ p.profile-user-last
.profile-repo .profile-repo
@extend %border-radius-4px @extend %border-radius-4px
position: relative position: relative
width: grid-calc(14, 24) display: inline-block
width: grid-calc(13, 24)
padding: .25em .5em .3em padding: .25em .5em .3em
white-space: nowrap white-space: nowrap
overflow: hidden overflow: hidden
@ -182,7 +194,7 @@ p.profile-user-last
content: "" content: ""
@include fadeOut(right, -90deg, #e2eee2) @include fadeOut(right, -90deg, #e2eee2)
@media #{$medium-up} @media #{$medium-up}
width: grid-calc(17, 24) width: grid-calc(18, 24)
height: 30px height: 30px
&:hover &:hover
span span

View File

@ -1,4 +1,4 @@
<div class="profile-hooks profile-switch columns"> <div class="profile-hooks profile-switch">
{{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}} {{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}}
{{#if hook.isSaving}} {{#if hook.isSaving}}
{{loading-indicator}} {{loading-indicator}}
@ -6,7 +6,7 @@
{{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}} {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
{{/if}} {{/if}}
</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">
{{hook.slug}} {{hook.slug}}
<span>{{hook.description}}</span></a> <span>{{hook.description}}</span></a>

View File

@ -1,28 +1,3 @@
<article class="columns medium-8 float-right profile-main"> <article class="profile-main">
{{outlet}}
{{!-- {{#if config.billingEndpoint}}
<div class="row">
{{#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"}}>
Educational account!
</a>
{{else}}
<a class="btn btn-activate" {{bind-attr href="billingUrl"}}>
Sign up this account!
</a>
{{/if}}
{{/if}}
</div>
{{/if}} --}}
{{!-- {{view 'profile-tabs'}} --}}
{{!-- <div class="tab"> --}}
{{outlet}}
{{!-- </div> --}}
</article> </article>

View File

@ -1,4 +1,4 @@
<img {{bind-attr src="view.gravatarUrl"}}> {{!-- <img {{bind-attr src="view.gravatarUrl"}}>
<dl class="profile"> <dl class="profile">
<div> <div>
@ -26,3 +26,4 @@
</dd> </dd>
</div> </div>
</dl> </dl>
--}}