Download as
Browse Code »

Commit ad12dbc5ede91d09a864ef75f46118d9695bada0

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent c3560658
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

Fixing width of forms on cms edition 

* Changing size of upload_file_form
  * Removing margin of div when media panel is not enabled on environment
  * Adding width to input fields

(ActionItem1484)
Showing 3 changed files with 6 additions and 7 deletions   Show diff stats
app/views/cms/_tiny_mce_article.rhtml
  Diff comments   View file @ad12dbc
... ... @@ -2,7 +2,7 @@
2 2  
3 3 <%= render :file => 'shared/tiny_mce' %>
4 4  
5   -<div style='margin-left: 20px;'>
  5 +<div>
6 6 <% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %>
7 7 <div>
8 8 <%= _('Title') %>: <%= @article.name %>
... ...
app/views/cms/upload_files.rhtml
  Diff comments   View file @ad12dbc
... ... @@ -20,5 +20,5 @@
20 20 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
21 21  
22 22 <% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
23   - <%= render :partial => 'upload_file_form', :locals => { :size => '50'} %>
  23 + <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
24 24 <% end %>
... ...
public/stylesheets/application.css
  Diff comments   View file @ad12dbc
... ... @@ -2536,7 +2536,7 @@ div#activation_enterprise div {
2536 2536 width: 40%;
2537 2537 height: 630px;
2538 2538 border: none;
2539   - margin: 115px 20px 0px 0px;
  2539 + margin: 104px 20px 0px 0px;
2540 2540 padding: 0px;
2541 2541 overflow: hidden;
2542 2542 }
... ... @@ -2546,12 +2546,11 @@ div#activation_enterprise div {
2546 2546 }
2547 2547  
2548 2548 .controller-cms div.with_media_panel {
2549   - width: 57%;
2550 2549 float: left;
2551 2550 }
2552   -.controller-cms div.no_media_panel {
2553   - margin-left: 200px;
2554   - margin-right: 200px;
  2551 +
  2552 +div.with_media_panel .formfield input {
  2553 + width: 100%;
2555 2554 }
2556 2555  
2557 2556 /* ==> public/stylesheets/controller_contact.css <== */
... ...