Commit ad12dbc5ede91d09a864ef75f46118d9695bada0
Committed by
Antonio Terceiro
1 parent
c3560658
Exists in
master
and in
29 other branches
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
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | 2 | ||
3 | <%= render :file => 'shared/tiny_mce' %> | 3 | <%= render :file => 'shared/tiny_mce' %> |
4 | 4 | ||
5 | -<div style='margin-left: 20px;'> | 5 | +<div> |
6 | <% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %> | 6 | <% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %> |
7 | <div> | 7 | <div> |
8 | <%= _('Title') %>: <%= @article.name %> | 8 | <%= _('Title') %>: <%= @article.name %> |
app/views/cms/upload_files.rhtml
@@ -20,5 +20,5 @@ | @@ -20,5 +20,5 @@ | ||
20 | <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5> | 20 | <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5> |
21 | 21 | ||
22 | <% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %> | 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 | <% end %> | 24 | <% end %> |
public/stylesheets/application.css
@@ -2536,7 +2536,7 @@ div#activation_enterprise div { | @@ -2536,7 +2536,7 @@ div#activation_enterprise div { | ||
2536 | width: 40%; | 2536 | width: 40%; |
2537 | height: 630px; | 2537 | height: 630px; |
2538 | border: none; | 2538 | border: none; |
2539 | - margin: 115px 20px 0px 0px; | 2539 | + margin: 104px 20px 0px 0px; |
2540 | padding: 0px; | 2540 | padding: 0px; |
2541 | overflow: hidden; | 2541 | overflow: hidden; |
2542 | } | 2542 | } |
@@ -2546,12 +2546,11 @@ div#activation_enterprise div { | @@ -2546,12 +2546,11 @@ div#activation_enterprise div { | ||
2546 | } | 2546 | } |
2547 | 2547 | ||
2548 | .controller-cms div.with_media_panel { | 2548 | .controller-cms div.with_media_panel { |
2549 | - width: 57%; | ||
2550 | float: left; | 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 | /* ==> public/stylesheets/controller_contact.css <== */ | 2556 | /* ==> public/stylesheets/controller_contact.css <== */ |