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.

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

Removed quickpost from authenticated index page and moved bibleverse up #814

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 37 additions & 22 deletions app/components/index/authenticated.hbs
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
<EmberWormhole @to='navbar-wormhole'>
<PageActionsButtons @pageActions={{pageActions}}>
<Tools::BoardRoomPresence />
<div class='col col-md-auto page-action d-md-none'>
<LinkTo @route='quickpost'>
<button type='button' class='btn btn-primary' title='quickpost'>
<FaIcon @icon='comments' />
<span class='d-none d-md-inline'> Quickpost </span>
</button>
</LinkTo>
</div>
</PageActionsButtons>
</EmberWormhole>

Expand All @@ -24,14 +16,20 @@
<AdvertisementTool />
</div>

<div class='row pt-4'>
<div class='col-7 d-none d-md-block'>
<div class='article-cards-wrapper full-width-small-screens ps-3 ps-md-0'>
<Index::SponsorkliksAlert />
</div>
<QuickPost />
{{!-- Desktop version --}}
<div class="row pt-4 mx-n2 d-none d-md-flex">
<div class="col-12 col-md-6 px-2">
<Index::SponsorkliksAlert />
<Tools::DailyVerse />
{{#if (can 'show photo-albums')}}
<Tools::RecentPhotos />
{{/if}}
{{#if (can 'show polls')}}
<Tools::RecentPolls />
{{/if}}
</div>
<div class='col-12 col-md-5'>

<div class="col-12 col-md-6 px-2">
{{#if (can 'show activities')}}
{{#if (can 'create form/responses')}}
<Tools::ClosingActivities />
Expand All @@ -44,12 +42,29 @@
{{#if (can 'show forum/posts')}}
<Tools::ForumPosts />
{{/if}}
{{#if (can 'show polls')}}
<Tools::RecentPolls />
{{/if}}
{{#if (can 'show photo-albums')}}
<Tools::RecentPhotos />
{{/if}}
<Tools::DailyVerse />
</div>
</div>

{{!-- Mobile version --}}
<div class="row pt-4 mx-n2 d-flex d-md-none">
<Index::SponsorkliksAlert />
<Tools::DailyVerse />
{{#if (can 'show activities')}}
{{#if (can 'create form/responses')}}
<Tools::ClosingActivities />
{{/if}}
<Tools::UpcomingActivities />
{{/if}}
{{#if (can 'show users')}}
<Tools::UpcomingBirthdays />
{{/if}}
{{#if (can 'show forum/posts')}}
<Tools::ForumPosts />
{{/if}}
{{#if (can 'show polls')}}
<Tools::RecentPolls />
{{/if}}
{{#if (can 'show photo-albums')}}
<Tools::RecentPhotos />
{{/if}}
</div>
3 changes: 3 additions & 0 deletions app/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ $container-max-widths: (
$grid-columns: 12 !default;
$grid-gutter-width: 1.875rem; // 30px

// Allow negative margins
$enable-negative-margins: true;

// fonts
$font-family-sans-serif: 'nunito sans', 'Arial', sans-serif;
$font-family-serif: 'Georgia', 'Times New Roman', 'Times', serif;
Expand Down