github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-26 09:06:40 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

Merge pull request from awesomerobot/master

Browse Source 
some cleanup for new usercards on dark themes
This commit is contained in:
Régis Hanol 2014-11-06 18:10:26 +01:00
commit 684eb4045b
3 changed files with 10 additions and 10 deletions
app/assets/stylesheets/desktop
topic-list.scssuser-card.scssuser.scss

2
app/assets/stylesheets/desktop/topic-list.scss

@ -68,7 +68,7 @@
background-color: $secondary; background-color: $secondary;
} }
&.highlighted { &.highlighted {
background-color: scale-color($tertiary, $lightness: 85%); background-color: dark-light-diff($tertiary, $secondary, 90%, -41%);
} }
} }
button.bulk-select { button.bulk-select {

10
app/assets/stylesheets/desktop/user-card.scss

@ -77,11 +77,11 @@
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
margin-top: 0; margin-top: 0;
color: scale-color($primary, $lightness: 50%); color: dark-light-diff($secondary, $primary, 25%, -25%);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
a { a {
color: $secondary; color: dark-light-diff($primary, $secondary, 50%, -50%);
} }
} }
.groups { .groups {
@ -103,7 +103,7 @@
display: inline; display: inline;
margin-right: 5px; margin-right: 5px;
.desc, a { .desc, a {
color: scale-color($primary, $lightness: 70%); color: dark-light-diff($secondary, $primary, 50%, -50%);
} }
} }
div {display: inline; color: scale-color($primary, $lightness: 50%); div {display: inline; color: scale-color($primary, $lightness: 50%);
@ -195,8 +195,8 @@
.user-badge { .user-badge {
background: transparent; background: transparent;
color: scale-color($primary, $lightness: 50%); color: dark-light-diff($primary, $secondary, 50%, -50%);
border-color: scale-color($primary, $lightness: 50%); border-color: dark-light-diff($primary, $secondary, 50%, -50%);
} }
h3 { h3 {

8
app/assets/stylesheets/desktop/user.scss

@ -282,26 +282,26 @@
width: 100%; width: 100%;
position: relative; position: relative;
float: left; float: left;
color: dark-light-diff($secondary, $primary, 75%, 0%); color: $secondary;
h1 {font-weight: bold;} h1 {font-weight: bold;}
.primary-textual { .primary-textual {
padding: 3px; padding: 3px;
a[href] { a[href] {
color: dark-light-diff($secondary, $primary, 75%, -10%); color: $secondary;
} }
} }
.bio { .bio {
color: dark-light-diff($secondary, $primary, 75%, 0%); color: $secondary;
max-height: 300px; max-height: 300px;
overflow: auto; overflow: auto;
max-width: 750px; max-width: 750px;
a.mention { a.mention {
background-color: dark-light-diff($secondary, $primary, 50%, -60%); background-color: dark-light-diff($secondary, $primary, 20%, -50%);
} }
a[href] { a[href] {