Skip to content

Commit

Permalink
Merge pull request #26 from meshhq/feature/custom-colors
Browse files Browse the repository at this point in the history 
Feature/custom colors
  • Loading branch information
@kcoleman731
kcoleman731 authored Apr 1, 2019
2 parents 4a3d9cd + 7c70df1 commit e3aae9c
Show file tree
Hide file tree
Showing 17 changed files with 166 additions and 90 deletions.
2 changes: 1 addition & 1 deletion dist/templates/confirmation.html
View file

Large diffs are not rendered by default.

81 changes: 50 additions & 31 deletions dist/templates/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ img {

center {
width: 100%;
min-width: 580px; }
min-width: 540px; }

a img {
border: none; }
Expand Down Expand Up @@ -62,7 +62,7 @@ table.body {

table.container {
background: #fefefe;
width: 580px;
width: 540px;
margin: 0 auto;
Margin: 0 auto;
text-align: inherit; }
Expand Down Expand Up @@ -96,7 +96,7 @@ th.columns table:not(.button) {
width: 100%; }

th.large-6 {
width: 274px;
width: 254px;
padding-left: 8px;
padding-right: 8px; }

Expand All @@ -110,7 +110,7 @@ th.large-6.last {
width: 50%; }

th.large-12 {
width: 564px;
width: 524px;
padding-left: 8px;
padding-right: 8px; }

Expand All @@ -121,7 +121,7 @@ th.large-12.last {
padding-right: 16px; }

th.large-12 center {
min-width: 532px; }
min-width: 492px; }

td.expander,
th.expander {
Expand All @@ -133,6 +133,7 @@ h1.text-center,
p.text-center {
text-align: center; }

h6.text-right,
p.text-right {
text-align: right; }

Expand All @@ -152,6 +153,7 @@ th.float-center {
body,
table.body,
h1,
h6,
p,
td,
th,
Expand All @@ -165,7 +167,8 @@ a {
text-align: left;
line-height: 1.75; }

h1 {
h1,
h6 {
color: inherit;
word-wrap: normal;
font-family: Avenir, Helvetica, Arial, sans-serif;
Expand All @@ -176,6 +179,9 @@ h1 {
h1 {
font-size: 34px; }

h6 {
font-size: 18px; }

body,
table.body,
p,
Expand Down Expand Up @@ -242,14 +248,21 @@ table.button:active table tr td a,
table.button table tr td a:visited,
table.button.small:hover table tr td a,
table.button.small:active table tr td a,
table.button.small table tr td a:visited {
table.button.small table tr td a:visited,
table.button.large:hover table tr td a,
table.button.large:active table tr td a,
table.button.large table tr td a:visited {
color: #fefefe; }

table.button.small table td,
table.button.small table a {
padding: 5px 10px 5px 10px;
font-size: 14px; }

table.button.large table a {
padding: 10px 20px 10px 20px;
font-size: 20px; }

table.button.expanded {
width: 100% !important; }
table.button.expanded table {
Expand All @@ -274,7 +287,7 @@ table.button:active table a {
border: 0 solid #0b1511; }

table.menu {
width: 580px; }
width: 540px; }
table.menu th.menu-item {
padding: 10px;
padding-right: 10px; }
Expand All @@ -291,7 +304,7 @@ table.menu.vertical th.menu-item {
.menu[align="center"] {
width: auto !important; }

@media only screen and (max-width: 596px) {
@media only screen and (max-width: 556px) {
table.body img {
width: auto;
height: auto; }
Expand All @@ -309,12 +322,12 @@ table.menu.vertical th.menu-item {
table.body .columns .columns {
padding-left: 0 !important;
padding-right: 0 !important; }
th.small-6 {
display: inline-block !important;
width: 50% !important; }
th.small-12 {
display: inline-block !important;
width: 100% !important; }
.columns th.small-12 {
display: block !important;
width: 100% !important; }
table.menu {
width: 100% !important; }
table.menu td,
Expand All @@ -332,11 +345,8 @@ html,
.body {
background: white !important; }

@media screen and (max-width: 800px) {
.clubhub-email-body {
width: 100vw !important; } }

h1,
h6,
p,
a,
ul {
Expand All @@ -346,11 +356,25 @@ ul {

h1 {
font-weight: 700;
font-size: 32px; }
font-size: 24px; }
@media screen and (min-width: 596px) {
h1 {
font-size: 32px !important; } }

h6 {
font-weight: 500;
color: #cacaca;
font-size: 14px; }
@media screen and (min-width: 800px) {
h6 {
font-size: 18px !important; } }

p {
font-size: 18px;
word-break: normal; }
word-break: normal;
font-size: 16px; }
@media screen and (min-width: 596px) {
p {
font-size: 18px !important; } }

.light-text {
font-weight: 300; }
Expand All @@ -370,11 +394,14 @@ img {
min-width: 100%; }

.image-container {
height: 300px;
height: 240px;
min-width: 100%;
overflow: hidden;
background-color: #f3f3f3;
vertical-align: middle; }
@media only screen and (min-width: 596px) {
.image-container {
height: 320px !important; } }

.logo-col {
padding: 18px 0px; }
Expand Down Expand Up @@ -409,7 +436,7 @@ img {
.container.footer p,
.container.footer a {
color: #AEBDC4;
font-size: 12px;
font-size: 12px !important;
font-weight: 500; }
.container.footer ul {
padding-left: 0px; }
Expand Down Expand Up @@ -444,20 +471,12 @@ table.button table td {
margin-bottom: 0px !important; }

.event-body a {
line-height: 1.75rem; }
line-height: 1.75rem;
text-decoration: underline; }

.event-body .align-text-right {
text-align: right; }

.event-body .detail-header {
font-size: 16px;
font-weight: 500;
color: #cacaca; }

.event-body .detail-content {
font-size: 22px;
line-height: 2.5rem; }

.event-body .detail-link {
font-weight: 500;
color: #1d362c; }
Expand Down
2 changes: 1 addition & 1 deletion dist/templates/event.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/templates/generic.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/templates/index.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/templates/post.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/transform/transform.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports.BuildGenericContent = (content, club) => {
};
exports.BuildEventContent = (event, club, link) => {
const date = new Date(event.start);
var dateOptions = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
var dateOptions = { weekday: 'short', year: 'numeric', month: 'long', day: 'numeric' };
var timeOptions = { hour: 'numeric', minute: 'numeric' };
const richContent = {
name: event.name,
Expand Down
61 changes: 55 additions & 6 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"index.js"
],
"dependencies": {
"club-hub-core": "https://git@github.com/meshhq/club-hub-core.git#0.0.45",
"club-hub-core": "https://git@github.com/meshhq/club-hub-core.git#0.0.46",
"feather-icons": "^4.17.0",
"handlebars": "^4.1.0",
"jsdom": "^14.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/templates/assets/scss/_settings.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $dark-gray: #8a8a8a;
$black: #495057;
$white: #fefefe;
$pre-color: #ff6908;
$global-width: 580px;
$global-width: 540px;
$global-width-small: 95%;
$global-gutter: 16px;
$body-background: $light-gray;
Expand Down
14 changes: 2 additions & 12 deletions src/templates/assets/scss/template/_event.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,14 @@
}

a {
line-height: 1.75rem;
line-height: 1.75rem;
text-decoration: underline;
}

.align-text-right {
text-align: right;
}

.detail-header {
font-size: 16px;
font-weight: 500;
color: $medium-gray;
}

.detail-content {
font-size: 22px;
line-height: 2.5rem;
}

.detail-link {
font-weight: 500;
color: $primary-color;
Expand Down
2 changes: 1 addition & 1 deletion src/templates/assets/scss/template/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
p,
a {
color: #AEBDC4;
font-size: 12px;
font-size: 12px !important;
font-weight: 500;
}

Expand Down
Loading

0 comments on commit e3aae9c

Please sign in to comment.