Commit b5e4298dc8c175e705e66e5e75fe83e9e1f34d13
1 parent
8e3f5944
Exists in
master
and in
28 other branches
ActionItem138: notice and wrap height fix
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1091 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
7 changed files
with
19 additions
and
41 deletions
Show diff stats
app/views/layouts/application.rhtml
| ... | ... | @@ -29,9 +29,9 @@ |
| 29 | 29 | <body class='category<%= category_color %>'> |
| 30 | 30 | |
| 31 | 31 | <% unless flash[:notice].nil? %> |
| 32 | - <div id='notice'> | |
| 32 | + <div id='notice' onClick="Element.hide('notice');"> | |
| 33 | 33 | <%= flash[:notice] %> |
| 34 | - <%= javascript_tag(visual_effect(:fade, "notice", :duration => 2.0)) %> | |
| 34 | + <%= javascript_tag(visual_effect(:fade, "notice", :duration => 15)) %> | |
| 35 | 35 | </div> |
| 36 | 36 | <% end %> |
| 37 | 37 | |
| ... | ... | @@ -62,8 +62,7 @@ |
| 62 | 62 | document.getElementById(group).style.position = posSetting |
| 63 | 63 | } |
| 64 | 64 | </SCRIPT> |
| 65 | - <INPUT TYPE="checkbox" NAME="Fix" VALUE="0" onClick="posset(this, 'noosfero_bar')" style='float: left; font-size: 2px'><%= image_tag 'noosfero.png', :style => 'float: left;' %> | |
| 66 | - | |
| 65 | + <INPUT TYPE="checkbox" NAME="Fix" VALUE="0" onClick="posset(this, 'noosfero_bar')" style='float: left;'> | |
| 67 | 66 | <%= render :file => 'shared/categories_menu' %> |
| 68 | 67 | </div><!-- id='navigation_bar' --> |
| 69 | 68 | ... | ... |
app/views/profile_editor/index.rhtml
| 1 | 1 | <h2><%= _('My profile') %></h2> |
| 2 | 2 | |
| 3 | -<%= link_to (@profile.image ? image_tag( @profile.image.public_filename(:thumb)) : _('Put image')), :action => 'change_image' %> | |
| 3 | +<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image' %> | |
| 4 | 4 | |
| 5 | 5 | <%= display_profile_info(profile) %> |
| 6 | 6 | ... | ... |
app/views/shared/categories_menu.rhtml
public/designs/templates/default/stylesheets/forms.css
| ... | ... | @@ -13,10 +13,10 @@ |
| 13 | 13 | .formfield.text_field input, |
| 14 | 14 | .formfield.password_field input, |
| 15 | 15 | .formfield textarea { |
| 16 | - background: transparent url("../images/input-bg.gif") top left no-repeat; | |
| 16 | +/* background: transparent url("../images/input-bg.gif") top left no-repeat; */ | |
| 17 | 17 | border: 1px solid #999; |
| 18 | - border-top: none; | |
| 19 | - border-left: none; | |
| 18 | +/* border-top: none; | |
| 19 | + border-left: none; */ | |
| 20 | 20 | color: #585858; |
| 21 | 21 | } |
| 22 | 22 | .formfield input { |
| ... | ... | @@ -32,6 +32,7 @@ |
| 32 | 32 | |
| 33 | 33 | .submit { |
| 34 | 34 | border: 1px solid #777; |
| 35 | + cursor: pointer; | |
| 35 | 36 | color: #505050; |
| 36 | 37 | background: #BBB url("../images/bt-bg.png") top left repeat-x; |
| 37 | 38 | padding: 0px 30px; | ... | ... |
public/designs/templates/default/stylesheets/style.css
| ... | ... | @@ -77,9 +77,6 @@ clear: both; |
| 77 | 77 | color: #333; |
| 78 | 78 | margin: 0px; |
| 79 | 79 | padding: 5px; |
| 80 | - | |
| 81 | - position: absolute; | |
| 82 | - bottom: 0px; | |
| 83 | 80 | } |
| 84 | 81 | |
| 85 | 82 | /* Notice */ |
| ... | ... | @@ -91,28 +88,9 @@ div#notice { |
| 91 | 88 | left: 50%; |
| 92 | 89 | margin-left: -200px; |
| 93 | 90 | width: 400px; |
| 94 | - border: 1px solid black; | |
| 95 | - background: #efefef; | |
| 96 | - padding: 0.5em; | |
| 97 | -} | |
| 98 | - | |
| 99 | -div#notice .button { | |
| 100 | - text-align: center; | |
| 101 | - margin-top: 1em; | |
| 102 | - margin-bottom: 0.25em; | |
| 103 | -} | |
| 104 | - | |
| 105 | -div#notice .button a { | |
| 106 | - border: 1px solid gray; | |
| 107 | - background: #ddd; | |
| 108 | - color: black; | |
| 109 | - padding: 4px; | |
| 110 | - padding-left: 28px; | |
| 111 | - background-position: top left; | |
| 112 | - background-repeat: no-repeat; | |
| 113 | -} | |
| 114 | -div#notice .button a:hover { | |
| 115 | - background-color: #ffd; | |
| 91 | + border: 5px solid #545454; | |
| 92 | + background: #ffffa9; | |
| 93 | + padding: 10px; | |
| 116 | 94 | } |
| 117 | 95 | |
| 118 | 96 | ... | ... |
public/stylesheets/common.css
| ... | ... | @@ -4,13 +4,12 @@ padding: 0px; |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | #notice { |
| 7 | -position: absolute; | |
| 8 | -margin-top: 10px; | |
| 9 | -right: 10px; | |
| 10 | -background: #ffffa9; | |
| 11 | -padding: 10px; | |
| 12 | -border: 3px solid #dfdfdf; | |
| 13 | -z-index: 9999 !important ; | |
| 7 | +cursor: pointer; | |
| 8 | +} | |
| 9 | + | |
| 10 | +#wrap { | |
| 11 | +height: 100%; | |
| 12 | +margin:0px; | |
| 14 | 13 | } |
| 15 | 14 | |
| 16 | 15 | a img { |
| ... | ... | @@ -54,7 +53,6 @@ div#errorExplanation h2 { |
| 54 | 53 | margin-top: -5px; |
| 55 | 54 | margin-left: -5px; |
| 56 | 55 | margin-right: -5px; |
| 57 | - | |
| 58 | 56 | padding: 3px; |
| 59 | 57 | background: #933; |
| 60 | 58 | color: white; | ... | ... |