Merge branch 'master' of https://github.com/r888888888/danbooru

2013-05-03 10:00:53 -04:00
parent e84563712f 64d782f223
commit 27128a0579
2 changed files with 2 additions and 2 deletions
--- a/app/assets/stylesheets/specific/comments.css.scss
+++ b/app/assets/stylesheets/specific/comments.css.scss
@@ -15,13 +15,13 @@ div.comments-for-post {
  div.list-of-comments {
    article.comment {
      margin-bottom: 2em;
+      word-wrap: break-word;

      div.author {
        width: 12em;
        float: left;
        overflow: hidden;
        margin-right: 2em;
-        word-wrap: break-word;

        h1 {
          display: block;
--- a/app/assets/stylesheets/specific/forum.css.scss
+++ b/app/assets/stylesheets/specific/forum.css.scss
@@ -7,12 +7,12 @@ div.list-of-forum-posts {

  article {
    margin-bottom: 3em;
+    word-wrap: break-word;

    div.author {
      width: 12em;
      float: left;
      margin-right: 2em;
-      word-wrap: break-word;
    }

    div.content {