Download as
Browse Code »

Commit 16dbdefcc2652ed38adfb0f5fe9e86db6b9600fb

Authored by Larissa Reis
1 parent ddab3c35
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[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 3631 border: 1px solid #d3d7cf;
3632 3632 padding: 10px;
3633 3633 margin-bottom: 10px;
  3634 + max-height: 550px;
  3635 + overflow-y: auto;
3634 3636 }
3635 3637  
3636 3638 .text-editor-sidebar .header {
... ... @@ -3657,7 +3659,7 @@ table.cms-articles .icon:hover {
3657 3659 border: 1px solid #d3d7cf;
3658 3660 color: black;
3659 3661 padding: 4px;
3660   - background: white;
  3662 + background: white;
3661 3663 }
3662 3664 .text-editor-sidebar .icon-loading {
3663 3665 background-image: url(../images/loading-small.gif);
... ... @@ -3735,15 +3737,15 @@ table.cms-articles .icon:hover {
3735 3737 .text-editor-sidebar .items .image-controls,
3736 3738 .view-all-media .image-controls {
3737 3739 display: none;
3738   - position: absolute;
3739   - top: 5px;
3740   - left: 5px;
  3740 + position: absolute;
  3741 + top: 5px;
  3742 + left: 5px;
3741 3743 line-height: 16px;
3742 3744 }
3743 3745  
3744 3746 .text-editor-sidebar .items .item:hover .image-controls,
3745 3747 .view-all-media .item:hover .image-controls {
3746   - display: block;
  3748 + display: block;
3747 3749 }
3748 3750  
3749 3751 .view-all-images .item:hover .image-controls {
... ... @@ -3752,15 +3754,15 @@ table.cms-articles .icon:hover {
3752 3754  
3753 3755 .text-editor-sidebar .items .file-controls,
3754 3756 .view-all-media .file-controls {
3755   - margin-top: 5px;
  3757 + margin-top: 5px;
3756 3758 }
3757 3759  
3758 3760 .text-editor-sidebar .items .image-controls .icon-zoom,
3759 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 3768 .text-editor-sidebar .media-upload-error {
... ...