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

fix footer menu, fix #4

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-13 19:46:48 +01:00
parent 74a4f4b695
commit 76565a8b28
6 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js
Vendored
+3 -14
View File
@@ -332,20 +332,6 @@
this.p.velocity.multiplyScalarXY(1,-1).multiplyScalar(0.75);
break;
}
// if(
// (this.x < this.wall_limits.left && this.p.velocity.x < 0)
// || (this.x > this.wall_limits.right && this.p.velocity.x > 0)
// ){
// // console.log("bounce x");
// this.p.velocity.multiplyScalarXY(-1, 1).multiplyScalar(0.75);
// }
// if(
// (this.y < this.wall_limits.top && this.p.velocity.y < 0)
// || (this.y > this.wall_limits.bottom && this.p.velocity.y > 0)
// ){
// // console.log("bounce y");
// this.p.velocity.multiplyScalarXY(1,-1).multiplyScalar(0.75);
// }
};
Node.prototype.updatePos = function(){
@@ -673,10 +659,13 @@
_$entrees_block_termlinks.parents('li').removeClass('opened');
$li.addClass('opened');
filterEntree(tid);
_$body.trigger({'type':'open_entree', 'tid':tid});
}else{
$li.removeClass('opened');
scrambleCollection();
_$body.trigger({'type':'close_entree', 'tid':tid});
}
return false;
});
sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js
+3 -14
View File
@@ -332,20 +332,6 @@
this.p.velocity.multiplyScalarXY(1,-1).multiplyScalar(0.75);
break;
}
// if(
// (this.x < this.wall_limits.left && this.p.velocity.x < 0)
// || (this.x > this.wall_limits.right && this.p.velocity.x > 0)
// ){
// // console.log("bounce x");
// this.p.velocity.multiplyScalarXY(-1, 1).multiplyScalar(0.75);
// }
// if(
// (this.y < this.wall_limits.top && this.p.velocity.y < 0)
// || (this.y > this.wall_limits.bottom && this.p.velocity.y > 0)
// ){
// // console.log("bounce y");
// this.p.velocity.multiplyScalarXY(1,-1).multiplyScalar(0.75);
// }
};
Node.prototype.updatePos = function(){
@@ -673,10 +659,13 @@
_$entrees_block_termlinks.parents('li').removeClass('opened');
$li.addClass('opened');
filterEntree(tid);
_$body.trigger({'type':'open_entree', 'tid':tid});
}else{
$li.removeClass('opened');
scrambleCollection();
_$body.trigger({'type':'close_entree', 'tid':tid});
}
return false;
});
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+12 -3
View File
@@ -52,9 +52,18 @@ edlp_vars = {
function initEvents(){
$('body').on('on-studio-chutier-updated', function(e){
initAjaxLinks();
});
$('body')
.on('on-studio-chutier-updated', function(e){
initAjaxLinks();
})
.on('open_entree', function(e){
// e.tid available
closeAllModals();
})
.on('close_entree', function(e){
// e.tid available
closeAllModals();
});
}
// _ _ _
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+20
View File
@@ -1771,6 +1771,26 @@ footer {
white-space: nowrap; }
footer nav.block-menu ul li:first-of-type {
margin-left: 1em; }
footer nav.block-menu ul li a:before {
content: "";
display: inline-block;
width: 7px;
height: 7px;
border: 1px solid black;
margin-right: 0.5em; }
footer nav.block-menu ul li a:hover:before, footer nav.block-menu ul li a.is-active:before {
background-color: black; }
footer nav.block-menu ul li a.ajax-loading:before {
-webkit-animation: rotation 2s infinite linear;
animation: rotation 2s infinite linear; }
@keyframes rotation {
from {
-webkit-transform: rotate(0deg);
transform: rotate(0deg); }
to {
-webkit-transform: rotate(359deg);
transform: rotate(359deg); } }
footer .block-language {
display: inline-block;
position: relative; }
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+12 -3
View File
@@ -29,9 +29,18 @@
function initEvents(){
$('body').on('on-studio-chutier-updated', function(e){
initAjaxLinks();
});
$('body')
.on('on-studio-chutier-updated', function(e){
initAjaxLinks();
})
.on('open_entree', function(e){
// e.tid available
closeAllModals();
})
.on('close_entree', function(e){
// e.tid available
closeAllModals();
});
}
// _ _ _
sites/all/themes/custom/edlptheme/assets/styles/app.scss
+17
View File
@@ -754,6 +754,23 @@ footer{
&:first-of-type{
margin-left: 1em;
}
a{
&:before{
content: "";
display:inline-block;
$sq:7px;
width: $sq; height:$sq;
border: 1px solid black;
margin-right: 0.5em;
}
&:hover:before,
&.is-active:before{
background-color: black;
}
&.ajax-loading:before{
@include spining-loader-square;
}
}
}
}
}