Commit dd49b8f41b0c763c17c811e8ddd0917e9049f2a5
1 parent
21fb3fcc
Exists in
master
and in
27 other branches
[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
@@ -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
@@ -3419,6 +3419,23 @@ div.with_media_panel .formfield input[type="checkbox"] { | @@ -3419,6 +3419,23 @@ div.with_media_panel .formfield input[type="checkbox"] { | ||
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; |