Download as
Browse Code »

Commit 2db733500c57f8013a8c2dd6fb18867560d5ca83

Authored by Daniela Feitosa
2 parents c2be8df7 ca53f6f8
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/175' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/175

(ActionItem2340)
Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
plugins/bsc/public/style.css
  Diff comments   View file @2db7335
1 @import url(jquery.ui.spinner/ui.spinner.css); 1 @import url(jquery.ui.spinner/ui.spinner.css);
2 2
3 -.controller-profile_editor a.control-panel-bsc-enterprises {background-image: url(images/manage-bsc-enterprises.png)}  
4 -.controller-profile_editor .msie6 a.control-panel-bsc-enterprises {background-image: url(images/manage-bsc-enterprises.gif)} 3 +.controller-profile_editor a.control-panel-bsc-enterprises {background-image: url(/plugins/bsc/images/manage-bsc-enterprises.png)}
  4 +.controller-profile_editor .msie6 a.control-panel-bsc-enterprises {background-image: url(/plugins/bsc/images/manage-bsc-enterprises.gif)}
5 5
6 -.controller-profile_editor a.control-panel-transfer-enterprise-ownership {background-image: url(images/transfer-ownership.png)} 6 +.controller-profile_editor a.control-panel-transfer-enterprise-ownership {background-image: url(/plugins/bsc/images/transfer-ownership.png)}
7 7
8 .ui-spinner-up{ 8 .ui-spinner-up{
9 height: 6.5px !important; 9 height: 6.5px !important;
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 } 23 }
24 24
25 .icon-menu-bsc { 25 .icon-menu-bsc {
26 - background-image: url(images/manage-bsc-enterprises-icon.png); 26 + background-image: url(/plugins/bsc/images/manage-bsc-enterprises-icon.png);
27 } 27 }
28 28
29 #content .token-input-list { 29 #content .token-input-list {
plugins/stoa/public/style.css
  Diff comments   View file @2db7335
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
10 cursor: default; 10 cursor: default;
11 } 11 }
12 12
13 -.controller-profile_editor a.control-panel-invite-friends {background-image: url(../../plugins/stoa/images/control-panel/invite-friends.png)}  
14 -.controller-profile_editor .msie6 a.control-panel-invite-friends {background-image: url(../../plugins/stoa/images/control-panel/invite-friends.gif)} 13 +.controller-profile_editor a.control-panel-invite-friends {background-image: url(/plugins/stoa/images/control-panel/invite-friends.png)}
  14 +.controller-profile_editor .msie6 a.control-panel-invite-friends {background-image: url(/plugins/stoa/images/control-panel/invite-friends.gif)}
15 15
16 #signup-form small#usp-id-balloon { 16 #signup-form small#usp-id-balloon {
17 display: none; 17 display: none;