nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5731 from SansPseudoFix/fix-overflow-bs-stream

Browse source 
Global overflow fix
This commit is contained in:
Steffen van Bergerem 2015-03-10 00:07:12 +01:00
commit 6091b7c269
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/conversations.scss
View file

@ -14,7 +14,6 @@
p { p {
margin: 0 0 1em 0; margin: 0 0 1em 0;
word-wrap: break-word;
&:last-child { margin-bottom: 0; } &:last-child { margin-bottom: 0; }
} }
&.new_message { border-bottom: none; } &.new_message { border-bottom: none; }

8
app/assets/stylesheets/new_styles/_base.scss
View file

@ -14,6 +14,14 @@ body {
} }
} }
/* Overflow */
h1, h2, h3, h4, h5, h6,
p,
blockquote,
code,
pre { word-wrap: break-word; }
a.tag { word-break: break-all; }
/* new link color */ /* new link color */
$link-blue : rgb(42,156,235); $link-blue : rgb(42,156,235);
a { color : $link-blue } a { color : $link-blue }

5
app/assets/stylesheets/new_styles/_code.scss
View file

@ -1,7 +1,4 @@
code { code { white-space: normal; }
white-space: normal;
word-wrap: break-word;
}
pre { pre {
overflow-x: auto; overflow-x: auto;

1
app/assets/stylesheets/single-post-view.scss
View file

@ -120,7 +120,6 @@
width: auto; width: auto;
p { p {
margin: 0 0 1em 0; margin: 0 0 1em 0;
word-wrap: break-word;
} }
.photo_attachments { .photo_attachments {
padding-bottom: 10px; padding-bottom: 10px;