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

better close modal btn position sticky, don't backhome if production modal closed

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-04-12 22:36:23 +02:00
parent 9c6fe22012
commit e9a00903a9
4 changed files with 19 additions and 14 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
+5 -4
View File
@@ -260,7 +260,7 @@
if($('span.close-col-btn', this).length)
return true;
$(this).append($('<span>')
$(this).children('.wrapper').prepend($('<span>')
.addClass('close-col-btn')
.on('click', function(e){
// check for theme attribute and emmit event
@@ -271,9 +271,10 @@
}
// remove the col
$col.remove();
// if row is empty call closeAllModals()
if(!$('.col', _$row).length){
backToFrontPage();
// if row is empty and we are not in productions call closeAllModals()
if(!$('.col', _$row).length
&& !_$body.is('.entity-type-node.bundle-page')){
backToFrontPage();
}
})
);
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+4 -3
View File
@@ -1327,14 +1327,15 @@ main[role="main"] ul, main[role="main"] li, main[role="main"] ul.inline li:first
main[role="main"] span.close-col-btn {
pointer-events: all;
cursor: pointer;
position: absolute;
top: 0;
right: 16px;
position: -webkit-sticky;
position: sticky;
top: 0.5em;
padding: 0 !important;
margin: 0.5em;
display: block;
width: 10px;
height: 10px;
float: right;
background-image: url(../img/close.svg);
background-repeat: no-repeat;
background-position: center;
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+5 -4
View File
@@ -260,7 +260,7 @@
if($('span.close-col-btn', this).length)
return true;
$(this).append($('<span>')
$(this).children('.wrapper').prepend($('<span>')
.addClass('close-col-btn')
.on('click', function(e){
// check for theme attribute and emmit event
@@ -271,9 +271,10 @@
}
// remove the col
$col.remove();
// if row is empty call closeAllModals()
if(!$('.col', _$row).length){
backToFrontPage();
// if row is empty and we are not in productions call closeAllModals()
if(!$('.col', _$row).length
&& !_$body.is('.entity-type-node.bundle-page')){
backToFrontPage();
}
})
);
sites/all/themes/custom/edlptheme/assets/styles/app.scss
+5 -3
View File
@@ -266,12 +266,14 @@ main[role="main"]{
// z-index: 10;
pointer-events: all;
cursor: pointer;
position:absolute;
top:0; right:16px;
padding:0!important; margin:0.5em;
position:sticky;
top:0.5em;
padding:0!important;
margin:0.5em;
display: block;
$s:10px;
width:$s; height:$s;
float: right;
background-image: url(../img/close.svg);
background-repeat: no-repeat;
background-position: center;