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

Jump to bottom

Fix for banner and too far scrolling #2398

Merged
merged 2 commits into from
Jul 16, 2022
Merged

Fix for banner and too far scrolling #2398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
612ec3c
Fix for banner and too far scrolling
GilgusMaximus Jul 12, 2022
3d3f0f0
Update App.css
GilgusMaximus Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/renderer/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
display: flex;
flex-wrap: wrap;
font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
height: 100%;
}

.routerView {
Expand All @@ -15,14 +16,13 @@
}

.banner {
margin: 16px auto 0 auto;
width: 90%;
width: 80%;
margin: 0 auto;
}

.flexBox {
margin: 0;
flex: 1 1 0%;
flex-direction: column;
margin-top: 60px;
display: block;
}

#changeLogText {
Expand All @@ -44,11 +44,12 @@
}

.banner {
width: 90%;
width: 80%;
margin-top: 60px;
}

.flexBox {
margin-top: 60px;
margin-bottom: -75px;
}
}
}
GilgusMaximus marked this conversation as resolved.
Show resolved Hide resolved
36 changes: 20 additions & 16 deletions src/renderer/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,25 @@
>
<top-nav ref="topNav" />
<side-nav ref="sideNav" />

<ft-flex-box class="flexBox">
<ft-notification-banner
v-if="showUpdatesBanner"
class="banner"
:message="updateBannerMessage"
@click="handleUpdateBannerClick"
/>
<ft-notification-banner
v-if="showBlogBanner"
class="banner"
:message="blogBannerMessage"
@click="handleNewBlogBannerClick"
/>

<ft-flex-box
class="flexBox routerView"
>
<div
v-if="showUpdatesBanner || showBlogBanner"
>
<ft-notification-banner
v-if="showUpdatesBanner"
class="banner"
:message="updateBannerMessage"
@click="handleUpdateBannerClick"
/>
<ft-notification-banner
v-if="showBlogBanner"
class="banner"
:message="blogBannerMessage"
@click="handleNewBlogBannerClick"
/>
</div>
<transition
v-if="dataReady"
mode="out-in"
Expand All @@ -34,7 +38,7 @@
ref="router"
class="routerView"
/>
<!-- </keep-alive> -->
<!-- </keep-alive> -->
</transition>
</ft-flex-box>

Expand Down