Download as
Browse Code »

Commit 16dbdefcc2652ed38adfb0f5fe9e86db6b9600fb

Authored by Larissa Reis
1 parent ddab3c35
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] Avoids panel vertical overflow 

  Use scroll when the list of uploaded files is too big.
Showing 1 changed file with 12 additions and 10 deletions   Show diff stats
public/stylesheets/application.css
  Diff comments   View file @16dbdef
@@ -3631,6 +3631,8 @@ table.cms-articles .icon:hover { @@ -3631,6 +3631,8 @@ table.cms-articles .icon:hover {
3631 border: 1px solid #d3d7cf; 3631 border: 1px solid #d3d7cf;
3632 padding: 10px; 3632 padding: 10px;
3633 margin-bottom: 10px; 3633 margin-bottom: 10px;
  3634 + max-height: 550px;
  3635 + overflow-y: auto;
3634 } 3636 }
3635 3637
3636 .text-editor-sidebar .header { 3638 .text-editor-sidebar .header {
@@ -3657,7 +3659,7 @@ table.cms-articles .icon:hover { @@ -3657,7 +3659,7 @@ table.cms-articles .icon:hover {
3657 border: 1px solid #d3d7cf; 3659 border: 1px solid #d3d7cf;
3658 color: black; 3660 color: black;
3659 padding: 4px; 3661 padding: 4px;
3660 - background: white; 3662 + background: white;
3661 } 3663 }
3662 .text-editor-sidebar .icon-loading { 3664 .text-editor-sidebar .icon-loading {
3663 background-image: url(../images/loading-small.gif); 3665 background-image: url(../images/loading-small.gif);
@@ -3735,15 +3737,15 @@ table.cms-articles .icon:hover { @@ -3735,15 +3737,15 @@ table.cms-articles .icon:hover {
3735 .text-editor-sidebar .items .image-controls, 3737 .text-editor-sidebar .items .image-controls,
3736 .view-all-media .image-controls { 3738 .view-all-media .image-controls {
3737 display: none; 3739 display: none;
3738 - position: absolute;  
3739 - top: 5px;  
3740 - left: 5px; 3740 + position: absolute;
  3741 + top: 5px;
  3742 + left: 5px;
3741 line-height: 16px; 3743 line-height: 16px;
3742 } 3744 }
3743 3745
3744 .text-editor-sidebar .items .item:hover .image-controls, 3746 .text-editor-sidebar .items .item:hover .image-controls,
3745 .view-all-media .item:hover .image-controls { 3747 .view-all-media .item:hover .image-controls {
3746 - display: block; 3748 + display: block;
3747 } 3749 }
3748 3750
3749 .view-all-images .item:hover .image-controls { 3751 .view-all-images .item:hover .image-controls {
@@ -3752,15 +3754,15 @@ table.cms-articles .icon:hover { @@ -3752,15 +3754,15 @@ table.cms-articles .icon:hover {
3752 3754
3753 .text-editor-sidebar .items .file-controls, 3755 .text-editor-sidebar .items .file-controls,
3754 .view-all-media .file-controls { 3756 .view-all-media .file-controls {
3755 - margin-top: 5px; 3757 + margin-top: 5px;
3756 } 3758 }
3757 3759
3758 .text-editor-sidebar .items .image-controls .icon-zoom, 3760 .text-editor-sidebar .items .image-controls .icon-zoom,
3759 .view-all-media .image-controls .icon-zoom { 3761 .view-all-media .image-controls .icon-zoom {
3760 - background-image: url(../images/zoom-dark.png);  
3761 - display: block;  
3762 - width: 0px;  
3763 - margin-top: 4px; 3762 + background-image: url(../images/zoom-dark.png);
  3763 + display: block;
  3764 + width: 0px;
  3765 + margin-top: 4px;
3764 } 3766 }
3765 3767
3766 .text-editor-sidebar .media-upload-error { 3768 .text-editor-sidebar .media-upload-error {