Commit 35770e59e56e1c8ddc203814cfa99ab922d93391
1 parent
705d1057
Exists in
master
and in
29 other branches
ActionItem358: ups... i forget the conf on YAML.load_file(conf) :-p
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1759 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
5 changed files
with
21 additions
and
19 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -498,7 +498,7 @@ module ApplicationHelper | @@ -498,7 +498,7 @@ module ApplicationHelper | ||
| 498 | '/public/designs/themes/' + | 498 | '/public/designs/themes/' + |
| 499 | current_theme.to_s() + | 499 | current_theme.to_s() + |
| 500 | '/theme.yml' | 500 | '/theme.yml' |
| 501 | - js = File.exists?(conf) ? YAML.load_file( )['js'] : [] | 501 | + js = File.exists?(conf) ? YAML.load_file(conf)['js'] : [] |
| 502 | html = [] | 502 | html = [] |
| 503 | js.each do |file| | 503 | js.each do |file| |
| 504 | file = '/designs/themes/'+ current_theme.to_s() + | 504 | file = '/designs/themes/'+ current_theme.to_s() + |
public/designs/themes/ecosol/stylesheets/common.css
| @@ -13,6 +13,19 @@ body.noosfero { | @@ -13,6 +13,19 @@ body.noosfero { | ||
| 13 | background-position: 50% 22px; | 13 | background-position: 50% 22px; |
| 14 | background-repeat: repeat-x; | 14 | background-repeat: repeat-x; |
| 15 | background-image: url(../images/bg-top-azul.png); | 15 | background-image: url(../images/bg-top-azul.png); |
| 16 | + border: 3px solid #2A5896; | ||
| 17 | +} | ||
| 18 | +body.category1 #wrap { | ||
| 19 | + border-color: #E26B00; | ||
| 20 | +} | ||
| 21 | +body.category2 #wrap { | ||
| 22 | + border-color: #58A80A; | ||
| 23 | +} | ||
| 24 | +body.category3 #wrap { | ||
| 25 | + border-color: #694371; | ||
| 26 | +} | ||
| 27 | +body.category4 #wrap { | ||
| 28 | + border-color: #B80000; | ||
| 16 | } | 29 | } |
| 17 | 30 | ||
| 18 | body.category1 #wrap { background-image: url("../images/bg-top-laranja.png"); } | 31 | body.category1 #wrap { background-image: url("../images/bg-top-laranja.png"); } |
public/designs/themes/ecosol/stylesheets/menu.css
| @@ -13,6 +13,11 @@ body.category2 #menu_link_to_envhome { background-image: url(../images/ico-fbes- | @@ -13,6 +13,11 @@ body.category2 #menu_link_to_envhome { background-image: url(../images/ico-fbes- | ||
| 13 | body.category3 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-lilas.gif) } | 13 | body.category3 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-lilas.gif) } |
| 14 | body.category4 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-vermelho.gif) } | 14 | body.category4 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-vermelho.gif) } |
| 15 | 15 | ||
| 16 | +#noosfero_bar { | ||
| 17 | + left: 3px; | ||
| 18 | + right: 3px; | ||
| 19 | +} | ||
| 20 | + | ||
| 16 | body.category1 #noosfero_bar { background-color: #E26B00 } | 21 | body.category1 #noosfero_bar { background-color: #E26B00 } |
| 17 | #category1 .linkSubMenu, | 22 | #category1 .linkSubMenu, |
| 18 | #category1 ul { background-color: #F57900 } | 23 | #category1 ul { background-color: #F57900 } |
public/stylesheets/common.css
| @@ -32,22 +32,6 @@ body { | @@ -32,22 +32,6 @@ body { | ||
| 32 | cursor: pointer; | 32 | cursor: pointer; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | -#wrap { | ||
| 36 | - border: 3px solid #2A5896; | ||
| 37 | -} | ||
| 38 | -body.category1 #wrap { | ||
| 39 | - border-color: #E26B00; | ||
| 40 | -} | ||
| 41 | -body.category2 #wrap { | ||
| 42 | - border-color: #58A80A; | ||
| 43 | -} | ||
| 44 | -body.category3 #wrap { | ||
| 45 | - border-color: #694371; | ||
| 46 | -} | ||
| 47 | -body.category4 #wrap { | ||
| 48 | - border-color: #B80000; | ||
| 49 | -} | ||
| 50 | - | ||
| 51 | #environment_identification { | 35 | #environment_identification { |
| 52 | position: absolute !important; | 36 | position: absolute !important; |
| 53 | background: url("../images/bg_blue_logo.png") 5px no-repeat !important; | 37 | background: url("../images/bg_blue_logo.png") 5px no-repeat !important; |
public/stylesheets/menu.css