merged master

2015-10-16 14:40:32 +02:00
parent b88eba9cc6 48e587e94c
commit 4e3784fb96
57 changed files with 1923 additions and 648 deletions
--- a/assets/css/src/newsletter_editor/common.styl
+++ b/assets/css/src/newsletter_editor/common.styl
@@ -205,7 +205,7 @@ select.mailpoet_font-size
    border-bottom-left-radius: 0

 .mailpoet_text_content p
-  margin: 0
+  margin: 1em 0

 .mailpoet_separator
  margin: 17px 20px
--- a/assets/css/src/newsletter_editor/contentBlocks/automatedLatestContent.styl
+++ b/assets/css/src/newsletter_editor/contentBlocks/automatedLatestContent.styl
@@ -6,7 +6,12 @@
  z-index: 19
  width: 100%
  height: 100%
-  background: rgba(255, 255, 255, 0.7)
+  background: rgba(255, 255, 255, 0)
+  transition: background .15s ease-out
+
+  &:hover
+    background: rgba(255, 255, 255, 0.7)
+    cursor: pointer

 .mailpoet_automated_latest_content_block_posts
  overflow: auto