Merge pull request #906 from Lightforger/master

css fix for wide screens.
danbooru · Mar 17, 2013 · cfdf449 · cfdf449
2 parents 8544678 + 32740e9
commit cfdf449
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/app/assets/stylesheets/common/dtext.css.scss b/app/assets/stylesheets/common/dtext.css.scss
@@ -1,7 +1,6 @@
 @import "000_vars.css.scss";
 
 div.prose {
-  max-width: 40em;
   line-height: 1.4em;
 
   h1, h2, h3 {

diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss
@@ -63,9 +63,6 @@ div#page {
   }
 
   section#content {
-    width: 70%;
-    float: left;
-    padding-left: 2em;
     overflow: visible;
   }
 }
@@ -92,4 +89,4 @@ div#more-links {
   padding: 0.2em 0.6em;
   @include box-shadow(2px 2px 2px #ccc);
 }
-
+
diff --git a/app/assets/stylesheets/specific/forum.css.scss b/app/assets/stylesheets/specific/forum.css.scss
@@ -10,8 +10,7 @@ div.list-of-forum-posts {
     }
 
     div.content {
-      width: 40em;
-      float: left;
+      margin-left: 14em;
 
       menu {
         margin-top: 0.5em;

diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
@@ -176,8 +176,8 @@ div#c-posts {
 
   div#a-index {
     div#posts {
-      max-width: 900px;
-      float: left;
+      margin-left: 15em;
+      margin-right: 6.5em;
     }
 
     div#jlist-rss-ads-for-show {
@@ -262,6 +262,11 @@ div#c-posts {
       }
     }
 
+    #content {
+      margin-left:15em;
+      padding-left:1em;
+    }
+
     span.close-button {
       position: absolute;
       top: 5px;

diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss
@@ -21,4 +21,9 @@ div#c-wiki-pages {
   table {
     margin-bottom: 1em;
   }
-}
+
+  #content {
+    margin-left: 15em;
+    padding-left: 1em;
+  }
+}