diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index c38d05b..b9dcd60 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -1,3 +1,29 @@ +h1 { + font-size: 23px +} + +h2 { + font-size: 19px +} + +body,html { + padding:0; + margin:0; + +} +a:hover { + text-decoration:none; +} + + + + + + + + + + ul.linkbox-list { max-width:70em; @@ -29,3 +55,39 @@ div.contentbox { margin: 5px; } +div.content-column { +max-width:70em; +} +div.content-wrap { +margin-left:auto; +margin-right:auto; +} + +#contentdiv +{ + background: $contentdiv-background; +} +#contentdiv .container-fluid +{ padding:0; +} +.navbar .nav .divider { + border-style: solid; + border-width: 1px 0px 0px 0px; + border-color: grey; + min-width: 100%; +} + +.navbar .navbar-inner +{ + border:none; + box-shadow:none; +} + +.navbar .nav li { +min-width:$navbar-li-minwidth; +} +div.smallspan { + min-height:0; +} + + diff --git a/app/assets/stylesheets/themes/2003/application.css.scss b/app/assets/stylesheets/themes/2003/application.css.scss index ede60a5..c21efd0 100755 --- a/app/assets/stylesheets/themes/2003/application.css.scss +++ b/app/assets/stylesheets/themes/2003/application.css.scss @@ -52,28 +52,13 @@ $navbarLinkBackgroundHover: darken($navbarBackground,10%); $infoBackground:#65A5D1; $infoText:#03406A; $sansFontFamily: Helvetica, Arial; + @import 'bootstrap'; @import 'bootstrap-responsive'; @import 'bootstrap/image-gallery'; @import 'neuigkeiten'; -h1 { - font-size: 23px -} - -h2 { - font-size: 19px -} - -body,html { - padding:0; - margin:0; - -} -a:hover { - text-decoration:none; -} div.header { display: block; @@ -89,64 +74,18 @@ div.header { margin-bottom: 0 px } div.header h1 { -padding:0; + padding:0; margin:4px; font-size:20px; line-height:32px; } + div.headerrow { background: $color_prim } + $contentdiv-background:none; +$navbar-li-minwidth: 0; -#menudiv { - // width:100%; -} - -div.smallspan { -min-height:0; -} - -.navbar .nav li { - min-width:100%; -} -.navbar .nav .divider { - border-style: solid; - border-width: 1px 0px 0px 0px; - border-color: grey; - min-width: 100%; -} - -.navbar .navbar-inner -{ - border:none; - box-shadow:none; -} -#contentdiv -{ - //background: #FFFFFF -} -#contentdiv .container-fluid -{ padding:0; -} - - - - -.navbar .nav li { -min-width:0; - -} - - -div.content-wrap { -margin-left:auto; -margin-right:auto; - -//max-width:70em; -} -div.content-column { -max-width:70em; -} $box-border: lightgray solid 1px; $box-border-radius:8px; $box-background: white; diff --git a/app/views/themes/2003/layouts/application.html.erb b/app/views/themes/2003/layouts/application.html.erb index 792a601..b8220d8 100755 --- a/app/views/themes/2003/layouts/application.html.erb +++ b/app/views/themes/2003/layouts/application.html.erb @@ -36,7 +36,7 @@ -
<%= @themengruppe.text %> @@ -21,3 +22,4 @@ <%= render :partial=>'layouts/pretty_toolbar' %> +