Commit 611b4acf by Kyle Fiedler

Merged in default

--HG--
branch : kf-tooltips
parents 1628b3e5 e6716591
...@@ -14,7 +14,7 @@ body.user-profile-page { ...@@ -14,7 +14,7 @@ body.user-profile-page {
> li { > li {
display: table-cell; display: table-cell;
padding: (flex-gutter(9)/2); padding: (flex-gutter(9)/2);
border-right: 1px solid #ddd; border-right: 1px dashed #efefef;
@include box-sizing(border-box); @include box-sizing(border-box);
&:first-child { &:first-child {
...@@ -76,7 +76,7 @@ body.user-profile-page { ...@@ -76,7 +76,7 @@ body.user-profile-page {
&.up { &.up {
background-color:#d1e3a8; background-color:#d1e3a8;
background-image: url(/static/images/askbot/vote-arrow-up.png); background-image: url(/static/images/askbot/vote-arrow-up-activate.png);
margin-right: 6px; margin-right: 6px;
span.vote-count { span.vote-count {
...@@ -85,7 +85,7 @@ body.user-profile-page { ...@@ -85,7 +85,7 @@ body.user-profile-page {
} }
&.down { &.down {
background-image: url(/static/images/askbot/vote-arrow-down.png); background-image: url(/static/images/askbot/vote-arrow-down-activate.png);
background-color:#eac6ad; background-color:#eac6ad;
span.vote-count { span.vote-count {
......
...@@ -19,14 +19,19 @@ div.question-header { ...@@ -19,14 +19,19 @@ div.question-header {
&.post-vote { &.post-vote {
@include border-radius(4px); @include border-radius(4px);
background-color: lighten(#F6EFD4, 3%); background-color: lighten(#F6EFD4, 5%);
border: 1px solid darken( #F6EFD4,10% );
@include box-shadow(inset 0 1px 0px #fff);
} }
&.question-img-upvote, &.answer-img-upvote { &.question-img-upvote, &.answer-img-upvote {
background-image: url(/static/images/askbot/vote-arrow-up.png); background-image: url(/static/images/askbot/vote-arrow-up.png);
@include box-shadow(inset 0 1px 0px rgba(255, 255, 255, 0.5));
&:hover, &.on { &:hover, &.on {
background-color:#d1e3a8; background-color:#d1e3a8;
border-color: darken(#D1E3A8, 20%);
background-image: url(/static/images/askbot/vote-arrow-up-activate.png);
} }
} }
...@@ -34,7 +39,9 @@ div.question-header { ...@@ -34,7 +39,9 @@ div.question-header {
background-image: url(/static/images/askbot/vote-arrow-down.png); background-image: url(/static/images/askbot/vote-arrow-down.png);
&:hover, &.on { &:hover, &.on {
background-color:#eac6ad; background-color:#EAC6AD;
border-color: darken(#EAC6AD, 20%);
background-image: url(/static/images/askbot/vote-arrow-down-activate.png);
} }
} }
} }
...@@ -319,6 +326,5 @@ div.share-question { ...@@ -319,6 +326,5 @@ div.share-question {
p { p {
padding: 0; padding: 0;
margin: 0; margin: 0;
font-weight: bold;
} }
} }
...@@ -283,6 +283,11 @@ div.discussion-wrapper aside { ...@@ -283,6 +283,11 @@ div.discussion-wrapper aside {
text-align: center; text-align: center;
padding: 10px; padding: 10px;
display: block; display: block;
margin-top: 10px;
&:first-child {
margin-top: 0;
}
span { span {
font-weight: bold; font-weight: bold;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment