diff --git a/app/views/pages/show.html.haml b/app/views/pages/show.html.haml index 7ee80168..6e465fe1 100644 --- a/app/views/pages/show.html.haml +++ b/app/views/pages/show.html.haml @@ -19,7 +19,7 @@ = "(#{User.find(version.updated_by).nick})" - unless @page.children.empty? - #children + #subpages %h2 Unterseiten %ul - for page in @page.children diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index f5c2ab76..4902b73f 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -455,10 +455,12 @@ a.new_wiki_link { #sidebar { float: right; - margin-top: -2%; width: 20%; } #sidebar #page-versions { + margin-top: -4em; text-align: right; } + #sidebar #subpages { + margin-top: 2em; } #wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 { color: black; } diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index 6ed5891d..67387f2b 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -455,10 +455,12 @@ a.new_wiki_link { #sidebar { float: right; - margin-top: -2%; width: 20%; } #sidebar #page-versions { + margin-top: -4em; text-align: right; } + #sidebar #subpages { + margin-top: 2em; } #wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 { color: black; } diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass index 0deaa605..baf7730b 100644 --- a/public/stylesheets/sass/main.sass +++ b/public/stylesheets/sass/main.sass @@ -499,10 +499,12 @@ a.new_wiki_link :color = !main_red #sidebar float: right - margin-top: -2% width: 20% #page-versions + margin-top: -4em text-align: right + #subpages + margin-top: 2em #wiki_content