diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8005fb7d..751293bf 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -55,9 +55,10 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; } * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; } -#content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;} +#content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; } * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;} -html>body #content { height: auto; min-height: 600px; overflow: auto; } +html>body #content { min-height: 600px; } +* html body #content { height: 600px; } /* IE */ #main.nosidebar #sidebar{ display: none; } #main.nosidebar #content{ width: auto; border-right: 0; }