Download as
Browse Code »

Commit f869a5515115313f8b2c643566116db76aae9d13

Authored by JoenioCosta
1 parent 5e1be3e4
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem539: added background color to controlpanel 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2161 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 26 additions and 6 deletions   Show diff stats
app/views/profile_editor/index.rhtml
  Diff comments   View file @f869a55
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
4 4
5 <%= render :partial => 'pending_tasks' %> 5 <%= render :partial => 'pending_tasks' %>
6 6
  7 +<div class='control-panel'>
  8 +
7 <% file_manager do %> 9 <% file_manager do %>
8 10
9 <%= file_manager_button(_('Edit Profile'), 'icons-app/edit-profile.png', :controller => 'profile_editor', :action => 'edit') %> 11 <%= file_manager_button(_('Edit Profile'), 'icons-app/edit-profile.png', :controller => 'profile_editor', :action => 'edit') %>
@@ -56,4 +58,6 @@ @@ -56,4 +58,6 @@
56 58
57 <% end %> 59 <% end %>
58 60
  61 +</div>
  62 +
59 </div><!-- end id="profile-editor-index" --> 63 </div><!-- end id="profile-editor-index" -->
public/designs/themes/ecosol/stylesheets/controller_profile_editor.css
  Diff comments   View file @f869a55
@@ -21,3 +21,13 @@ @@ -21,3 +21,13 @@
21 background: #B8CFE7; 21 background: #B8CFE7;
22 } 22 }
23 23
  24 +div.file-manager
  25 +div.file-manager-button a:hover {
  26 + color: #006;
  27 + border-color: #2A5896;
  28 + background-color: #CFDFF7;
  29 +}
  30 +
  31 +div#profile-editor-index div.control-panel {
  32 + background: #B8CFE7;
  33 +}
public/designs/themes/zen3/stylesheets/controller_profile_editor.css
  Diff comments   View file @f869a55
1 -  
2 .categorie_box { 1 .categorie_box {
3 -moz-border-radius: 4px; 2 -moz-border-radius: 4px;
4 border: 1px solid #F57900; 3 border: 1px solid #F57900;
@@ -26,7 +25,13 @@ ul.categories li.cat_checked { @@ -26,7 +25,13 @@ ul.categories li.cat_checked {
26 border-bottom: 1px solid #CE5C00; 25 border-bottom: 1px solid #CE5C00;
27 } 26 }
28 27
  28 +div.file-manager
29 div.file-manager-button a:hover { 29 div.file-manager-button a:hover {
30 background: #FCAF3E !important; 30 background: #FCAF3E !important;
31 color: #000 !important; 31 color: #000 !important;
  32 + border-color: #CE5C00;
  33 +}
  34 +
  35 +div#profile-editor-index div.control-panel {
  36 + background: #FFE890;
32 } 37 }
public/stylesheets/controller_profile_editor.css
  Diff comments   View file @f869a55
@@ -47,20 +47,21 @@ div.file-manager-button a img { @@ -47,20 +47,21 @@ div.file-manager-button a img {
47 47
48 div.file-manager 48 div.file-manager
49 div.file-manager-button a { 49 div.file-manager-button a {
50 - border: 1px solid #e0e0e0; 50 + border: 2px solid transparent;
51 display: block; 51 display: block;
52 padding: 3px; 52 padding: 3px;
53 height: 90px; 53 height: 90px;
54 overflow: hidden; 54 overflow: hidden;
55 - background: white;  
56 font-size: 90%; 55 font-size: 90%;
57 text-decoration: none; 56 text-decoration: none;
58 } 57 }
59 58
60 div.file-manager 59 div.file-manager
61 div.file-manager-button a:hover { 60 div.file-manager-button a:hover {
62 - border: 1px solid #006;  
63 - background: #acf;  
64 - color: #006; 61 + -moz-border-radius: 15px;
65 } 62 }
66 63
  64 +div#profile-editor-index div.control-panel {
  65 + padding: 10px;
  66 + -moz-border-radius: 15px;
  67 +}