Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4263 from awesomerobot/master 

usercard background now matches theme background (default = white)
This commit is contained in:
Jeff Atwood 2016-06-12 17:16:50 -07:00 committed by GitHub
parent 3de2d7a003 3a8d366011
commit a6f03605a1
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/assets/stylesheets/desktop/user-card.scss
View File

@ -1,8 +1,8 @@
// styles that apply to the "share" popup when sharing a link to a post or topic // styles that apply to the "share" popup when sharing a link to a post or topic
// Colors should mostly be absolute here, it will look the same in dark & light themes // Colors should mostly be absolute here, it will look the same in dark & light themes
$user_card_primary: #fff; $user_card_primary: $primary;
$user_card_background: #222; $user_card_background: $secondary;
#user-card { #user-card {
position: absolute; position: absolute;
@ -10,7 +10,7 @@ $user_card_background: #222;
left: -9999px; left: -9999px;
top: -9999px; top: -9999px;
z-index: 990; z-index: 990;
box-shadow: 0 2px 12px rgba($primary, .6); box-shadow: 1px 2px 6px rgba(0,0,0, .25);
margin-top: -2px; margin-top: -2px;
color: $user_card_primary; color: $user_card_primary;
background: $user_card_background center center; background: $user_card_background center center;
@ -94,7 +94,7 @@ $user_card_background: #222;
font-size: 0.929em; font-size: 0.929em;
font-weight: normal; font-weight: normal;
margin-top: 0; margin-top: 0;
color: scale-color($user_card_primary, $lightness: 25%); color: scale-color($user_card_primary, $lightness: 20%);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
a { a {
@ -121,7 +121,7 @@ $user_card_background: #222;
display: inline; display: inline;
margin-right: 5px; margin-right: 5px;
.desc, a { .desc, a {
color: scale-color($user_card_primary, $lightness: 50%); color: scale-color($user_card_primary, $lightness: 35%);
} }
} }
div {display: inline; color: scale-color($user_card_background, $lightness: 50%); div {display: inline; color: scale-color($user_card_background, $lightness: 50%);
@ -139,7 +139,7 @@ $user_card_background: #222;
} }
.bio { .bio {
padding: 15px 0 0 0; padding: 10px 0 0 0;
clear: left; clear: left;
a { a {
@ -161,9 +161,11 @@ $user_card_background: #222;
.location-and-website { .location-and-website {
clear: left; clear: left;
margin-top: 5px;
.location {margin-right: 10px;}
.website-name { .website-name {
a { a {
text-decoration: underline;
color: $user_card_primary; color: $user_card_primary;
} }
} }
@ -204,7 +206,6 @@ $user_card_background: #222;
height: 60px; height: 60px;
position: relative; position: relative;
width: 45%; width: 45%;
margin-top: 11px;
span { span {
position: absolute; position: absolute;
@ -222,9 +223,9 @@ $user_card_background: #222;
margin-top: 5px; margin-top: 5px;
.user-badge { .user-badge {
background: transparent; background: scale-color($user_card_background, $lightness: -5%);
color: scale-color($user_card_background, $lightness: 50%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-color: scale-color($user_card_background, $lightness: 50%); color: $user_card_primary;
} }
h3 { h3 {