Download as
Browse Code »

Commit dd49b8f41b0c763c17c811e8ddd0917e9049f2a5

Authored by Rodrigo Souto
1 parent 21fb3fcc
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

[media-panel-improvements] Avoid file-name and percentage fields collapse

Showing 2 changed files with 20 additions and 2 deletions   Show diff stats
app/views/cms/_text_editor_sidebar.html.erb
  Diff comments   View file @dd49b8f
@@ -34,8 +34,9 @@ @@ -34,8 +34,9 @@
34 </div> 34 </div>
35 35
36 <script id="template-upload" type="text/x-tmpl"> 36 <script id="template-upload" type="text/x-tmpl">
37 - <div id="{%= S(o.name).slugify().s %}" class="upload">  
38 - {%=o.name%}<span class="percentage"></span> 37 + <div id="{%= S(o.name).slugify().s %}" class="upload" title="{%= o.name %}">
  38 + <div class="file-name">{%=o.name%}</div>
  39 + <div class="percentage"></div>
39 <div class="progress"><div class="bar" style="width: 0%;"></div></div> 40 <div class="progress"><div class="bar" style="width: 0%;"></div></div>
40 </div> 41 </div>
41 </script> 42 </script>
public/stylesheets/application.css
  Diff comments   View file @dd49b8f
@@ -3419,6 +3419,23 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] { @@ -3419,6 +3419,23 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
3419 text-align: center; 3419 text-align: center;
3420 } 3420 }
3421 3421
  3422 +#media-upload-box .upload .file-name,
  3423 +#media-upload-box .upload .percentage {
  3424 + display: inline-block;
  3425 +}
  3426 +
  3427 +#media-upload-box .upload .file-name{
  3428 + width: 87%;
  3429 + white-space: nowrap;
  3430 + overflow: hidden;
  3431 + text-overflow: ellipsis;
  3432 +}
  3433 +
  3434 +#media-upload-box .upload .percentage {
  3435 + width: 12%;
  3436 +}
  3437 +
  3438 +
3422 .text-editor-sidebar { 3439 .text-editor-sidebar {
3423 position: absolute; 3440 position: absolute;
3424 width: 280px; 3441 width: 280px;