Merge pull request #1369 from mailpoet/posts-alc-image

Multi-column layout in ALC/Posts [MAILPOET-1350]
2018-06-04 07:37:56 -04:00
parent 24b63d324b 67b66856f5
commit 59d632895e
24 changed files with 1153 additions and 246 deletions
--- a/assets/css/src/newsletter_editor/contentBlocks/automatedLatestContent.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/automatedLatestContent.styl
@@ -14,7 +14,7 @@
    cursor: pointer

 .mailpoet_automated_latest_content_block_posts
-  overflow: auto
+  overflow: hidden
  pointer-events: none

  & > .mailpoet_block
--- a/assets/css/src/newsletter_editor/contentBlocks/container.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/container.styl
@@ -52,7 +52,9 @@ $three-column-width = ($newsletter-width / 3) - (2 * $column-margin)
    width: $column-margin + $one-column-width + $column-margin

  // More than one column
-  & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal
+  & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal,
+  & > .mailpoet_container_block > .mailpoet_container > .mailpoet_posts_block > .mailpoet_posts_container > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal,
+  & > .mailpoet_container_block > .mailpoet_container .mailpoet_automated_latest_content_block_posts .mailpoet_container_horizontal

    // Column number detection technique found here:
    // http://stackoverflow.com/questions/8720931/can-css-detect-the-number-of-children-an-element-has
--- a/assets/css/src/newsletter_editor/contentBlocks/posts.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/posts.styl
@@ -54,3 +54,6 @@

 .mailpoet_post_selection_loading
  color: #999
+
+.mailpoet_posts_container > .mailpoet_droppable_block
+  width: 100%