diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 0ee69c8..9b7217f 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -62,7 +62,7 @@ a:hover { div.header { display: block; - background: url('/header1.png') no-repeat; + // background: url('/header1.png') no-repeat; background-color: #FFF; background-position: right; border-bottom:1px solid black; diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 7147fe8..c38d05b 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -1,25 +1,31 @@ +ul.linkbox-list +{ + max-width:70em; +} +a.linkbox, div.contentbox +{ + display:block; + padding:5px; + border-radius:$box-border-radius; + border: $box-border; + background: $box-background; + +} -// Colorshema #0A64A4 -$color_prim: #0A64A4; -$color_prim_light: #0B65A5; -$color_prim_vlight: #2B85C5; -$color_cont: FFDB73; -$color_cont_light:FFDB73; -$linkColor: #03006E; -$white: #FFFFFF; +a.linkbox:hover +{ +box-shadow: 1px 1px 2px 2px lightgray; +} -$bodyBackground: $white; -$navbarBackground: $color_cont; -$navbarBackground: #FFFFFF; +a.linkbox li +{ +} +ul.linkbox-list li +{ +margin-bottom:10px; +} -$navbarBackgroundHighlight:lighten($navbarBackground,30%); -//$navbarBackgroundHighlight:#FFFFFF; - -$navbarLinkBackgroundHover:#FFBE00; -$navbarLinkBackgroundHover: lighten(#cccccc,10%); -$infoBackground:#65A5D1; -$infoText:#03406A; -$sansFontFamily: Helvetica, Arial; -@import 'bootstrap'; -@import 'bootstrap-responsive'; -@import 'bootstrap/image-gallery'; +div.contentbox +{ + margin: 5px; +} diff --git a/app/assets/stylesheets/themes/2003/application.css.scss b/app/assets/stylesheets/themes/2003/application.css.scss index c51d947..8d4f0cc 100755 --- a/app/assets/stylesheets/themes/2003/application.css.scss +++ b/app/assets/stylesheets/themes/2003/application.css.scss @@ -28,15 +28,21 @@ $color_cont_light:FFDB73; $linkColor: $color_prim_vdark; $white: #FFFFFF; -$bodyBackground: $white; -$navbarBackground: $color_prim; -$navbarText: black;$navbarLinkColor: black; +$bodyBackground: #EEE; + +$navbarBackground: $color_prim; +$navbarText: black; +$navbarLinkColor: black; +$navbarLinkColorHover: black; +$dropdownLinkColor: black; $navbarBackgroundHighlight: $color_prim; //$navbarBackgroundHighlight:#FFFFFF; $navbarLinkBackgroundHover:#FFBE00; $navbarLinkBackgroundHover: darken($navbarBackground,10%); + + $infoBackground:#65A5D1; $infoText:#03406A; $sansFontFamily: Helvetica, Arial; @@ -110,91 +116,31 @@ min-height:0; } #contentdiv { - background: #FFFFFF + //background: #FFFFFF } #contentdiv .container-fluid -{ - padding:0; +{ padding:0; } -a.linkbox, div.contentbox -{ - display:block; - padding:5px; - border-radius: 10px; - border: lightgray solid 1px; -} - -a.linkbox:hover -{ -box-shadow: 1px 1px 2px 2px lightgray; -} - -a.linkbox li -{ -} -ul.linkbox-list li -{ -margin-bottom:10px; -} -ul.linkbox-list -{ - max-width:70em; -} - -div.contentbox -{ - margin: 5px; -} - -table.calendar tr td -{ - width:14.28%; - height:2em; - position:relative; - padding:0 -} - -table.calendar tr td.day div -{ - display:block; - position:absolute; - padding:2px; -} -table.calendar tr td.day div div -{ - display:none; - position:relative; -} -table.calendar tr td.day.events -{ color:blue -} -table.calendar tr td.day div:hover div -{ - display:block; - z-index: 10000; - background:none; - border: none; -} -table.calendar tr td.day div:hover -{ - background:white; - border: solid black 1px; - z-index:9999; -} - -table.calendar tr td.day div:hover div -{ -} - -table.calendar tr td.day div div.day_number -{ - display:block; -} .navbar .nav li { min-width:0; -background:44F; -} \ No newline at end of file + +} + + +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; +@import 'layout' diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb index 7bda4db..a36b5b2 100644 --- a/app/views/fetprofiles/index.html.erb +++ b/app/views/fetprofiles/index.html.erb @@ -1,6 +1,6 @@ <%= render 'fetprofiles/tabs' %> - +
<%= notice %>
+<%= notice %>
- +<%= notice %>
+<%= @rubrik.desc %> @@ -34,8 +36,9 @@