Skip to content

Commit

Permalink
Show vertical scrollbars; #440
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMaaarc committed Feb 5, 2020
1 parent ae262ab commit c5f9094
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 54 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE
### Changed

+ [#440](https://github.com/luyadev/luya-module-admin/issues/440) Show vertical scrollbars.
+ [#428](https://github.com/luyadev/luya-module-admin/issues/428) Update to latest echarts version (from 3.5 to 4.5) for backwards compatbility problems take a look at https://www.echartsjs.com/en/changelog.html#v4-0-0.

### Added
Expand Down
2 changes: 1 addition & 1 deletion src/resources/dist/main.css

Large diffs are not rendered by default.

39 changes: 11 additions & 28 deletions src/resources/dist/vendor.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/resources/scss/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
// ==================================================

@import "helpers/google-chrome-font-offset-fix";
@import "helpers/overflow-no-scrollbars";
@import "helpers/zindex";

// ==================================================
Expand Down
12 changes: 1 addition & 11 deletions src/resources/scss/components/_luya.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,9 @@
color: color('gray-dark');
display: flex;
flex-direction: column;
-ms-overflow-style: none; // IE 10+
overflow-y: auto;
// overflow: -moz-scrollbars-none; // Firefox
width: 100%;

&::-webkit-scrollbar {
display: none; // Safari and Chrome
}
.cmsnav {
padding: $content-padding-y $content-padding-x;
}
Expand Down Expand Up @@ -107,16 +102,11 @@
.luya-content {
background-color: map-get($grays, 100);
padding: $content-padding-y $content-padding-x;
&::-webkit-scrollbar {
display: none; // Safari and Chrome
}
padding-top: 0;

@media (min-width: $mobile-nav-breakpoint) {
flex: 1 1;
height: 100%;
//overflow: -moz-scrollbars-none; // Firefox
-ms-overflow-style: none; // IE 10+
overflow-y: auto;

.luya-subnav.overlaying + & {
padding-left: 50px;
Expand Down
5 changes: 0 additions & 5 deletions src/resources/scss/components/_mainnav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,7 @@

.mainnav-modules {
flex: 1 0;
-ms-overflow-style: none; // IE 10+
overflow-y: auto;
//overflow: -moz-scrollbars-none; // Firefox
&::-webkit-scrollbar {
display: none; // Safari and Chrome
}
}

.mainnav-static {
Expand Down
8 changes: 0 additions & 8 deletions src/resources/scss/helpers/_overflow-no-scrollbars.scss

This file was deleted.

0 comments on commit c5f9094

Please sign in to comment.