Skip to content

Commit

Permalink
style tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
echenley committed Sep 17, 2015
1 parent 8e18928 commit e61d07d
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 33 deletions.
1 change: 1 addition & 0 deletions src/js/actions/Actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ Actions.downvotePost.listen((userId, postId) => {
});
});


/* Comment Actions
=============================== */

Expand Down
7 changes: 5 additions & 2 deletions src/scss/_general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
====================================== */

h1 { margin-top: 0; }
h1,h2,h3,h4,h5,h6 {
h1, h2, h3, h4, h5, h6 {
font-family: $heading-font;
}

a {
color: $link;
cursor: pointer;
text-decoration: none;
&:hover { text-decoration: underline; }

&:hover {
text-decoration: underline;
}
}

hr {
Expand Down
11 changes: 0 additions & 11 deletions src/scss/_helpers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,6 @@
}
}

// .button-gray {
// background: $dark-gray;

// &:active {
// border-bottom-width: 1px;
// }
// &:hover {
// background: darken($button, 3%);
// }
// }

.error {
color: $error;
}
14 changes: 12 additions & 2 deletions src/scss/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,23 @@
right: 5px;
width: 40px;
height: 40px;
line-height: 40px;
text-align: center;
color: $dark-gray;
border-radius: 50%;
background: transparent;
transition: background 150ms;

svg {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: inline-block;
vertical-align: middle;
width: 15px;
height: 15px;
fill: $dark-gray;
}

&:hover {
background: rgba(#000, 0.05);
}
Expand Down
63 changes: 49 additions & 14 deletions src/scss/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@
}

.menu-title {
padding: $x-small $small;
}

.newpost-link {
display: inline-block;
vertical-align: middle;
margin-left: 0.5rem;
padding: 0 1rem;
line-height: 1;
font-size: 2em;
cursor: pointer;
vertical-align: top;
padding: 0 $small;

span {
display: inline-block;
margin-top: -0.3rem;
vertical-align: middle;
line-height: 1;
}

&:hover span {
text-decoration: underline;
}
}

.header-title {
Expand All @@ -40,18 +43,50 @@

.profile-link {
display: inline-block;
vertical-align: top;

&:hover .username {
text-decoration: underline;
}
}

.profile-pic,
.username {
display: inline-block;
margin-top: -0.3rem;
vertical-align: middle;
line-height: 1;
}

.profile-pic {
width: $medium;
height: $medium;
margin: 0 0.8rem;
vertical-align: middle;
margin-left: 0.8rem;
border-radius: 50%;
// filter: grayscale(100%);

@media screen and (max-width: 600px) {
display: none;
}
}

// .username {}
.newpost-link {
position: relative;
display: inline-block;
height: $nav-height;
width: 64px;
vertical-align: top;
margin-left: 0.5rem;
padding: 0 1rem;
font-size: 2em;
cursor: pointer;

svg {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 30px;
height: 30px;
fill: #fff;
}
}
22 changes: 18 additions & 4 deletions src/scss/_posts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,33 @@
// .comments-link {}

.upvote {
display: inline-block;
color: $dark-gray;
user-select: none;
line-height: 1;

&:hover {
text-decoration: none;
}

&.upvoted {
color: $upvoted;
&.updating {
opacity: 0.8;
}

&.updating {
transform: scale(0.8);
> * {
display: inline-block;
vertical-align: middle;
}

svg {
width: 12px;
height: 12px;
margin-left: 3px;
fill: $dark-gray;
}

&.upvoted svg {
fill: $upvoted;
}
}

Expand Down

0 comments on commit e61d07d

Please sign in to comment.