Skip to content

Commit

Permalink
Merge pull request #41 from marzeelabs/39_tweaks
Browse files Browse the repository at this point in the history
#39 Undo section shift
  • Loading branch information
Quicksaver committed Aug 16, 2018
2 parents b2cc592 + 5da7ed7 commit f3cf452
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
14 changes: 14 additions & 0 deletions components/homepage/Register.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ReactHtmlParser from 'react-html-parser';
import SVGElements from 'partials/SVGElements';
import TopHeader from 'partials/TopHeader';
import EndFooter from 'partials/EndFooter';
import MoreArrow from 'MoreArrow';

export default class Register extends BesugoComponent {
static config = {
Expand Down Expand Up @@ -70,6 +71,16 @@ export default class Register extends BesugoComponent {
));
}

renderMoreArrow(data) {
return (data.ticketurl) ? null : (
<MoreArrow
href="/#contacts"
label="Contact us"
selNext="#contacts-section"
/>
);
}

renderBlock() {
const data = this.getData();

Expand All @@ -85,6 +96,9 @@ export default class Register extends BesugoComponent {
<div className="register-options__wrapper">
{ this.renderTickets(data) }
</div>
<div className="register-component__morearrow-wrapper">
{ this.renderMoreArrow(data) }
</div>
</section>
);
}
Expand Down
10 changes: 1 addition & 9 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

{{ partial "homepage/intro.html" . }}
{{ partial "homepage/about.html" . }}

{{ if (ne $.Site.Data.settings.ticketurl "") }}
{{ partial "homepage/register.html" . }}
{{ end }}

{{ partial "homepage/register.html" . }}
{{ partial "homepage/schedule.html" . }}
{{ partial "homepage/map.html" . }}

Expand All @@ -15,10 +11,6 @@
{{ partial "homepage/partners.html" . }}
</div>

{{ if (eq $.Site.Data.settings.ticketurl "") }}
{{ partial "homepage/register.html" . }}
{{ end }}

{{ partial "homepage/contacts.html" . }}

{{ end }}
1 change: 1 addition & 0 deletions scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// Replace by yours
@import
"components/navigation",
"components/more-arrow",
"components/buttons",
"components/social-media",
"components/intro-section",
Expand Down
6 changes: 6 additions & 0 deletions scss/components/_register-section.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,9 @@
@extend .button-primary;
padding: ritmo(3) 40px;
}

.register-component__morearrow-wrapper {
padding-top: ritmo(8);
margin-bottom: ritmo(-8);
position: relative;
}

0 comments on commit f3cf452

Please sign in to comment.