From 129e0b2b11fac91b7431e930e19d6c4859a68ccc Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 14:05:13 +0100 Subject: [PATCH 1/8] Update main_layout.css.scss --- app/assets/stylesheets/common/main_layout.css.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss index fbc6d8ca2..77789f292 100644 --- 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); } - \ No newline at end of file + From 2be02978500131d97c8ff456176625b24c568c3e Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 14:18:56 +0100 Subject: [PATCH 2/8] Update posts.css.scss --- app/assets/stylesheets/specific/posts.css.scss | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 2dcc856f4..9027089b2 100644 --- 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,12 @@ div#c-posts { } } + #content { + width:70%; + float:left; + padding-left:1em; + } + span.close-button { position: absolute; top: 5px; @@ -296,6 +302,7 @@ div#c-post-versions { text-decoration: line-through; margin-right: 0.5em; } + } } From b215d302a52aa6e00f82cf1e96b8641fb3a46116 Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 14:36:09 +0100 Subject: [PATCH 3/8] Update dtext.css.scss --- app/assets/stylesheets/common/dtext.css.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/common/dtext.css.scss b/app/assets/stylesheets/common/dtext.css.scss index 2c3d6fde1..0cfa9c715 100644 --- 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 { From 1f7c2906ec720db97bf25add81d05f93299e5a4b Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 14:37:19 +0100 Subject: [PATCH 4/8] Update posts.css.scss --- app/assets/stylesheets/specific/posts.css.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 9027089b2..0392c5355 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -302,7 +302,6 @@ div#c-post-versions { text-decoration: line-through; margin-right: 0.5em; } - } } From 915dc247ee25872aae33c6ff70f4f06e9fa0e6ae Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 14:40:46 +0100 Subject: [PATCH 5/8] Update wiki_pages.css.scss --- app/assets/stylesheets/specific/wiki_pages.css.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss index f9bc3da81..292c7f389 100644 --- a/app/assets/stylesheets/specific/wiki_pages.css.scss +++ b/app/assets/stylesheets/specific/wiki_pages.css.scss @@ -21,4 +21,11 @@ div#c-wiki-pages { table { margin-bottom: 1em; } -} \ No newline at end of file + + #a-show { + #content { + margin-left: 15em; + padding-left: 1em; + } + } +} From cd9b56a77002e1677f78f8abc595130fe023a078 Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 14:42:42 +0100 Subject: [PATCH 6/8] Update forum.css.scss --- app/assets/stylesheets/specific/forum.css.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/specific/forum.css.scss b/app/assets/stylesheets/specific/forum.css.scss index 178fe0f54..a1ed9162f 100644 --- 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; From 29449aaaa64d0c385eaee23eda5282db16197c7e Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 15:20:18 +0100 Subject: [PATCH 7/8] Update posts.css.scss switched to no-float + margin like the other parts --- app/assets/stylesheets/specific/posts.css.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 0392c5355..061e30ea5 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -263,8 +263,7 @@ div#c-posts { } #content { - width:70%; - float:left; + margin-left:15em; padding-left:1em; } From 32740e90fc8e4ecef84d22460da851ae9c88c2cc Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 16 Mar 2013 15:32:24 +0100 Subject: [PATCH 8/8] Update wiki_pages.css.scss --- app/assets/stylesheets/specific/wiki_pages.css.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss index 292c7f389..9cd771ee5 100644 --- a/app/assets/stylesheets/specific/wiki_pages.css.scss +++ b/app/assets/stylesheets/specific/wiki_pages.css.scss @@ -22,10 +22,8 @@ div#c-wiki-pages { margin-bottom: 1em; } - #a-show { - #content { - margin-left: 15em; - padding-left: 1em; - } + #content { + margin-left: 15em; + padding-left: 1em; } }