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 #2950 from awesomerobot/master 

some cleanup for new usercards on dark themes
This commit is contained in:
Régis Hanol 2014-11-06 18:10:26 +01:00
parent 3b699daec3 5c84c74a69
commit 684eb4045b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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