From d75f3c8a0b926065c475eea7bd326314a391cdf1 Mon Sep 17 00:00:00 2001 From: ValessioBrito Date: Fri, 19 Oct 2007 21:42:14 +0000 Subject: [PATCH] ActionItem110: Layout Default new --- app/views/layouts/application.rhtml | 12 ++++++++++-- public/artwork/screens/NoosferoTelaDeslogado.svg | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- public/designs/templates/default/stylesheets/style.css | 32 ++++++++++++++++++++++++-------- public/designs/themes/macstyle/style.css | 24 +++++++++++------------- 4 files changed, 175 insertions(+), 34 deletions(-) diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 2cbbcfd..9e2bfca 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -1,7 +1,15 @@ - + + <% if @category %> + Noosfero → <%= @category.full_name %> + <% else %> + Noosfero + <% end %> + + + <%= design_all_header_tags %> <%= stylesheet_link_tag 'common' %> <%= stylesheet_link_tag 'help' %> @@ -9,7 +17,7 @@ <%= javascript_include_tag 'menu' %> - + <% unless flash[:notice].nil? %>
diff --git a/public/artwork/screens/NoosferoTelaDeslogado.svg b/public/artwork/screens/NoosferoTelaDeslogado.svg index 7e7f7ea..e9ac9a4 100644 --- a/public/artwork/screens/NoosferoTelaDeslogado.svg +++ b/public/artwork/screens/NoosferoTelaDeslogado.svg @@ -795,14 +795,6 @@ d="M -692.96875,188.5 C -700.7869,188.5 -707.1875,194.90055 -707.1875,202.71875 L -707.1875,261.75 C -707.1875,269.56821 -700.7869,275.96876 -692.96875,275.96875 L -448.9375,275.96875 C -441.11931,275.96875 -434.71875,269.56819 -434.71875,261.75 L -434.71875,202.71875 C -434.71875,194.90055 -441.11933,188.5 -448.9375,188.5 L -692.96875,188.5 z" style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.17599964;stroke-linecap:butt;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - - - @@ -823,6 +815,15 @@ stdDeviation="2.0177276" id="feGaussianBlur3276" /> + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css index 7f49faa..a40ceb7 100644 --- a/public/designs/templates/default/stylesheets/style.css +++ b/public/designs/templates/default/stylesheets/style.css @@ -3,16 +3,34 @@ body { font-size: 14px; } -#wrap { -background: url("../images/bg_content.png") top center repeat-y; +#wrap.category { + background-attachment: fixed; + background: url("../images/bgblue.jpg") top left no-repeat; } -#frame { -background: url("../images/bg_bgheader.png") top left repeat-x; -} +#wrap.category1 { + background-attachment: fixed; + background: url("../images/bgorange.jpg") top left no-repeat; + } + +#wrap.category2 { + background-attachment: fixed; + background: url("../images/bggreen.jpg") top left no-repeat; + } + +#wrap.category3 { + background-attachment: fixed; + background: url("../images/bgpurple.jpg") top left no-repeat; + } + +#wrap.category4 { + background-attachment: fixed; + background: url("../images/bgred.jpg") top left no-repeat; + } + + #header { -background: url("../images/bg_header.png") top center no-repeat; height: 135px; } @@ -58,7 +76,6 @@ clear: both; color: #333; margin: 0px; padding: 5px; - background: #c5d0df url("../images/bg_footer.png") top left repeat-x; } @@ -142,7 +159,6 @@ div#notice .button a { color: black; padding: 4px; padding-left: 28px; - background-image: url(../../../icons/default/cancel.png); background-position: top left; background-repeat: no-repeat; } diff --git a/public/designs/themes/macstyle/style.css b/public/designs/themes/macstyle/style.css index 3addc63..423a676 100644 --- a/public/designs/themes/macstyle/style.css +++ b/public/designs/themes/macstyle/style.css @@ -6,31 +6,29 @@ div.block border: 0px; } -div.block ul +ul.block_control_list { list-style: none; - margin-left: 15px; + margin: 0px; + padding: 0px; } -ul.block_list div.block h3 { - cursor:move; -} - -div.block h3 +h3.block_header { background: url('images/h3bg.png') repeat-x; + cursor:move; font-family: Sans-serif; font-size: 15px; margin: 0px; - line-height: 25px; + padding: 0px; overflow: hidden; - vertical-align: middle; color: #545454; padding-left: 10px; - height: 35px; + height: 25px; + vertical-align: top; } -div.block span { +a.button_block span { display: none; padding: 1px; color: #000; @@ -41,13 +39,13 @@ font-weight: normal; border: 1px inset #545454; } -div.block a:hover span { +a.button_block:hover span { display: inline; position: absolute; margin-top: -20px; } -div.block a { +a.button_block { display: block; float: right; position: absolute; -- libgit2 0.21.2