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

fixing @mention background in quotes and embeds
This commit is contained in:
Jeff Atwood 2014-05-27 11:03:25 -07:00
parent 7c22d738b6 971494bf5a
commit 5095de815d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/common/base/header.scss
View File

@ -27,7 +27,6 @@
#site-logo { #site-logo {
max-height: 40px; max-height: 40px;
max-width: 122px;
} }
.fa-home { .fa-home {

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

@ -248,7 +248,7 @@ nav.post-controls {
.embedded-posts { .embedded-posts {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
a.mention {background: scale-color-diff();} a.mention {background: darken(scale-color-diff(), 10%);}
&.bottom { &.bottom {
&.hidden {display: block; opacity: 0; } &.hidden {display: block; opacity: 0; }
@ -680,7 +680,7 @@ blockquote { /* solo quotes */
margin: 0; margin: 0;
padding: 12px; padding: 12px;
a.mention {background: scale-color-diff();} a.mention {background: darken(scale-color-diff(), 10%);}
p:first-of-type {margin-top: 0;} p:first-of-type {margin-top: 0;}
p:last-of-type {margin-bottom: 0;} p:last-of-type {margin-bottom: 0;}
} }

4
app/assets/stylesheets/mobile/header.scss
View File

@ -6,6 +6,10 @@
padding-left: 10px !important; padding-left: 10px !important;
padding-right: 10px !important; padding-right: 10px !important;
#site-logo {
max-width: 122px;
}
a.star {float: left;} a.star {float: left;}
.panel { .panel {