Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: standarize all pages to same #5152

Merged
merged 6 commits into from
Sep 28, 2020
Merged

fix: standarize all pages to same #5152

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a518bf2
standarize all pages to same
maze-runnar Sep 25, 2020
5b1b288
just quick
maze-runnar Sep 25, 2020
48d3e65
making changes as required
maze-runnar Sep 28, 2020
49aa5e6
app pages spacing problem fix
maze-runnar Sep 28, 2020
9722e20
removing top tab.
maze-runnar Sep 28, 2020
0dacc50
Merge branch 'development' into stndard
mariobehling Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions app/templates/attendee-app.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<div class='ui secondary pointing menu'>
<a href="#" class='active item'>
{{t 'Attendee App'}}
</a>
</div>
<div class="ui segment">
<div class="content">
<img class="ui fluid image" src="/images/attendee-app.jpg" alt="Open Event Attendee App">
<div class="public-event ui relaxed grid">
<div class="sixteen wide column lead {{if this.smallLead 'small'}}" style = "height:200px;">
<Widgets::SafeImage class="background" @src="/images/app-landing-header.jpg" />
<div class="content">
<div class="ui container">
<div class="ui info d-flex">
<div>
<h1 class="event name">Attendee App</h1>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui center aligned container mt-8 mb-8">
<h1 class="weight-500 ui huge center aligned header">
{{t 'Open Event Attendee App'}}
</h1>
Expand Down Expand Up @@ -35,7 +41,7 @@
<img class="ui fluid image" src="images/android-img.jpg" alt="{{t 'Android Attendee App'}}">
{{else}}
<div class="ui grid">
<div class="eight wide column">
<div class="ten wide column">
<h1 class="weight-900">
{{t 'Get Your Next Experience of Open Event'}}
</h1>
Expand Down Expand Up @@ -83,15 +89,17 @@
</h3>
</div>
</div>
<div class="eight wide column">
<div class="six wide column">
<img class="ui medium image" src="/images/android-img.jpg" alt="Android Pic">
</div>
</div>
{{/if}}
</div>
<div class="ui center aligned muted text">
<div class="ui center aligned muted text mb-8">
{{t 'Please Check-Out our Organizer App'}}
<a class="item" href="{{href-to 'organizer-app'}}">{{t 'Here'}}</a>
<div class="ui hidden divider"></div>
</div>

<div class="ui center aligned secondary large segment mt-8" style="margin-bottom:-10px;border:none">
Still have questions? <a href="https://support.eventyay.com/">Visit our FAQ</a> to find answers.
</div>
31 changes: 20 additions & 11 deletions app/templates/organizer-app.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<div class='ui secondary pointing menu'>
<a href="#" class='active item'>
{{t 'Organizer App'}}
</a>
</div>
<div class="ui segment">
<div class="content">
<img class="ui fluid image" src="/images/organizer-app.jpg" alt="Open Event Organizer App">
<div class="public-event ui relaxed grid">
<div class="sixteen wide column lead {{if this.smallLead 'small'}}" style = "height:200px;">
<Widgets::SafeImage class="background" @src="/images/app-landing-header.jpg" />
<div class="content">
<div class="ui container">
<div class="ui info d-flex">
<div>
<h1 class="event name">Organizer App</h1>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui thirteen column center aligned container mt-8 mb-8">
<h1 class="weight-500 ui huge center aligned header">
{{t 'Open Event Organizer App'}}
</h1>
Expand Down Expand Up @@ -35,7 +41,7 @@
<img class="ui fluid image" src="images/organizer-android.jpg" alt="{{t 'Organizer Android App'}}">
{{else}}
<div class="ui grid">
<div class="eight wide column">
<div class="ten wide column">
<h1 class="weight-900">
{{t 'Make your event success with Orga App'}}
</h1>
Expand Down Expand Up @@ -83,14 +89,17 @@
</h3>
</div>
</div>
<div class="eight wide column">
<div class="six wide column">
<img class="ui medium image" src="/images/organizer-android.jpg" alt="Android Pic">
</div>
</div>
{{/if}}
</div>
<div class="ui center aligned muted text">
<div class="ui center aligned muted text mb-8">
{{t 'Please Check-Out our Attendee App'}}
<a class="item" href="{{href-to 'attendee-app'}}" rel="noopener noreferrer">{{t 'Here'}}</a>
<div class="ui hidden divider"></div>
</div>
<div class="ui center aligned large secondary segment mt-8" style="margin-bottom:-10px;border:none">
Still have questions? <a href="https://support.eventyay.com/">Visit our FAQ</a> to find answers.
</div>
22 changes: 17 additions & 5 deletions app/templates/pages.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<div class="ui segment">
<div class="ui grid">
<div class="sixteen wide column">
<h1 class="ui header">{{this.model.name}}</h1>
<div>{{sanitize this.model.description}}</div>
<div class="public-event ui relaxed grid">
<div class="sixteen wide column lead {{if this.smallLead 'small'}}" style = "height:200px">
<Widgets::SafeImage class="background" @src="/images/landing.jpg" />
<div class="content">
<div class="ui container">
<div class="ui info d-flex">
<div>
<h1 class="event name">{{this.model.title}}</h1>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui thirteen column container mt-8 mb-8">
<div>{{sanitize this.model.description}}</div>
</div>
<div class="ui center aligned secondary large segment mt-8" style="margin-bottom:-10px;border:none">
Still have questions? <a href="https://support.eventyay.com/">Visit our FAQ</a> to find answers.
</div>
13 changes: 11 additions & 2 deletions app/templates/pricing.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<div class="public-event ui relaxed grid">
<div class="sixteen wide column lead {{if this.smallLead 'small'}}" style={{css max-height="300px"}}>
<Widgets::SafeImage class="background" @src="/images/pricing-header.jpg" />
<div class="sixteen wide column lead {{if this.smallLead 'small'}}" style = "height:200px">
<Widgets::SafeImage class="background" @src="/images/landing.jpg" />
<div class="content">
<div class="ui container">
<div class="ui info d-flex">
<div>
<h1 class="event name">Pricing</h1>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui thirteen column center aligned container mt-8">
Expand Down
Binary file added public/images/app-landing-header.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.