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

fixing base line-height and big/small abuse
This commit is contained in:
Régis Hanol 2014-12-17 20:59:44 +01:00
parent c17b111b6d bcb03474d6
commit a026a7c5ec
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/common/base/discourse.scss
View File

@ -12,13 +12,16 @@
}
big {
font-size: 2em;
font-size: 28px;
}
small {
font-size: 0.714em;
font-size: 9px;
}
//setting a static limit on big and small prevents nesting abuse
blockquote {
background-color: scale-color-diff();
border-left: 5px solid darken(scale-color-diff(), 10%);

3
app/assets/stylesheets/common/foundation/base.scss
View File

@ -9,8 +9,7 @@ html {
color: $primary;
font-family: $base-font-family;
font-size: $base-font-size;
// font: #{$base-font-size}/#{$base-line-height} $base-font-family;
// this does not work, see https://meta.discourse.org/t/x/23193/11
line-height: $base-line-height;
background-color: $secondary;
overflow-y: scroll;
}