Skip to content

Commit

Permalink
nav styles
Browse files Browse the repository at this point in the history
  • Loading branch information
Marshall Norman committed Apr 10, 2014
1 parent afd1be5 commit 76df31b
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 19 deletions.
Binary file added .swp
Binary file not shown.
8 changes: 8 additions & 0 deletions app/styles/_avatars.scss
Expand Up @@ -8,6 +8,14 @@
padding: 0;
}

.avatar--med{
height: 2em;
width: 2em;
@include round-borders;
margin: 0;
padding: 0;
}

.avatar--link {
display: inline-block;
}
7 changes: 1 addition & 6 deletions app/styles/_buttons.scss
Expand Up @@ -15,17 +15,12 @@
margin: 1em 0;
}

// .button--auth{
// float: right;
// }
.button--login{
font-family: $f-avenir;
color: #1C4C55;
background-color: #3EA9BE;
padding: 1em;
// position: absolute;
// right: 0;
// top: 0;
font-weight: bold;
}

.button--add {
Expand Down
5 changes: 3 additions & 2 deletions app/styles/_leaderboard.scss
Expand Up @@ -6,11 +6,11 @@

.leaderboard--person {
display: block;
margin: .5em 2em;
margin: .5em 0;
margin-left: 0;
background-color: #fff;
}
.leaderboard{
.leaderboard{
}
.leaderboard--person--name {
display: inline-block;
Expand Down Expand Up @@ -66,5 +66,6 @@
}
.link--person {
color: #3E6DB3;
text-decoration: none;
}
}
13 changes: 9 additions & 4 deletions app/styles/_nav.scss
Expand Up @@ -12,19 +12,24 @@
text-align: center;
display: table-cell;
&:first-child{
background: #ccc;
background: #FF4040;
}
&:nth-child(2){
background: #666;
background: #163B42;
}
&:last-child{
background: #333;
background: #71cedf;
}
}

.nav--link{
font-family: $f-avenir;
font-size: .7em;
text-transform: uppercase;
letter-spacing: 1px;
padding: .55em 0;
display: block;
display: inline-block;
color: #fff;
text-decoration: none;
width: 100%;
}
5 changes: 1 addition & 4 deletions app/styles/_person.scss
Expand Up @@ -4,14 +4,11 @@
}

.link--person {
color: #444;
color: #2D4C83;
transition: color 0.5s ease;
transition: background-color 0.5s ease;
padding:.5em;
text-decoration: none;
&:hover {
color: #000;
text-decoration: underline;
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/templates/components/people-list.hbs
Expand Up @@ -11,16 +11,16 @@
Loss
</span>
</span>
</li>
{{#each people}}
</li>
{{#each people}}
{{#if isMe}}
<li class="leaderboard--person isMe">
{{else}}
<li class="leaderboard--person">
{{/if}}
<span class="effect--person">
{{#link-to "person" this classNames="link--person--avatar"}}
<img {{bind-attr src=avatar alt=name title=name}} class="leaderboard--person--avatar">
<img {{bind-attr src=avatar alt=name title=name}} class="avatar--med">
{{/link-to}}
<span class="">
{{#link-to "person" this classNames="leaderboard--person--name link--person"}}
Expand Down

0 comments on commit 76df31b

Please sign in to comment.