Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the CSS problem with paras under headings

This commit is contained in:
Jeff Atwood 2013-03-24 00:49:42 -07:00
parent f14cf4c97e
commit 0c8a803144
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/application/topic-post.css.scss
View File

@ -585,6 +585,8 @@
.topic-body { .topic-body {
position: relative; position: relative;
// this is the little pointy bit of the speech bubble on the post, on the left side
&:before, &:before,
&:after { &:after {
position: absolute; position: absolute;

11
app/assets/stylesheets/vendor/bootstrap.css.scss vendored
View File

@ -958,17 +958,20 @@ body {
input, textarea, select, .uneditable-input { input, textarea, select, .uneditable-input {
color: #222222; color: #222222;
} }
p, pre, li, ul { p, pre, li, ul {
font-size: 14px; font-size: 14px;
} }
p { p {
line-height: 20px; line-height: 20px;
} }
code, pre { code, pre {
font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif; font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin: 0; margin: 20px 0 10px;
font-family: inherit; font-family: inherit;
font-weight: bold; font-weight: bold;
color: inherit; color: inherit;
@ -1016,6 +1019,12 @@ body {
color: #999999; color: #999999;
text-transform: uppercase; text-transform: uppercase;
} }
// this removes the unwanted top margin on a paragraph under a heading
h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
margin-top:0px;
}
blockquote { blockquote {
margin: 15px 0 8px; margin: 15px 0 8px;
} }