Skip to content

Commit 1563113

Browse files
joeworkmanjoeworkman
committed
Merge branch 'release/v2.3.0'
2 parents dbfe45c + 5d2f0d9 commit 1563113

16 files changed

+3070
-16492
lines changed

‎.browserslistrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Browsers that we support
2+
last 2 versions
3+
ie >= 9
4+
ios >= 7
5+
android >= 4.4

‎dist/foundation-emails.css

+135-57
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ body {
2323
.ExternalClass span,
2424
.ExternalClass font,
2525
.ExternalClass td,
26+
.ExternalClass th,
2627
.ExternalClass div {
2728
line-height: 100%; }
2829

@@ -49,23 +50,22 @@ center {
4950
a img {
5051
border: none; }
5152

52-
p {
53-
margin: 0 0 0 10px;
54-
Margin: 0 0 0 10px; }
55-
5653
table {
5754
border-spacing: 0;
5855
border-collapse: collapse; }
5956

60-
td {
57+
td, th {
6158
word-wrap: break-word;
6259
-webkit-hyphens: auto;
6360
-moz-hyphens: auto;
6461
hyphens: auto;
6562
border-collapse: collapse !important; }
6663

67-
table, tr, td {
68-
padding: 0;
64+
table, tr, td, th {
65+
padding-top: 0;
66+
padding-right: 0;
67+
padding-bottom: 0;
68+
padding-left: 0;
6969
vertical-align: top;
7070
text-align: left; }
7171

@@ -107,37 +107,58 @@ th.column {
107107
Margin: 0 auto;
108108
padding-left: 16px;
109109
padding-bottom: 16px; }
110-
td.columns .column,
111-
td.columns .columns,
112-
td.column .column,
113-
td.column .columns,
114-
th.columns .column,
115-
th.columns .columns,
116-
th.column .column,
117-
th.column .columns {
118-
padding-left: 0 !important;
110+
td.columns .column.first,
111+
td.columns .columns.first,
112+
td.column .column.first,
113+
td.column .columns.first,
114+
th.columns .column.first,
115+
th.columns .columns.first,
116+
th.column .column.first,
117+
th.column .columns.first {
118+
padding-left: 0 !important; }
119+
td.columns .column.last,
120+
td.columns .columns.last,
121+
td.column .column.last,
122+
td.column .columns.last,
123+
th.columns .column.last,
124+
th.columns .columns.last,
125+
th.column .column.last,
126+
th.column .columns.last {
119127
padding-right: 0 !important; }
120-
td.columns .column center,
121-
td.columns .columns center,
122-
td.column .column center,
123-
td.column .columns center,
124-
th.columns .column center,
125-
th.columns .columns center,
126-
th.column .column center,
127-
th.column .columns center {
128-
min-width: none !important; }
128+
td.columns .column center,
129+
td.columns .columns center,
130+
td.column .column center,
131+
td.column .columns center,
132+
th.columns .column center,
133+
th.columns .columns center,
134+
th.column .column center,
135+
th.column .columns center {
136+
min-width: none !important; }
129137

130138
td.columns.last,
131139
td.column.last,
132140
th.columns.last,
133141
th.column.last {
134142
padding-right: 16px; }
135143

136-
td.columns table:not(.button),
137-
td.column table:not(.button),
138-
th.columns table:not(.button),
139-
th.column table:not(.button) {
144+
td.columns table,
145+
td.column table,
146+
th.columns table,
147+
th.column table {
140148
width: 100%; }
149+
td.columns table.button,
150+
td.column table.button,
151+
th.columns table.button,
152+
th.column table.button {
153+
width: auto; }
154+
td.columns table.button.expand, td.columns table.button.expanded,
155+
td.column table.button.expand,
156+
td.column table.button.expanded,
157+
th.columns table.button.expand,
158+
th.columns table.button.expanded,
159+
th.column table.button.expand,
160+
th.column table.button.expanded {
161+
width: 100%; }
141162

142163
td.large-1,
143164
th.large-1 {
@@ -777,7 +798,7 @@ th.float-center {
777798
text-align: center; }
778799

779800
.hide-for-large {
780-
display: none !important;
801+
display: none;
781802
mso-hide: all;
782803
overflow: hidden;
783804
max-height: 0;
@@ -824,16 +845,18 @@ h5,
824845
h6,
825846
p,
826847
td,
827-
th,
828-
a {
848+
th {
829849
color: #0a0a0a;
830850
font-family: Helvetica, Arial, sans-serif;
831851
font-weight: normal;
832-
padding: 0;
852+
padding-top: 0;
853+
padding-right: 0;
854+
padding-bottom: 0;
855+
padding-left: 0;
833856
margin: 0;
834857
Margin: 0;
835858
text-align: left;
836-
line-height: 1.3; }
859+
line-height: 130%; }
837860

838861
h1,
839862
h2,
@@ -861,7 +884,7 @@ h4 {
861884
font-size: 24px; }
862885

863886
h5 {
864-
font-size: 20px; }
887+
font-size: 19px; }
865888

866889
h6 {
867890
font-size: 18px; }
@@ -872,14 +895,14 @@ p,
872895
td,
873896
th {
874897
font-size: 16px;
875-
line-height: 1.3; }
898+
line-height: 130%; }
876899

877900
p {
878901
margin-bottom: 10px;
879902
Margin-bottom: 10px; }
880903
p.lead {
881904
font-size: 20px;
882-
line-height: 1.6; }
905+
line-height: 160%; }
883906
p.subheader {
884907
margin-top: 4px;
885908
margin-bottom: 8px;
@@ -889,13 +912,19 @@ p {
889912
line-height: 1.4;
890913
color: #8a8a8a; }
891914

892-
small {
915+
small
916+
.small {
893917
font-size: 80%;
894918
color: #cacaca; }
895919

896920
a {
897921
color: #2199e8;
898-
text-decoration: none; }
922+
text-decoration: none;
923+
font-family: Helvetica, Arial, sans-serif;
924+
font-weight: normal;
925+
padding: 0;
926+
text-align: left;
927+
line-height: 130%; }
899928
a:hover {
900929
color: #147dc2; }
901930
a:active {
@@ -930,18 +959,42 @@ pre {
930959
color: #ff6908;
931960
font-weight: bold; }
932961

933-
table.hr {
934-
width: 100%; }
935-
table.hr th {
936-
height: 0;
937-
max-width: 580px;
938-
border-top: 0;
939-
border-right: 0;
940-
border-bottom: 1px solid #0a0a0a;
941-
border-left: 0;
942-
margin: 20px auto;
943-
Margin: 20px auto;
944-
clear: both; }
962+
td.columns table.hr table,
963+
td.column table.hr table,
964+
th.columns table.hr table,
965+
th.column table.hr table, td.columns
966+
table.h-line table,
967+
td.column
968+
table.h-line table,
969+
th.columns
970+
table.h-line table,
971+
th.column
972+
table.h-line table {
973+
width: auto; }
974+
975+
table.hr th,
976+
table.h-line th {
977+
padding-bottom: 20px;
978+
text-align: center; }
979+
980+
table.hr table,
981+
table.h-line table {
982+
display: inline-block;
983+
margin: 0;
984+
Margin: 0; }
985+
986+
table.hr td,
987+
table.h-line td {
988+
width: 580px;
989+
height: 0;
990+
padding-top: 20px;
991+
clear: both;
992+
border-top: 0;
993+
border-right: 0;
994+
border-bottom: 1px solid #0a0a0a;
995+
border-left: 0;
996+
font-size: 0;
997+
line-height: 0; }
945998

946999
.stat {
9471000
font-size: 40px;
@@ -962,6 +1015,15 @@ span.preheader {
9621015
opacity: 0;
9631016
overflow: hidden; }
9641017

1018+
@media only screen {
1019+
a[x-apple-data-detectors] {
1020+
color: inherit !important;
1021+
text-decoration: none !important;
1022+
font-size: inherit !important;
1023+
font-family: inherit !important;
1024+
font-weight: inherit !important;
1025+
line-height: inherit !important; } }
1026+
9651027
table.button {
9661028
width: auto;
9671029
margin: 0 0 16px 0;
@@ -977,6 +1039,7 @@ table.button {
9771039
font-weight: bold;
9781040
color: #fefefe;
9791041
text-decoration: none;
1042+
text-align: left;
9801043
display: inline-block;
9811044
padding: 8px 16px 8px 16px;
9821045
border: 0 solid #2199e8;
@@ -1021,7 +1084,7 @@ table.button.large table a {
10211084

10221085
table.button.expand,
10231086
table.button.expanded {
1024-
width: 100% !important; }
1087+
width: 100%; }
10251088
table.button.expand table,
10261089
table.button.expanded table {
10271090
width: 100%; }
@@ -1121,7 +1184,7 @@ th.callout-inner {
11211184
background: #fefefe; }
11221185
th.callout-inner.primary {
11231186
background: #def0fc;
1124-
border: 1px solid #444444;
1187+
border: 1px solid #0f5f94;
11251188
color: #0a0a0a; }
11261189
th.callout-inner.secondary {
11271190
background: #ebebeb;
@@ -1130,15 +1193,15 @@ th.callout-inner {
11301193
th.callout-inner.success {
11311194
background: #e1faea;
11321195
border: 1px solid #1b9448;
1133-
color: #fefefe; }
1196+
color: #0a0a0a; }
11341197
th.callout-inner.warning {
11351198
background: #fff3d9;
11361199
border: 1px solid #996800;
1137-
color: #fefefe; }
1200+
color: #0a0a0a; }
11381201
th.callout-inner.alert {
11391202
background: #fce6e2;
11401203
border: 1px solid #b42912;
1141-
color: #fefefe; }
1204+
color: #0a0a0a; }
11421205

11431206
.thumbnail {
11441207
border: solid 4px #fefefe;
@@ -1181,7 +1244,22 @@ table.menu.text-center a {
11811244
text-align: center; }
11821245

11831246
.menu[align="center"] {
1184-
width: auto !important; }
1247+
width: auto; }
1248+
1249+
.menu:not(.float-center) .menu-item:first-child {
1250+
padding-left: 0 !important; }
1251+
1252+
.menu:not(.float-center) .menu-item:last-child {
1253+
padding-right: 0 !important; }
1254+
1255+
.menu.vertical .menu-item {
1256+
padding-left: 0 !important;
1257+
padding-right: 0 !important; }
1258+
1259+
@media only screen and (max-width: 596px) {
1260+
.menu.small-vertical .menu-item {
1261+
padding-left: 0 !important;
1262+
padding-right: 0 !important; } }
11851263

11861264
body.outlook p {
11871265
display: inline !important; }

‎dist/foundation-emails.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/pages/gem-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ rails g inky:install
4141

4242
Rename your email templates to use the `.inky` file extension. Note that you'll still be able to use ERB within the `.inky` templates:
4343

44-
```
44+
```ruby
4545
welcome.html => welcome.html.inky
4646
pw_reset.html.erb => pw_reset.html.inky
4747
```

‎docs/pages/inky.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Essentially, it is just custom HTML tags. Things like `<row>` and `<columns>` ar
4949

5050
**How does it work?**
5151

52-
We run a Gulp task that runs through your code, identifies our custom Inky tags, and translates them into valid HTML. For the more tech-savvy, you can [check out our task on our Github Repo](https://github.com/zurb/foundation-emails/blob/v2.0/gulpfile.js#L149).
52+
We run a Gulp task that runs through your code, identifies our custom Inky tags, and translates them into valid HTML. For the more tech-savvy, you can [check out our task on our Github Repo](https://github.com/foundation/foundation-emails/blob/v2.0.0/gulpfile.js#L149).
5353

5454
<a id="how-to-inky"></a>
5555
**How do I start Inky?**

0 commit comments

Comments
 (0)