Download as
Browse Code »

Commit 0f915d52b74b86008b6d6089dc6cd60c76e8e616

Authored by Victor Costa
1 parent cf94bc1e
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

container_block: fix edition layout

Showing 3 changed files with 25 additions and 9 deletions   Show diff stats
plugins/container_block/public/style.css
  Diff comments   View file @0f915d5
  1 +#box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar {
  2 + height: auto;
  3 + padding-bottom: 0px;
  4 + width: auto;
  5 +}
  6 +
1 7 #content .boxes .container-block-plugin_container-block .container_block_child, .container-block-plugin_container-block .block-outer {
2 8 display: inline-block;
3 9 vertical-align: top;
... ... @@ -17,14 +23,10 @@
17 23 background-image: url(/designs/icons/default/Tango/16x16/actions/go-previous.png);
18 24 }
19 25  
20   -#content .boxes .container-block-plugin_container-block .block {
21   - outline-offset: -2px;
22   -}
23   -
24 26 #content .boxes .container-block-plugin_container-block .block .ui-resizable-handle {
25 27 width: 10px;
26 28 height: 28px;
27   - z-index: 0;
  29 + z-index: 1000;
28 30 }
29 31  
30 32 #content .boxes .container-block-plugin_container-block .block .ui-resizable-e {
... ... @@ -37,6 +39,20 @@
37 39 background-image: url(/plugins/container_block/images/handle_w.png);
38 40 }
39 41  
40   -.container-block-plugin_container-block .button-bar .icon-resize {
  42 +.container-block-plugin_container-block .container-block-button-bar .icon-resize {
41 43 background-image: url(/designs/icons/default/Tango/16x16/actions/view-fullscreen.png);
42 44 }
  45 +
  46 +#box-organizer .block .container-block-button-bar {
  47 + right: 0px;
  48 + bottom: 0px;
  49 +}
  50 +
  51 +#box-organizer .container-block-plugin_container-block:hover .block {
  52 + outline: 1px dashed black;
  53 + outline-offset: -1px;
  54 +}
  55 +
  56 +.container-block-plugin_container-block .block-target {
  57 + background: #afd;
  58 +}
... ...
plugins/container_block/views/blocks/container.rhtml
  Diff comments   View file @0f915d5
... ... @@ -15,7 +15,7 @@
15 15 </style>
16 16  
17 17 <% if edit_mode %>
18   - <div class="button-bar">
  18 + <div class="container-block-button-bar button-bar">
19 19 <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
20 20 <%= link_to_remote '', :url => { :controller => @controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id },
21 21 :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})",
... ...
public/stylesheets/application.css
  Diff comments   View file @0f915d5
... ... @@ -1727,8 +1727,8 @@ a.button.disabled, input.disabled {
1727 1727 display: none;
1728 1728 }
1729 1729  
1730   -#box-organizer .block:focus .button-bar,
1731   -#box-organizer .block:hover .button-bar {
  1730 +#box-organizer .block-outer:focus .button-bar,
  1731 +#box-organizer .block-outer:hover .button-bar {
1732 1732 display: block;
1733 1733 }
1734 1734  
... ...