bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scroll is working natively, remains to find a good js scroll. fix #12

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-13 21:13:08 +01:00
parent 006a50d899
commit 5b725dbf53
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+8 -3
View File
@@ -243,9 +243,14 @@ edlp_vars = {
// |___/\__|_| \___/_|_|___/\__,_|_| /__/ // |___/\__|_| \___/_|_|___/\__,_|_| /__/
function initScrollbars(){ function initScrollbars(){
console.log("initScrollbars"); console.log("initScrollbars");
$('.os-scroll').overlayScrollbars({ // TODO: find a better js scroll than overlayScrollbars which does not handle well max-height + overflow-y:auto;
overflowBehavior:{x:'h',y:'scroll'} // $('.os-scroll').overlayScrollbars({
}); // overflowBehavior:{
// x:'h',
// y:'scroll',
// clipAlways:false
// }
// });
}; };
// _ _ // _ _
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+4 -3
View File
@@ -1164,7 +1164,7 @@ header[role="banner"] {
#block-mainnavigation { #block-mainnavigation {
float: right; float: right;
margin-top: 30px; } margin-top: 25px; }
#block-mainnavigation ul { #block-mainnavigation ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
@@ -1211,7 +1211,7 @@ header[role="banner"] {
.block-language { .block-language {
float: right; float: right;
margin-top: 29px; margin-top: 24px;
margin-left: 2em; } margin-left: 2em; }
.block-language ul { .block-language ul {
margin: 0; margin: 0;
@@ -1255,8 +1255,9 @@ main[role="main"] .layout-content {
border-top: 1px solid red; border-top: 1px solid red;
border-bottom: 1px solid red; border-bottom: 1px solid red;
background-color: rgba(255, 255, 255, 0.95); background-color: rgba(255, 255, 255, 0.95);
padding: 0 0 1em;
max-height: 100%; max-height: 100%;
padding: 0 0 1em; } overflow-y: auto; }
main[role="main"] .layout-content .row .col > .wrapper > * { main[role="main"] .layout-content .row .col > .wrapper > * {
padding: 0 1em; } padding: 0 1em; }
main[role="main"] .layout-content .field.text-formatted a.audio-link { main[role="main"] .layout-content .field.text-formatted a.audio-link {
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+8 -3
View File
@@ -220,9 +220,14 @@
// |___/\__|_| \___/_|_|___/\__,_|_| /__/ // |___/\__|_| \___/_|_|___/\__,_|_| /__/
function initScrollbars(){ function initScrollbars(){
console.log("initScrollbars"); console.log("initScrollbars");
$('.os-scroll').overlayScrollbars({ // TODO: find a better js scroll than overlayScrollbars which does not handle well max-height + overflow-y:auto;
overflowBehavior:{x:'h',y:'scroll'} // $('.os-scroll').overlayScrollbars({
}); // overflowBehavior:{
// x:'h',
// y:'scroll',
// clipAlways:false
// }
// });
}; };
// _ _ // _ _
sites/all/themes/custom/edlptheme/assets/styles/app.scss
+9 -3
View File
@@ -84,7 +84,7 @@ header[role="banner"]{
#block-mainnavigation{ #block-mainnavigation{
float:right; float:right;
margin-top: 30px; margin-top: 25px;
ul{ ul{
margin:0; padding: 0; margin:0; padding: 0;
white-space: nowrap; white-space: nowrap;
@@ -120,7 +120,7 @@ header[role="banner"]{
.block-language{ .block-language{
float: right; float: right;
margin-top: 29px; margin-top: 24px;
margin-left: 2em; margin-left: 2em;
ul{ ul{
margin:0; padding:0; margin:0; padding:0;
@@ -175,11 +175,17 @@ main[role="main"]{
border-top: 1px solid red; border-top: 1px solid red;
border-bottom: 1px solid red; border-bottom: 1px solid red;
background-color: $transparent-bg; background-color: $transparent-bg;
max-height: 100%; // this is not working :(
padding:0 0 1em; padding:0 0 1em;
max-height: 100%;
overflow-y: auto;
&>*{ &>*{
padding:0 1em; padding:0 1em;
} }
// .os-scroll{
// box-sizing: border-box;
// max-height: 100%;
// padding:0 1em;
// }
} }
} }
} }
sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--default.html.twig
+3 -1
View File
@@ -1,7 +1,9 @@
<div class="row"> <div class="row">
<div class="col small-col-12 med-col-6 large-col-6"> <div class="col small-col-12 med-col-6 large-col-6">
<div class="wrapper"> <div class="wrapper">
{{ content }} {#<div class="os-scroll">#}
{{ content }}
{#</div>#}
</div> </div>
</div> </div>
</div> </div>