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

many misc bug fix

Browse Source
This commit is contained in:
bachir
2024-10-10 22:12:34 +02:00
parent fb7d736bc4
commit 68bc5527d9
20 changed files with 162 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ if(edlp_origin.audio_url){var node={nid:edlp_origin.entity_id,audio_url:edlp_ori
else if(state.ajax_path){ajaxLoadContent(state);}
if(state.entree_tid){openEntree(state.entree_tid);}
history.replaceState(state,null,edlp_origin.url+edlp_origin.hash);window.localStorage.removeItem("edlp_origin");}else{history.replaceState({home:true},null,window.location.pathname+window.location.hash);initGrid();_$body.attr('booted','booted');}};function onHistoryPopState(e){void 0;if(e.state.home){backToFrontPage(true);}else if(e.state.audio){void 0;_audioPlayer.openDocument(e.state.node,'popstate',e.state.historic_index);if(_is_mobile){ajaxLoadContent(e.state);}}else{if(e.state.entree_tid){openEntree(e.state.entree_tid);}
if(e.state.ajax_path){e.state.url=null;ajaxLoadContent(e.state);}}};function initAjaxLinks(){$('a','#block-mainnavigation').add('a','#block-mainnavigation-2').add('a','#block-footer.menu--footer').add('a','#block-productions').add('a','article.node:not(.node--type-enregistrement) h2.node-title').add('a','.productions-subtree').add('a','.productions-parent').add('a','.field--name-field-son').addClass('ajax-link');if(!_is_mobile){$('a.site-name','#block-edlptheme-branding').addClass('ajax-link');}
if(e.state.ajax_path){e.state.url=null;ajaxLoadContent(e.state);}}};function initAjaxLinks(){$('a','#block-edlptheme-mainnavigation').add('a','#block-mainnavigation-2').add('a','#block-footer.menu--footer').add('a','#block-productions').add('a','article.node:not(.node--type-enregistrement) h2.node-title').add('a','.productions-subtree').add('a','.productions-parent').add('a','.field--name-field-son').addClass('ajax-link');if(!_is_mobile){$('a.site-name','#block-edlptheme-branding').addClass('ajax-link');}
_$ajaxLinks=$('.ajax-link');activateAjaxLinks();};function activateAjaxLinks(){_$ajaxLinks.each(function(i,e){var $this=$(this);if($this.is('.ajax-enable'))return;if($this.attr('data-drupal-link-system-path')||$this.is('[type^="audio"]')){$this.on('click',onClickAjaxLink).addClass('ajax-enable');}});};function onClickAjaxLink(e){e.preventDefault();var $link=$(this);if($link.is('.is-active')&&!$link.is('.site-name'))return false;if($link.is('.audio-link')){caller=$link.parents('.lastdocs, .lastdocs-home').length?'lastdocs':null;if(!caller){caller=$link.parents('.composition_ui').length?'studio-compo':null;}
if(caller=='studio-compo'){var index=$link.parents('.field__item').index();void 0;_compoPlayer.start(index);}else{_audioPlayer.emmit('stop-shuffle').openDocument({nid:$link.attr('nid'),audio_url:$link.attr('audio_url'),title:$link.find('.field--name-title').html()},caller);}
return false;}
web/themes/custom/edlptheme/assets/dist/styles/app.css
Vendored
-14
View File
@@ -1,14 +0,0 @@
body {
background: white; }
.btn--hollow {
background: red;
display: inline-block;
padding: 10px; }
body, html {
position: relative;
width: 100%;
height: 100%;
font-family: Georgia, serif;
font-style: normal; }
web/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
web/themes/custom/edlptheme/assets/scripts/main.js
+1 -1
View File
@@ -860,7 +860,7 @@
function initAjaxLinks(){
// console.log('initAjaxLinks');
$('a', '#block-mainnavigation')
$('a', '#block-edlptheme-mainnavigation')
.add('a', '#block-mainnavigation-2')
// .add('a', '.block.language-switcher-language-url')
.add('a', '#block-footer.menu--footer')
web/themes/custom/edlptheme/assets/styles/app.scss
+32 -35
View File
@@ -13,11 +13,11 @@
@import 'base/fonts';
@mixin spining-loader-square{
animation: rotation 2s infinite linear;
@keyframes rotation {
from {transform: rotate(0deg);}
to {transform: rotate(359deg);}
}
animation: rotation 2s infinite linear;
}
@mixin entree-micro-square {
@@ -132,6 +132,9 @@ header[role="banner"]{
#block-edlptheme-branding{
display: inline-block;
opacity: 1;
transition: opacity 0.7s ease-in-out;
h1{
margin:0; display: inline-block;
a.site-name{
@@ -152,15 +155,12 @@ header[role="banner"]{
}
}
}
opacity: 1;
transition: opacity 0.7s ease-in-out;
.audio-player-visible &{
opacity: 0;
}
}
#block-mainnavigation, #block-mainnavigation-2{
#block-mainnavigation, #block-edlptheme-mainnavigation{
float:right;
margin-top: 25px;
z-index: 21;
@@ -497,11 +497,11 @@ main[role="main"]{
}
.agenda{
text-align: center;
.past-events{
border-top: 1px solid red;
margin-top: 1em;
}
text-align: center;
h3{
@include content_titles;
}
@@ -956,20 +956,18 @@ main[role="main"]{
min-width:700px;
width: calc(100% - 460px);
// width: calc(100% - 950px);
@media only screen and (max-width: 1270px) {
width: calc(100% - 180px);
}
z-index: 20;
opacity: 0;
pointer-events: none;
transition: opacity 0.7s ease-in-out;
white-space: nowrap;
@media only screen and (max-width: 1270px) {
width: calc(100% - 180px);
}
&.visible{
opacity: 1;
pointer-events:all;
}
white-space: nowrap;
&>*{
display: inline-block;
vertical-align: middle;
@@ -1041,8 +1039,8 @@ main[role="main"]{
// background-color: white;
opacity: 1;
transition: opacity 0.5s ease-in-out;
&.loading{opacity: 0;}
white-space: nowrap;
&.loading{opacity: 0;}
.actions, .cartels{
display: inline-block;
vertical-align: top;
@@ -1280,7 +1278,7 @@ main[role="main"]{
transform: translateY(-100%) translateY(-$s) translateX($s);
&:before{
top:calc(100% + 1px);
left: - ($w +1px);
left: - ($w + 1px);
transform-origin: top right;
transform: rotateZ(-45deg);
}
@@ -1296,7 +1294,6 @@ main[role="main"]{
}
}
// ___ _ _ _
// / __| |_ _ _ __| (_)___
// \__ \ _| || / _` | / _ \
@@ -1314,10 +1311,10 @@ main[role="main"]{
background-repeat: no-repeat;
background-size: contain;
background-image: url(../img/favori-off.svg);
transition: opacity 0.2s ease-in-out;
&[action="remove"]{
background-image: url(../img/favori-on.svg);
}
transition: opacity 0.2s ease-in-out;
&.ajax-loading{
opacity: 0.2;
}
@@ -1365,11 +1362,11 @@ main[role="main"]{
// margin-right: 25px;
width:25px;
height: 100%;
opacity: 1;
transition: opacity 0.1s ease-in-out;
&.ui-draggable-dragging{
height:100px;
}
opacity: 1;
transition: opacity 0.1s ease-in-out;
&.ready-to-remove{
opacity:0.3;
cursor:crosshair;
@@ -1388,6 +1385,7 @@ main[role="main"]{
text-transform: none;
a{
white-space: nowrap!important;
font-size: 0.756em;
&:before{
content:"";
display: inline-block;
@@ -1397,7 +1395,6 @@ main[role="main"]{
background-color: white;
// TODO: entries color;
}
font-size: 0.756em;
}
}
}
@@ -1544,7 +1541,7 @@ main[role="main"]{
display: inline-block;
box-sizing: border-box;
// width:100%;
width: calc(100% - #{$w +$s +$m +2});
width: calc(100% - #{$w + $s + $m + 2});
&:before{
content: "";
width:$w; height:$w;
@@ -1575,23 +1572,25 @@ main[role="main"]{
}
&.new-composition-link{
// padding-left: 1em;
&:before{
content:"+";
// font-weight: bold;
margin-right: $m;
}
display: inline-block;
vertical-align: top;
overflow: hidden;
margin-top: 0.4em;
height:1em;
transition: height 0.2s ease-in-out;
&:before{
content:"+";
// font-weight: bold;
margin-right: $m;
}
&.folded{
height:0;
}
}
}
.new-compo-form{
opacity: 1;
transition: opacity 0.2s ease-in-out;
input[type="text"]{
font-size: 0.756em;
padding:0 0.5em;
@@ -1608,8 +1607,6 @@ main[role="main"]{
line-height: 1;
font-weight: bold;
}
opacity: 1;
transition: opacity 0.2s ease-in-out;
&.ajax-loading{
opacity: 0.4;
}
@@ -1661,7 +1658,7 @@ main[role="main"]{
}
&:before{
border-top: 1px solid $c;
height:$h /2;
height:calc($h / 2);
}
&:after{
border-left: 1px solid $c;
@@ -2096,7 +2093,6 @@ body.path-frontpage, body.path-productions{
display: inline-block;
position: relative;
list-style: none;
margin: 0 1.5em 0 0;
// width:2em; height:10em;
padding: 0;
a{
@@ -2239,6 +2235,7 @@ footer{
padding:0;
li{
pointer-events: all;
margin: 0 1.5em 0 0;
@include oblique-list;
&:first-of-type{
margin-left: 1em;
@@ -2306,11 +2303,11 @@ footer{
.block-block-edlp-entrees{
pointer-events: none;
display: inline-block;
body.path-productions &,
body.entity-type-node.bundle-page &,
body.path-agenda & {display:none}
display: inline-block;
// vertical-align: top;
// outline: 1px dotted green;
div.item-list{
@@ -2318,10 +2315,10 @@ footer{
margin:0;
white-space: nowrap;
li{
@include oblique-list;
margin:0;
white-space: nowrap;
pointer-events: none;
margin:0;
@include oblique-list;
// docsindex
&:first-of-type{
margin-right: 3.4em;
@@ -2688,8 +2685,8 @@ footer{
#block-edlpsearchlinkblock{
margin-bottom: 1em;
@include iconlinkblock(url(../img/search.svg), url(../img/search-active.svg));
margin-left: 0.2em;
@include iconlinkblock(url(../img/search.svg), url(../img/search-active.svg));
}
.block-language{
@@ -2807,11 +2804,11 @@ footer{
}
}
.chutier-icon{
position:absolute;
top:0.4em; right:0.4em;
&[action="add"]{
display:none;
}
position:absolute;
top:0.4em; right:0.4em;
}
}
body.domain-expo-encyclopediedelaparole-org &{
web/themes/custom/edlptheme/assets/styles/base/_grid.scss
+11 -10
View File
@@ -16,7 +16,7 @@ $med-bp:1080px;
}
}
%col-reset {
@mixin col-reset {
width: 100%;
// display: inline-block;
// white-space:normal;
@@ -26,21 +26,22 @@ $med-bp:1080px;
}
@mixin col($col, $offset: 0, $sum: $default_sum, $gap: $default_gap, $align: top) {
@extend %col-reset;
@include col-reset;
padding-left: $gap*$offset;
@if $col == $default_sum {
padding-right: 0;
}@else{
padding-right: $gap;
}
&:last-child{padding-right: 0;}
margin-left: percentage(($col/$sum)*$offset);
margin-left: percentage(calc($col / $sum) * $offset);
// @media only screen and (min-width: 768px) {
width: percentage($col/$sum);
width: percentage(calc($col / $sum));
// vertical-align: $align;
// }
// }
&:last-child{padding-right: 0;}
}
.row{
@@ -64,14 +65,14 @@ $med-bp:1080px;
// medium
.med-col-#{$c} {
@media only screen and (min-width: $small-bp+1) and (max-width: $med-bp) {
@media only screen and (min-width: $small-bp + 1) and (max-width: $med-bp) {
@include col($c);
}
}
// large
.large-col-#{$c} {
@media only screen and (min-width: $med-bp+1) {
@media only screen and (min-width: $med-bp + 1) {
@include col($c);
}
}
web/themes/custom/edlptheme/gulpfile.mjs
+6 -8
View File
@@ -11,17 +11,16 @@ import stripDebug from 'gulp-strip-debug';
import jsmin from 'gulp-jsmin';
import cssmin from 'gulp-cssmin';
import rename from 'gulp-rename';
import minimist from 'minimist';
import mainBowerFiles from 'main-bower-files';
import svgmin from 'gulp-svgmin';
import minimist from 'minimist';
// var shared_variables = JSON.parse(fs.readFileSync('./assets/json/shared_variables.json'));
// to get minified assets run `gulp --env=prod`
var argv = minimist(process.argv.slice(2));
console.dir(argv);
// var prod = argv.env === 'prod' ? true : false;
var prod = true;
var prod = argv.env === 'prod' ? true : false;
function handleError(err) {
console.log(err.toString());
@@ -41,14 +40,13 @@ async function styles() {
return src(['./assets/styles/app.scss'])
.pipe(sass().on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
})).on('error', handleError)
// .pipe(prod ? cssmin() : util.noop())
.pipe(gulpif(prod, cssmin()))
// .pipe(cssmin())
.pipe(rename({suffix: '.min'}))
.pipe(gulp.dest('./assets/dist/styles/'));
.pipe(dest('./assets/dist/styles/'));
}
async function bower(){
@@ -67,18 +65,18 @@ async function bower(){
"outlayer":{"ignore":true},
}
}))
.pipe(gulp.dest('./assets/dist/bower/'));
.pipe(dest('./assets/dist/bower/'));
}
async function minsvg(){
return src(['./assets/img/*.svg', '!./assets/img/edlp-loader-anim.svg'])
.pipe(svgmin())
.pipe(gulp.dest('./assets/dist/img'));
.pipe(dest('./assets/dist/img'));
}
async function svg(){
return src('./assets/img/edlp-loader-anim.svg')
.pipe(gulp.dest('./assets/dist/img'));
.pipe(dest('./assets/dist/img'));
}
function devwatch(){