Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #202 from mailpoet/newsletter_width

Browse Source 
Increase newsletter width to 660px from 600px
This commit is contained in:
Marco
2015-10-30 12:37:16 +01:00
parent c100130f39 f509dc0d7e
commit 136e09e9fb
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
assets/css/src/newsletter_editor/contentBlocks/container.styl
View File

@ -1,3 +1,8 @@
$column-margin = 20px
$one-column-width = $newsletter-width - (2 * $column-margin)
$two-column-width = ($newsletter-width / 2) - (2 * $column-margin)
$three-column-width = ($newsletter-width / 3) - (2 * $column-margin)
.mailpoet_container .mailpoet_container
width: 100% width: 100%
min-height: 15px min-height: 15px
@ -44,7 +49,7 @@
.mailpoet_container_horizontal > .mailpoet_container_block .mailpoet_container_horizontal > .mailpoet_container_block
margin-bottom: 0 margin-bottom: 0
width: 20px + 560px + 20px width: $column-margin + $one-column-width + $column-margin
// More than one column // 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
@ -57,14 +62,14 @@
& > .mailpoet_block:first-child:nth-last-child(2) ~ .mailpoet_block & > .mailpoet_block:first-child:nth-last-child(2) ~ .mailpoet_block
//padding-left: 20px //padding-left: 20px
//padding-right: 20px //padding-right: 20px
width: 260px + 20px + 20px width: $column-margin + $two-column-width + $column-margin
// Three columns // Three columns
& > .mailpoet_block:first-child:nth-last-child(3) & > .mailpoet_block:first-child:nth-last-child(3)
& > .mailpoet_block:first-child:nth-last-child(3) ~ .mailpoet_block & > .mailpoet_block:first-child:nth-last-child(3) ~ .mailpoet_block
//padding-left: 20px //padding-left: 20px
//padding-right: 20px //padding-right: 20px
width: 160px + 20px + 20px width: $column-margin + $three-column-width + $column-margin
.mailpoet_container_empty .mailpoet_container_empty
text-align: center text-align: center

2
assets/css/src/newsletter_editor/variables.styl
View File

@ -23,4 +23,4 @@ $warning-alternate-text-color = #f4c6c8
$error-text-color = #d54e21 $error-text-color = #d54e21
// Dimensions // Dimensions
$newsletter-width = 600px $newsletter-width = 660px

4
assets/js/src/newsletter_editor/blocks/image.js
View File

@ -297,9 +297,9 @@ define([
// Following advice from Becs, the target width should // Following advice from Becs, the target width should
// be a double of one column width to render well on // be a double of one column width to render well on
// retina screen devices // retina screen devices
targetImageWidth = 1200, targetImageWidth = 1320,
// For main image use the size, that's closest to being 600px in width // For main image use the size, that's closest to being 660px in width
sizeKeys = _.keys(sizes), sizeKeys = _.keys(sizes),
// Pick the width that is closest to target width // Pick the width that is closest to target width