Mirrors/koel
2
0
Fork 0
mirror of https://github.com/koel/koel synced 2024-11-10 06:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into edit

Browse source
This commit is contained in:
An Phan 2016-02-24 21:29:56 +08:00
commit 97b89fe343
4 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
resources/assets/js/components/main-wrapper/extra/index.vue
View file

@ -90,14 +90,15 @@
padding: 24px 16px $footerHeight;
background: $colorExtraBgr;
max-height: calc(100vh - #{$headerHeight + $footerHeight});
overflow: auto;
// Enable scroll with momentum on touch devices
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
display: none;
color: $color2ndText;
overflow: auto;
&:hover, html.touchevents & {
// Enable scroll with momentum on touch devices
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
}
&.showing {
display: block;

9
resources/assets/js/components/main-wrapper/main-content/index.vue
View file

@ -84,10 +84,13 @@
padding: 24px;
overflow: auto;
flex: 1;
overflow-y: hidden;
// Enable scroll with momentum on touch devices
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
&:hover, html.touchevents & {
// Enable scroll with momentum on touch devices
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
}
}
}

9
resources/assets/js/components/main-wrapper/sidebar/index.vue
View file

@ -161,10 +161,13 @@
padding: 22px 0 0;
max-height: calc(100vh - #{$headerHeight + $footerHeight});
overflow: auto;
overflow-y: hidden;
// Enable scroll with momentum on touch devices
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
&:hover, html.touchevents & {
// Enable scroll with momentum on touch devices
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
}
a.droppable {
transform: scale(1.2);

4
resources/assets/js/components/site-footer/equalizer.vue
View file

@ -275,6 +275,10 @@
padding-left: 0;
width: 100px;
text-transform: none;
option {
color: #333;
}
}
}