Skip to content

Fixed double scrollbar #40

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
MicDMar merged 4 commits into from
Jul 31, 2020
Merged

Fixed double scrollbar #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9149ca
Fixed double scroll
kegorrr Jul 31, 2020
186fdba
Merge branch 'gh-pages' of github.com:LevityTech/levitytech.github.io…
kegorrr Jul 31, 2020
5cc5087
better fix for double scroll
kegorrr Jul 31, 2020
2925d10
better fix for double scroll
kegorrr Jul 31, 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
7 changes: 4 additions & 3 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


<!-- Scripts -->

<!--
<script src="https://www.levitytech.net/assets/js/jquery.min.js"></script>
<script src="https://www.levitytech.net/assets/js/jquery.scrollex.min.js"></script>
<script src="https://www.levitytech.net/assets/js/jquery.scrolly.min.js"></script>
Expand All @@ -22,7 +22,8 @@
<script src="https://www.levitytech.net/assets/js/util.js"></script>
<script src="https://www.levitytech.net/assets/js/main.js"></script>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
<!--
-->

<script src="{{ base.url | prepend: site.url }}/assets/js/jquery.min.js"></script>
<script src="{{ base.url | prepend: site.url }}/assets/js/jquery.scrollex.min.js"></script>
<script src="{{ base.url | prepend: site.url }}/assets/js/jquery.scrolly.min.js"></script>
Expand All @@ -31,7 +32,7 @@
<script src="{{ base.url | prepend: site.url }}/assets/js/util.js"></script>
<script src="{{ base.url | prepend: site.url }}/assets/js/main.js"></script>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
-->


</body>
</html>
9 changes: 8 additions & 1 deletion _sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,10 @@

/* Header */

#header::-webkit-scrollbar {
display: none;
}

#header {
@include vendor('display', 'flex');
@include vendor('flex-direction', 'column');
Expand All @@ -1158,6 +1162,8 @@
top: 0;
width: $size-header;
transition: linear .5s;
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */

@if _misc(header-side) == 'right' {
right: 0;
Expand Down Expand Up @@ -1190,7 +1196,8 @@

> header {
@include vendor('flex-shrink', '0');
padding: 3em;
padding: 2em;


.avatar {
display: block;
Expand Down
9 changes: 8 additions & 1 deletion assets/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.