diff options
| -rw-r--r-- | juick-www/src/main/static/style.css | 10 | ||||
| -rw-r--r-- | juick-www/src/main/webapp/WEB-INF/layouts/content.html | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index e3455767..cf90bae9 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -24,7 +24,7 @@ html { background: #EEEEE5; color: #222; } -body { +#wrapper { margin: 0 auto; width: 1000px; } @@ -75,9 +75,6 @@ pre::-moz-selection { clear: both; position: relative; } -body > header { - width: 1000px; -} body > header a { border-bottom: 1px dotted #666; color: #222; @@ -713,9 +710,8 @@ q { clear: both; color: #999; font-size: 10pt; - margin: 0 auto 20px 0; + margin: 40px; padding: 10px 0; - width: 1004px; } #footer-social { float: left; @@ -831,7 +827,7 @@ article.nsfw .ir img:hover { -ms-text-size-adjust: 100%; } body, - body > header, + #wrapper, #topwrapper, #content, #footer, diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html index 4e8073ce..9ced2d76 100644 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ b/juick-www/src/main/webapp/WEB-INF/layouts/content.html @@ -45,6 +45,7 @@ </head> <body id="body" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}"{% endif %}> {% include "views/partial/navigation" %} +<div id="wrapper"> <section id="content" style="{{ contentStyle | default('') }}" {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}"{% endif %}> {% block content %} @@ -54,6 +55,7 @@ {% block column %} {% endblock %} </aside> +</div> {% include "views/partial/footer" %} </body> </html> |