github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 08:15:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3516 from awesomerobot/master

Browse Source 
a few color variable fixes for the topic map
This commit is contained in:
Jeff Atwood 2015-06-01 18:24:54 -07:00
commit 9dd6b65e88
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/common/components/badges.css.scss
View File

@ -271,9 +271,9 @@
&.clicks { &.clicks {
font-weight: normal; font-weight: normal;
background-color: #ddd; background-color: dark-light-diff($primary, $secondary, 85%, -65%);
top: -1px; top: -1px;
color: #888; color: dark-light-diff($primary, $secondary, 50%, -45%);
position: relative; position: relative;
margin-left: 2px; margin-left: 2px;
border: none; border: none;

6
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -309,7 +309,7 @@ a.star {
.topic-map { .topic-map {
margin: 20px 0 0 0; margin: 20px 0 0 0;
background: dark-light-diff($primary, $secondary, 97%, -45%); background: dark-light-diff($primary, $secondary, 97%, -75%);
border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: none; // would cause double top border border-top: none; // would cause double top border
@ -415,12 +415,12 @@ a.star {
border: 0; border: 0;
padding: 0 23px; padding: 0 23px;
color: $primary; color: $primary;
background: dark-light-diff($primary, $secondary, 97%, -45%); background: dark-light-diff($primary, $secondary, 97%, -75%);
border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
&:hover { &:hover {
color: $primary; color: $primary;
background: dark-light-diff($primary, $secondary, 90%, -65%); background: dark-light-diff($primary, $secondary, 90%, -80%);
} }
&.collapsed { &.collapsed {