Skip to content

fix: fixing weird vertical shift in event dashboard #3601

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

Merged
merged 6 commits into from
Nov 17, 2019
Merged

fix: fixing weird vertical shift in event dashboard #3601

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
58cf59f
Fix: fixing weird vertical shift in event dashboard
maze-runnar Nov 4, 2019
c6a98f6
Merge branch 'development' into patch-6
maze-runnar Nov 4, 2019
4f45e08
merging above if with this if
maze-runnar Nov 6, 2019
36a664a
Merge branch 'development' into patch-6
maze-runnar Nov 11, 2019
903f951
Merge branch 'development' into patch-6
maze-runnar Nov 13, 2019
333ff6b
Merge branch 'development' into patch-6
kushthedude Nov 17, 2019
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
16 changes: 9 additions & 7 deletions app/templates/events/view.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{{#if (or (eq session.currentRouteName 'events.view.index') (eq session.currentRouteName 'events.view.export'))}}
{{#if (eq model.state 'draft')}}
<div class="ui grid stackable">
<div class="row">
<div class="sixteen wide column">
{{unverified-user-message}}
{{#if unverified-user-message}}
{{#if (or (eq session.currentRouteName 'events.view.index') (eq session.currentRouteName 'events.view.export'))}}
{{#if (eq model.state 'draft')}}
Copy link
Member

@kushthedude kushthedude Nov 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make the above if merge with this.

Copy link
Contributor Author

@maze-runnar maze-runnar Nov 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not understanding, what you are saying?can you please explain?

Make the above if merge with this.

Copy link
Member

@kushthedude kushthedude Nov 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge the top if with this if

Copy link
Contributor Author

@maze-runnar maze-runnar Nov 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

<div class="ui grid stackable">
<div class="row">
<div class="sixteen wide column">
{{unverified-user-message}}
</div>
</div>
</div>
</div>
{{/if}}
{{/if}}
{{/if}}
{{#if (not-includes session.currentRouteName 'events.view.edit')}}
Expand Down