diff --git a/sites/all/modules/figli/edlp_ajax/edlp_ajax.module b/sites/all/modules/figli/edlp_ajax/edlp_ajax.module index 8c375bc9a..1a1f3cf7a 100644 --- a/sites/all/modules/figli/edlp_ajax/edlp_ajax.module +++ b/sites/all/modules/figli/edlp_ajax/edlp_ajax.module @@ -93,8 +93,9 @@ function edlp_ajax_theme($existing, $type, $theme, $path) { 'edlp_ajax' => array( 'file' => 'includes/edlp_ajax.inc', 'variables' => array( - 'entity_type' => 'node', - 'entity' => NULL, + 'entity_type' => null, + 'bundle' => null, + 'entity' => null, 'view_mode' => 'default', 'aside' => array(), ), @@ -110,6 +111,7 @@ function edlp_ajax_theme_suggestions_edlp_ajax(array $vars) { $suggestions = []; // $node = $variables['elements']['#node']; $sanitized_view_mode = strtr($vars['view_mode'], '.', '_'); + // $entity = $vars['entity']; // $suggestions[] = 'edlp_ajax__' . $vars['entity_type']; $suggestions[] = 'edlp_ajax__' . $vars['entity_type'] . '__' . $sanitized_view_mode; @@ -117,5 +119,8 @@ function edlp_ajax_theme_suggestions_edlp_ajax(array $vars) { $suggestions[] = 'edlp_ajax__' . $vars['entity_type'] . '__' . $vars['entity']->id(); $suggestions[] = 'edlp_ajax__' . $vars['entity_type'] . '__' . $vars['entity']->id() . '__' . $sanitized_view_mode; + $suggestions[] = 'edlp_ajax__' . $vars['entity_type'] . '__' . $vars['bundle']; + $suggestions[] = 'edlp_ajax__' . $vars['entity_type'] . '__' . $vars['bundle'] . '__' . $sanitized_view_mode; + return $suggestions; } diff --git a/sites/all/modules/figli/edlp_ajax/src/Controller/EdlpAjaxController.php b/sites/all/modules/figli/edlp_ajax/src/Controller/EdlpAjaxController.php index b41a326fe..5c229fe27 100644 --- a/sites/all/modules/figli/edlp_ajax/src/Controller/EdlpAjaxController.php +++ b/sites/all/modules/figli/edlp_ajax/src/Controller/EdlpAjaxController.php @@ -59,7 +59,10 @@ class EdlpAjaxController extends ControllerBase { if(count($future_nids) || count($past_nids)){ $aside = array( - '#type'=>'container' + '#type'=>'container', + "#attributes"=>array( + "class"=>['agenda'] + ) ); $node_view_builder = \Drupal::entityTypeManager()->getViewBuilder('node'); @@ -71,7 +74,7 @@ class EdlpAjaxController extends ControllerBase { '#items' => [], ); foreach($future_nodes as $node){ - $future_list['#items'][] = $node_view_builder->view($node, 'teaser'); + $future_list['#items'][] = $node_view_builder->view($node, 'aside'); } $aside['future_events'] = array( "#type"=>"container", @@ -90,12 +93,12 @@ class EdlpAjaxController extends ControllerBase { '#items' => [], ); foreach($past_nodes as $node){ - $past_list['#items'][] = $node_view_builder->view($node, 'teaser'); + $past_list['#items'][] = $node_view_builder->view($node, 'aside'); } $aside['past_events'] = array( "#type"=>"container", "#attributes"=>array( - "class"=>['future-events'] + "class"=>['past-events'] ), "#markup"=>"

" . t("Past events") . "

", "past_events"=>$past_list @@ -130,6 +133,7 @@ class EdlpAjaxController extends ControllerBase { '#entity' => $this->entity, '#view_mode' => $this->viewmode, '#aside' => $this->getAside(), + '#bundle' => $this->bundle, ); }else{ return array( diff --git a/sites/all/themes/custom/edlptheme/assets/dist/scripts/history.min.js b/sites/all/themes/custom/edlptheme/assets/dist/scripts/history.min.js index 3ba831fa9..6ed8192af 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/scripts/history.min.js +++ b/sites/all/themes/custom/edlptheme/assets/dist/scripts/history.min.js @@ -14,7 +14,6 @@ if(edlp.redirect){ window.localStorage.setItem('edlp_origin', JSON.stringify(edlp)); // redirect to home - // debugger; window.location.replace(window.location.origin+'/'+edlp.lang_code); }else{ console.log('history do not redirect'); diff --git a/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js b/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js index fe7e398b9..765b5b6ff 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js +++ b/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js @@ -169,7 +169,17 @@ // reset all style may been added by other pages (like masonry for productions) // and replace all content with newly loaded // TODO: build a system to replace or append contents (like studio + search) - _$row.removeAttr('style').html(data.rendered); + if(data.entity_type == "node" && data.bundle == "evenement"){ + if(_$row.find('.col.event').length){ + _$row.find('.col.event').replaceWith(data.rendered); + }else if(_$row.find('.col.aside').length){ + _$row.find('.col.aside').replaceWith(data.rendered); + }else{ + _$row.append(data.rendered); + } + }else{ + _$row.removeAttr('style').html(data.rendered); + } // add body class for currently loaded content var body_classes = [ diff --git a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css index ff0b92445..6ff3408ae 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css +++ b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css @@ -13,15 +13,11 @@ a:focus { .col-1, .small-col-1, .med-col-1, .large-col-1, .col-2, .small-col-2, .med-col-2, .large-col-2, .col-3, .small-col-3, .med-col-3, .large-col-3, .col-4, .small-col-4, .med-col-4, .large-col-4, .col-5, .small-col-5, .med-col-5, .large-col-5, .col-6, .small-col-6, .med-col-6, .large-col-6, .col-7, .small-col-7, .med-col-7, .large-col-7, .col-8, .small-col-8, .med-col-8, .large-col-8, .col-9, .small-col-9, .med-col-9, .large-col-9, .col-10, .small-col-10, .med-col-10, .large-col-10, .col-11, .small-col-11, .med-col-11, .large-col-11, .col-12, .small-col-12, .med-col-12, .large-col-12, .col-1-offset-1, .col-1-offset-2, .col-1-offset-3, .col-1-offset-4, .col-1-offset-5, .col-1-offset-6, .col-1-offset-7, .col-1-offset-8, .col-1-offset-9, .col-1-offset-10, .col-1-offset-11, .col-2-offset-1, .col-2-offset-2, .col-2-offset-3, .col-2-offset-4, .col-2-offset-5, .col-2-offset-6, .col-2-offset-7, .col-2-offset-8, .col-2-offset-9, .col-2-offset-10, .col-3-offset-1, .col-3-offset-2, .col-3-offset-3, .col-3-offset-4, .col-3-offset-5, .col-3-offset-6, .col-3-offset-7, .col-3-offset-8, .col-3-offset-9, .col-4-offset-1, .col-4-offset-2, .col-4-offset-3, .col-4-offset-4, .col-4-offset-5, .col-4-offset-6, .col-4-offset-7, .col-4-offset-8, .col-5-offset-1, .col-5-offset-2, .col-5-offset-3, .col-5-offset-4, .col-5-offset-5, .col-5-offset-6, .col-5-offset-7, .col-6-offset-1, .col-6-offset-2, .col-6-offset-3, .col-6-offset-4, .col-6-offset-5, .col-6-offset-6, .col-7-offset-1, .col-7-offset-2, .col-7-offset-3, .col-7-offset-4, .col-7-offset-5, .col-8-offset-1, .col-8-offset-2, .col-8-offset-3, .col-8-offset-4, .col-9-offset-1, .col-9-offset-2, .col-9-offset-3, .col-10-offset-1, .col-10-offset-2, .col-11-offset-1 { width: 100%; - display: inline-block; - font-size: 16px; + float: left; -webkit-box-sizing: border-box; - box-sizing: border-box; - white-space: normal; } + box-sizing: border-box; } .row { - font-size: 0; - white-space: nowrap; position: relative; } .row > * { font-size: 16px; } @@ -30,8 +26,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1:last-child { padding-right: 0; } @@ -40,8 +35,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .small-col-1:last-child { padding-right: 0; } } @@ -50,8 +44,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .med-col-1:last-child { padding-right: 0; } } @@ -60,8 +53,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .large-col-1:last-child { padding-right: 0; } } @@ -69,8 +61,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2:last-child { padding-right: 0; } @@ -79,8 +70,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .small-col-2:last-child { padding-right: 0; } } @@ -89,8 +79,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .med-col-2:last-child { padding-right: 0; } } @@ -99,8 +88,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .large-col-2:last-child { padding-right: 0; } } @@ -108,8 +96,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3:last-child { padding-right: 0; } @@ -118,8 +105,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 25%; - vertical-align: top; } + width: 25%; } .small-col-3:last-child { padding-right: 0; } } @@ -128,8 +114,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 25%; - vertical-align: top; } + width: 25%; } .med-col-3:last-child { padding-right: 0; } } @@ -138,8 +123,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 25%; - vertical-align: top; } + width: 25%; } .large-col-3:last-child { padding-right: 0; } } @@ -147,8 +131,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4:last-child { padding-right: 0; } @@ -157,8 +140,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .small-col-4:last-child { padding-right: 0; } } @@ -167,8 +149,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .med-col-4:last-child { padding-right: 0; } } @@ -177,8 +158,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .large-col-4:last-child { padding-right: 0; } } @@ -186,8 +166,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5:last-child { padding-right: 0; } @@ -196,8 +175,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .small-col-5:last-child { padding-right: 0; } } @@ -206,8 +184,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .med-col-5:last-child { padding-right: 0; } } @@ -216,8 +193,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .large-col-5:last-child { padding-right: 0; } } @@ -225,8 +201,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6:last-child { padding-right: 0; } @@ -235,8 +210,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 50%; - vertical-align: top; } + width: 50%; } .small-col-6:last-child { padding-right: 0; } } @@ -245,8 +219,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 50%; - vertical-align: top; } + width: 50%; } .med-col-6:last-child { padding-right: 0; } } @@ -255,8 +228,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 50%; - vertical-align: top; } + width: 50%; } .large-col-6:last-child { padding-right: 0; } } @@ -264,8 +236,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .col-7:last-child { padding-right: 0; } @@ -274,8 +245,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .small-col-7:last-child { padding-right: 0; } } @@ -284,8 +254,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .med-col-7:last-child { padding-right: 0; } } @@ -294,8 +263,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .large-col-7:last-child { padding-right: 0; } } @@ -303,8 +271,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .col-8:last-child { padding-right: 0; } @@ -313,8 +280,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .small-col-8:last-child { padding-right: 0; } } @@ -323,8 +289,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .med-col-8:last-child { padding-right: 0; } } @@ -333,8 +298,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .large-col-8:last-child { padding-right: 0; } } @@ -342,8 +306,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 75%; - vertical-align: top; } + width: 75%; } .col-9:last-child { padding-right: 0; } @@ -352,8 +315,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 75%; - vertical-align: top; } + width: 75%; } .small-col-9:last-child { padding-right: 0; } } @@ -362,8 +324,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 75%; - vertical-align: top; } + width: 75%; } .med-col-9:last-child { padding-right: 0; } } @@ -372,8 +333,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 75%; - vertical-align: top; } + width: 75%; } .large-col-9:last-child { padding-right: 0; } } @@ -381,8 +341,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 83.33333%; - vertical-align: top; } + width: 83.33333%; } .col-10:last-child { padding-right: 0; } @@ -391,8 +350,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 83.33333%; - vertical-align: top; } + width: 83.33333%; } .small-col-10:last-child { padding-right: 0; } } @@ -401,8 +359,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 83.33333%; - vertical-align: top; } + width: 83.33333%; } .med-col-10:last-child { padding-right: 0; } } @@ -411,8 +368,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 83.33333%; - vertical-align: top; } + width: 83.33333%; } .large-col-10:last-child { padding-right: 0; } } @@ -420,8 +376,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 91.66667%; - vertical-align: top; } + width: 91.66667%; } .col-11:last-child { padding-right: 0; } @@ -430,8 +385,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 91.66667%; - vertical-align: top; } + width: 91.66667%; } .small-col-11:last-child { padding-right: 0; } } @@ -440,8 +394,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 91.66667%; - vertical-align: top; } + width: 91.66667%; } .med-col-11:last-child { padding-right: 0; } } @@ -450,8 +403,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 91.66667%; - vertical-align: top; } + width: 91.66667%; } .large-col-11:last-child { padding-right: 0; } } @@ -459,8 +411,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 100%; - vertical-align: top; } + width: 100%; } .col-12:last-child { padding-right: 0; } @@ -469,8 +420,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 100%; - vertical-align: top; } + width: 100%; } .small-col-12:last-child { padding-right: 0; } } @@ -479,8 +429,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 100%; - vertical-align: top; } + width: 100%; } .med-col-12:last-child { padding-right: 0; } } @@ -489,8 +438,7 @@ a:focus { padding-left: 0em; padding-right: 1em; margin-left: 0%; - width: 100%; - vertical-align: top; } + width: 100%; } .large-col-12:last-child { padding-right: 0; } } @@ -498,8 +446,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 8.33333%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-1:last-child { padding-right: 0; } @@ -507,8 +454,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 16.66667%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-2:last-child { padding-right: 0; } @@ -516,8 +462,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 25%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-3:last-child { padding-right: 0; } @@ -525,8 +470,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 33.33333%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-4:last-child { padding-right: 0; } @@ -534,8 +478,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 41.66667%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-5:last-child { padding-right: 0; } @@ -543,8 +486,7 @@ a:focus { padding-left: 6em; padding-right: 1em; margin-left: 50%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-6:last-child { padding-right: 0; } @@ -552,8 +494,7 @@ a:focus { padding-left: 7em; padding-right: 1em; margin-left: 58.33333%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-7:last-child { padding-right: 0; } @@ -561,8 +502,7 @@ a:focus { padding-left: 8em; padding-right: 1em; margin-left: 66.66667%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-8:last-child { padding-right: 0; } @@ -570,8 +510,7 @@ a:focus { padding-left: 9em; padding-right: 1em; margin-left: 75%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-9:last-child { padding-right: 0; } @@ -579,8 +518,7 @@ a:focus { padding-left: 10em; padding-right: 1em; margin-left: 83.33333%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-10:last-child { padding-right: 0; } @@ -588,8 +526,7 @@ a:focus { padding-left: 11em; padding-right: 1em; margin-left: 91.66667%; - width: 8.33333%; - vertical-align: top; } + width: 8.33333%; } .col-1-offset-11:last-child { padding-right: 0; } @@ -597,8 +534,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 16.66667%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-1:last-child { padding-right: 0; } @@ -606,8 +542,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 33.33333%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-2:last-child { padding-right: 0; } @@ -615,8 +550,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 50%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-3:last-child { padding-right: 0; } @@ -624,8 +558,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 66.66667%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-4:last-child { padding-right: 0; } @@ -633,8 +566,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 83.33333%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-5:last-child { padding-right: 0; } @@ -642,8 +574,7 @@ a:focus { padding-left: 6em; padding-right: 1em; margin-left: 100%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-6:last-child { padding-right: 0; } @@ -651,8 +582,7 @@ a:focus { padding-left: 7em; padding-right: 1em; margin-left: 116.66667%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-7:last-child { padding-right: 0; } @@ -660,8 +590,7 @@ a:focus { padding-left: 8em; padding-right: 1em; margin-left: 133.33333%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-8:last-child { padding-right: 0; } @@ -669,8 +598,7 @@ a:focus { padding-left: 9em; padding-right: 1em; margin-left: 150%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-9:last-child { padding-right: 0; } @@ -678,8 +606,7 @@ a:focus { padding-left: 10em; padding-right: 1em; margin-left: 166.66667%; - width: 16.66667%; - vertical-align: top; } + width: 16.66667%; } .col-2-offset-10:last-child { padding-right: 0; } @@ -687,8 +614,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 25%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-1:last-child { padding-right: 0; } @@ -696,8 +622,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 50%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-2:last-child { padding-right: 0; } @@ -705,8 +630,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 75%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-3:last-child { padding-right: 0; } @@ -714,8 +638,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 100%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-4:last-child { padding-right: 0; } @@ -723,8 +646,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 125%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-5:last-child { padding-right: 0; } @@ -732,8 +654,7 @@ a:focus { padding-left: 6em; padding-right: 1em; margin-left: 150%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-6:last-child { padding-right: 0; } @@ -741,8 +662,7 @@ a:focus { padding-left: 7em; padding-right: 1em; margin-left: 175%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-7:last-child { padding-right: 0; } @@ -750,8 +670,7 @@ a:focus { padding-left: 8em; padding-right: 1em; margin-left: 200%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-8:last-child { padding-right: 0; } @@ -759,8 +678,7 @@ a:focus { padding-left: 9em; padding-right: 1em; margin-left: 225%; - width: 25%; - vertical-align: top; } + width: 25%; } .col-3-offset-9:last-child { padding-right: 0; } @@ -768,8 +686,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 33.33333%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-1:last-child { padding-right: 0; } @@ -777,8 +694,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 66.66667%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-2:last-child { padding-right: 0; } @@ -786,8 +702,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 100%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-3:last-child { padding-right: 0; } @@ -795,8 +710,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 133.33333%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-4:last-child { padding-right: 0; } @@ -804,8 +718,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 166.66667%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-5:last-child { padding-right: 0; } @@ -813,8 +726,7 @@ a:focus { padding-left: 6em; padding-right: 1em; margin-left: 200%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-6:last-child { padding-right: 0; } @@ -822,8 +734,7 @@ a:focus { padding-left: 7em; padding-right: 1em; margin-left: 233.33333%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-7:last-child { padding-right: 0; } @@ -831,8 +742,7 @@ a:focus { padding-left: 8em; padding-right: 1em; margin-left: 266.66667%; - width: 33.33333%; - vertical-align: top; } + width: 33.33333%; } .col-4-offset-8:last-child { padding-right: 0; } @@ -840,8 +750,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 41.66667%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-1:last-child { padding-right: 0; } @@ -849,8 +758,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 83.33333%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-2:last-child { padding-right: 0; } @@ -858,8 +766,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 125%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-3:last-child { padding-right: 0; } @@ -867,8 +774,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 166.66667%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-4:last-child { padding-right: 0; } @@ -876,8 +782,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 208.33333%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-5:last-child { padding-right: 0; } @@ -885,8 +790,7 @@ a:focus { padding-left: 6em; padding-right: 1em; margin-left: 250%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-6:last-child { padding-right: 0; } @@ -894,8 +798,7 @@ a:focus { padding-left: 7em; padding-right: 1em; margin-left: 291.66667%; - width: 41.66667%; - vertical-align: top; } + width: 41.66667%; } .col-5-offset-7:last-child { padding-right: 0; } @@ -903,8 +806,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 50%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6-offset-1:last-child { padding-right: 0; } @@ -912,8 +814,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 100%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6-offset-2:last-child { padding-right: 0; } @@ -921,8 +822,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 150%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6-offset-3:last-child { padding-right: 0; } @@ -930,8 +830,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 200%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6-offset-4:last-child { padding-right: 0; } @@ -939,8 +838,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 250%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6-offset-5:last-child { padding-right: 0; } @@ -948,8 +846,7 @@ a:focus { padding-left: 6em; padding-right: 1em; margin-left: 300%; - width: 50%; - vertical-align: top; } + width: 50%; } .col-6-offset-6:last-child { padding-right: 0; } @@ -957,8 +854,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 58.33333%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .col-7-offset-1:last-child { padding-right: 0; } @@ -966,8 +862,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 116.66667%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .col-7-offset-2:last-child { padding-right: 0; } @@ -975,8 +870,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 175%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .col-7-offset-3:last-child { padding-right: 0; } @@ -984,8 +878,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 233.33333%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .col-7-offset-4:last-child { padding-right: 0; } @@ -993,8 +886,7 @@ a:focus { padding-left: 5em; padding-right: 1em; margin-left: 291.66667%; - width: 58.33333%; - vertical-align: top; } + width: 58.33333%; } .col-7-offset-5:last-child { padding-right: 0; } @@ -1002,8 +894,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 66.66667%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .col-8-offset-1:last-child { padding-right: 0; } @@ -1011,8 +902,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 133.33333%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .col-8-offset-2:last-child { padding-right: 0; } @@ -1020,8 +910,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 200%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .col-8-offset-3:last-child { padding-right: 0; } @@ -1029,8 +918,7 @@ a:focus { padding-left: 4em; padding-right: 1em; margin-left: 266.66667%; - width: 66.66667%; - vertical-align: top; } + width: 66.66667%; } .col-8-offset-4:last-child { padding-right: 0; } @@ -1038,8 +926,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 75%; - width: 75%; - vertical-align: top; } + width: 75%; } .col-9-offset-1:last-child { padding-right: 0; } @@ -1047,8 +934,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 150%; - width: 75%; - vertical-align: top; } + width: 75%; } .col-9-offset-2:last-child { padding-right: 0; } @@ -1056,8 +942,7 @@ a:focus { padding-left: 3em; padding-right: 1em; margin-left: 225%; - width: 75%; - vertical-align: top; } + width: 75%; } .col-9-offset-3:last-child { padding-right: 0; } @@ -1065,8 +950,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 83.33333%; - width: 83.33333%; - vertical-align: top; } + width: 83.33333%; } .col-10-offset-1:last-child { padding-right: 0; } @@ -1074,8 +958,7 @@ a:focus { padding-left: 2em; padding-right: 1em; margin-left: 166.66667%; - width: 83.33333%; - vertical-align: top; } + width: 83.33333%; } .col-10-offset-2:last-child { padding-right: 0; } @@ -1083,8 +966,7 @@ a:focus { padding-left: 1em; padding-right: 1em; margin-left: 91.66667%; - width: 91.66667%; - vertical-align: top; } + width: 91.66667%; } .col-11-offset-1:last-child { padding-right: 0; } @@ -1303,8 +1185,6 @@ main[role="main"] .layout-content { overflow-y: auto; } main[role="main"] .layout-content .row .col > .wrapper > * { padding: 0 1em; } - main[role="main"] .layout-content .field.text-formatted a.audio-link { - border-bottom: 1px dotted red; } main[role="main"] h3.sur-title { font-size: 0.9em; @@ -1321,13 +1201,15 @@ main[role="main"] article.node.node--type-enregistrement { margin: 0.5em 0; } main[role="main"] article.node.node--type-enregistrement > h2 { font-size: 0.82em; - font-weight: 500; } + font-weight: 500; + text-transform: none; } main[role="main"] article.node.node--type-enregistrement.node--view-mode-transcript > h2, main[role="main"] article.node.node--type-enregistrement.node--view-mode-article > h2 { font-size: 0.82em; font-weight: 600; line-height: 1.6; + text-transform: none; margin: 0.9em 0 0 0; } html.js main[role="main"] article.node.node--type-enregistrement.node--view-mode-transcript h3.sur-title { @@ -1362,10 +1244,115 @@ main[role="main"] article.node.node--type-enregistrement.node--view-mode-transcr main[role="main"] article.node.node--type-enregistrement.node--view-mode-transcript nav div.field__label:hover:before, main[role="main"] article.node.node--type-enregistrement.node--view-mode-transcript nav div.field__label.is-active:before { background-color: red; } -main[role="main"] article.node p { +main[role="main"] article.node--type-page.node--view-mode-default > h2.node-title { + font-size: 1.3em; + font-weight: 500; + text-transform: uppercase; + margin: 0.3em 0; } + +main[role="main"] article.node--type-page.node--view-mode-default .field--name-field-visuel { + margin-bottom: 1em; } + +main[role="main"] .agenda { + text-align: center; } + main[role="main"] .agenda .past-events { + border-top: 1px solid red; + margin-top: 1em; } + main[role="main"] .agenda h3 { + font-size: 0.9em; + font-weight: normal; + text-transform: uppercase; } + main[role="main"] .agenda article.node > h2.node-title { + font-size: 0.82em; + font-weight: 600; + line-height: 1.6; + text-transform: none; + margin-bottom: 0; } + main[role="main"] .agenda .field--name-field-date time { + font-size: 0.82em; + font-weight: normal; + line-height: 1.4; } + +main[role="main"] div.taxonomy-term > h2 { + display: none; } + +main[role="main"] div.taxonomy-term > .content { + margin-top: 1em; } + +main[role="main"] div.taxonomy-term .field__label { + font-size: 0.9em; + font-weight: normal; + text-transform: uppercase; } + +main[role="main"] div.taxonomy-term .field--name-field-notice .field__label { + margin-bottom: 1em; } + +main[role="main"] div.taxonomy-term article.node--type-enregistrement h2.node-title { + font-size: 0.82em; + font-weight: 600; + line-height: 1.6; + text-transform: none; + margin: 0.9em 0 0 0; } + +main[role="main"] article.node p, main[role="main"] div.taxonomy-term p { font-size: 0.82em; font-weight: normal; - line-height: 1.6; } + line-height: 1.4; + margin: 0 0 1em 0; } + +main[role="main"] .field.text-formatted a { + display: inline-block; + position: relative; } + main[role="main"] .field.text-formatted a:after { + content: ''; + position: absolute; + width: 100%; + left: 0; + bottom: 0.2em; + border-bottom: 1px dotted #1A1A1A; } + main[role="main"] .field.text-formatted a.audio-link:after { + border-color: red; } + +main[role="main"] .productions-subtree a { + font-size: 0.82em; + font-weight: normal; + text-transform: uppercase; } + main[role="main"] .productions-subtree a:before { + content: ""; + display: inline-block; + width: 7px; + height: 7px; + border: 1px solid black; + margin-right: 0.5em; } + main[role="main"] .productions-subtree a:hover:before, main[role="main"] .productions-subtree a.is-active:before { + background-color: black; } + main[role="main"] .productions-subtree 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); } } + +main[role="main"] .productions-parent { + margin-top: 1em; + margin-bottom: 0.5em; } + main[role="main"] .productions-parent a { + font-size: 0.82em; + font-weight: normal; + text-transform: uppercase; } + main[role="main"] .productions-parent a:before { + content: '\2039'; + font-size: 1.7em; + line-height: 0.95; + margin-right: 0.1em; + margin-left: -0.4em; + display: inline-block; + vertical-align: bottom; } main[role="main"] img { max-width: 100%; @@ -2216,27 +2203,10 @@ main[role="main"] span.close-col-btn { body.path-agenda main .col > .wrapper { height: 100%; } -#agenda { - position: relative; - white-space: nowrap; - height: 100%; } - #agenda div.column { - white-space: normal; - display: inline-block; - vertical-align: top; - height: 100%; } - #agenda div.next-event { - width: 65%; } - #agenda div.future-past-events { - width: 33%; } - #agenda ul, #agenda li { - margin: 0; - padding: 0; - list-style: none; } - #agenda article.node--type-evenement h2 { - font-size: 0.9em; - font-weight: normal; - text-transform: uppercase; } +.agenda ul, .agenda li { + margin: 0; + padding: 0; + list-style: none; } body.path-frontpage .layout-content .row, body.path-productions .layout-content .row { white-space: normal; @@ -2263,18 +2233,17 @@ body.path-frontpage .layout-content .row, body.path-productions .layout-content padding: 0.5em 1em; } body.path-frontpage .layout-content .row .col > .wrapper article.node header h2.node-title, body.path-productions .layout-content .row .col > .wrapper article.node header h2.node-title { margin: 0; - font-size: 0.8em; - text-transform: lowercase; } + font-size: 0.9em; + font-weight: normal; + text-transform: uppercase; } body.path-frontpage .layout-content .row .col > .wrapper article.node.node--view-mode-image-2-columns header, body.path-productions .layout-content .row .col > .wrapper article.node.node--view-mode-image-2-columns header { position: absolute; bottom: 0; left: 0; } body.path-frontpage .layout-content .row .col > .wrapper article.node.node--view-mode-image-2-columns header h2.node-title, body.path-productions .layout-content .row .col > .wrapper article.node.node--view-mode-image-2-columns header h2.node-title { - font-size: 1.2em; - font-weight: 500; } - body.path-frontpage .layout-content .row .col > .wrapper article.node.node--view-mode-image-1-columns h2.node-title, body.path-productions .layout-content .row .col > .wrapper article.node.node--view-mode-image-1-columns h2.node-title { - font-size: 1em; - font-weight: 500; } + font-size: 1.3em; + font-weight: 500; + text-transform: uppercase; } body.path-frontpage .layout-content .row .col > .wrapper article.node.node--view-mode-text-1-column, body.path-productions .layout-content .row .col > .wrapper article.node.node--view-mode-text-1-column { padding: 0 1em; } diff --git a/sites/all/themes/custom/edlptheme/assets/scripts/history.js b/sites/all/themes/custom/edlptheme/assets/scripts/history.js index 3ba831fa9..6ed8192af 100644 --- a/sites/all/themes/custom/edlptheme/assets/scripts/history.js +++ b/sites/all/themes/custom/edlptheme/assets/scripts/history.js @@ -14,7 +14,6 @@ if(edlp.redirect){ window.localStorage.setItem('edlp_origin', JSON.stringify(edlp)); // redirect to home - // debugger; window.location.replace(window.location.origin+'/'+edlp.lang_code); }else{ console.log('history do not redirect'); diff --git a/sites/all/themes/custom/edlptheme/assets/scripts/main.js b/sites/all/themes/custom/edlptheme/assets/scripts/main.js index fe7e398b9..765b5b6ff 100644 --- a/sites/all/themes/custom/edlptheme/assets/scripts/main.js +++ b/sites/all/themes/custom/edlptheme/assets/scripts/main.js @@ -169,7 +169,17 @@ // reset all style may been added by other pages (like masonry for productions) // and replace all content with newly loaded // TODO: build a system to replace or append contents (like studio + search) - _$row.removeAttr('style').html(data.rendered); + if(data.entity_type == "node" && data.bundle == "evenement"){ + if(_$row.find('.col.event').length){ + _$row.find('.col.event').replaceWith(data.rendered); + }else if(_$row.find('.col.aside').length){ + _$row.find('.col.aside').replaceWith(data.rendered); + }else{ + _$row.append(data.rendered); + } + }else{ + _$row.removeAttr('style').html(data.rendered); + } // add body class for currently loaded content var body_classes = [ diff --git a/sites/all/themes/custom/edlptheme/assets/styles/app.scss b/sites/all/themes/custom/edlptheme/assets/styles/app.scss index 6809c070f..d5d2f0767 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/app.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/app.scss @@ -248,11 +248,6 @@ main[role="main"]{ } } } - .field.text-formatted{ - a.audio-link{ - border-bottom: 1px dotted red; - } - } } h3.sur-title{ @include content_titles; @@ -311,9 +306,123 @@ main[role="main"]{ } } } - article.node p{ - @include content_courant; + + article.node--type-page.node--view-mode-default{ + >h2.node-title{ + @include content_big_titles; + margin:0.3em 0; + } + .field--name-field-visuel{ + margin-bottom: 1em; + } } + + .agenda{ + .past-events{ + border-top: 1px solid red; + margin-top: 1em; + } + text-align: center; + h3{ + @include content_titles; + } + article.node > h2.node-title{ + @include content_subtitles; + margin-bottom: 0; + } + .field--name-field-date{ + time{ + @include content_courant; + } + } + + } + + div.taxonomy-term{ + >h2{display:none;} + >.content{ + margin-top: 1em; + } + .field__label{ + @include content_titles; + } + .field--name-field-notice{ + .field__label{ + margin-bottom: 1em; + } + } + article.node--type-enregistrement{ + h2.node-title{ + @include content_subtitles; + margin:0.9em 0 0 0; + } + } + } + + article.node p, div.taxonomy-term p{ + @include content_courant; + margin:0 0 1em 0; + } + + .field.text-formatted{ + a{ + display: inline-block; + position: relative; + &:after{ + content:''; + position: absolute; + // z-index: -1; + width:100%; + left:0; bottom:0.2em; + border-bottom: 1px dotted #1A1A1A; + } + &.audio-link{ + &:after{ + border-color: red; + } + } + } + } + + .productions-subtree{ + a{ + @include nav_link; + &: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; + } + } + } + + .productions-parent{ + margin-top: 1em; + margin-bottom: 0.5em; + a{ + @include nav_link; + &:before{ + content:'\2039'; + // font-weight: bold; + font-size: 1.7em; + line-height: 0.95; + margin-right:0.1em; + margin-left: -0.4em; + display: inline-block; + vertical-align:bottom; + } + } + } + img{ max-width: 100%; height: auto; @@ -1118,29 +1227,28 @@ body.path-agenda main .col{ height:100%; } } -#agenda{ - position: relative; - white-space: nowrap; - height: 100%; - div.column{ - white-space: normal; - display: inline-block; - vertical-align: top; - height:100%; - } - div.next-event{ - width:65%; - } - div.future-past-events{ - width:33%; - } +.agenda{ + // position: relative; + // white-space: nowrap; + // height: 100%; + // >*{ + // white-space: normal; + // } + // div.column{ + // display: inline-block; + // vertical-align: top; + // height:100%; + // } + // div.next-event{ + // width:65%; + // } + // div.future-past-events{ + // width:33%; + // } ul,li{ margin:0; padding:0; list-style: none; } - article.node--type-evenement{ - h2{ @include content_titles; } - } } @@ -1183,8 +1291,7 @@ body.path-frontpage, body.path-productions{ padding:0.5em 1em; h2.node-title{ margin:0; - font-size: 0.8em; - text-transform: lowercase; + @include content_titles; } // p{margin: 0;} } @@ -1194,21 +1301,21 @@ body.path-frontpage, body.path-productions{ position: absolute; bottom: 0; left:0; h2.node-title{ - font-size: 1.2em; - font-weight: 500; + @include content_big_titles; } } } - &.node--view-mode-image-1-columns{ - h2.node-title{ - font-size: 1em; - font-weight: 500; - } - } + // &.node--view-mode-image-1-columns{ + // h2.node-title{ + // // font-size: 1em; + // // font-weight: 500; + // } + // } &.node--view-mode-text-1-column{ padding:0 1em; } } + } } } diff --git a/sites/all/themes/custom/edlptheme/assets/styles/base/_fonts.scss b/sites/all/themes/custom/edlptheme/assets/styles/base/_fonts.scss index dcd16134c..3a3d976e3 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/base/_fonts.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/base/_fonts.scss @@ -1,3 +1,9 @@ +@mixin content_big_titles { + font-size: 1.3em; + font-weight: 500; + text-transform: uppercase; +} + @mixin content_titles { font-size: 0.9em; font-weight: normal; @@ -7,16 +13,24 @@ @mixin document_titles_teaser { font-size: 0.82em; font-weight: 500; + text-transform: none; } @mixin content_subtitles { font-size: 0.82em; font-weight: 600; line-height: 1.6; + text-transform: none; } @mixin content_courant { font-size: 0.82em; font-weight: normal; - line-height: 1.6; + line-height: 1.4; +} + +@mixin nav_link { + font-size: 0.82em; + font-weight: normal; + text-transform: uppercase; } diff --git a/sites/all/themes/custom/edlptheme/assets/styles/base/_grid.scss b/sites/all/themes/custom/edlptheme/assets/styles/base/_grid.scss index 3a391b349..099c70e88 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/base/_grid.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/base/_grid.scss @@ -8,8 +8,8 @@ $med-bp:1080px; // $large-bp:1900px; @mixin row() { - font-size: 0; - white-space: nowrap; + // font-size: 0; + // white-space: nowrap; position: relative; >*{ font-size: 16px; @@ -18,10 +18,11 @@ $med-bp:1080px; %col-reset { width: 100%; - display: inline-block; - font-size: 16px; + // display: inline-block; + // white-space:normal; + // font-size: 16px; + float:left; box-sizing: border-box; - white-space:normal; } @mixin col($col, $offset: 0, $sum: $default_sum, $gap: $default_gap, $align: top) { @@ -33,7 +34,7 @@ $med-bp:1080px; // @media only screen and (min-width: 768px) { width: percentage($col/$sum); - vertical-align: $align; + // vertical-align: $align; // } } diff --git a/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig b/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig index b32eba492..0fdd0095d 100644 --- a/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig +++ b/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig @@ -1,15 +1,15 @@ -
+
-
- -
- {{ next_event }} -
-
+
{{ coming_events }} {{ past_events }} -
- +
+
+
+
+
+
+ {{ next_event }}
diff --git a/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--default.html.twig b/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--default.html.twig index df2105b69..66c545996 100644 --- a/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--default.html.twig +++ b/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--default.html.twig @@ -1,4 +1,4 @@ -
+
{#
#} {{ content }} @@ -6,7 +6,7 @@
{% if aside %} -
+
{#
#} {{ aside }} diff --git a/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--evenement--default.html.twig b/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--evenement--default.html.twig new file mode 100644 index 000000000..f478e4a7c --- /dev/null +++ b/sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--evenement--default.html.twig @@ -0,0 +1,7 @@ +
+
+
+ {{ content }} +
+
+
diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml new file mode 100644 index 000000000..b68f055ae --- /dev/null +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml @@ -0,0 +1,39 @@ +uuid: f5c1b1ab-e59e-4d7c-9b30-adc390450b46 +langcode: fr +status: true +dependencies: + config: + - core.entity_view_mode.node.aside + - field.field.node.evenement.body + - field.field.node.evenement.field_date + - field.field.node.evenement.field_page_liee + - field.field.node.evenement.field_workflow_generic + - node.type.evenement + module: + - datetime_range + - user +id: node.evenement.aside +targetEntityType: node +bundle: evenement +mode: aside +content: + field_date: + weight: 1 + label: hidden + settings: + timezone_override: '' + format_type: long + separator: '-' + third_party_settings: { } + type: daterange_default + region: content + links: + weight: 0 + region: content + settings: { } + third_party_settings: { } +hidden: + body: true + field_page_liee: true + field_workflow_generic: true + langcode: true diff --git a/sites/default/config/sync/core.entity_view_mode.node.aside.yml b/sites/default/config/sync/core.entity_view_mode.node.aside.yml new file mode 100644 index 000000000..a647b1513 --- /dev/null +++ b/sites/default/config/sync/core.entity_view_mode.node.aside.yml @@ -0,0 +1,10 @@ +uuid: f634def2-a5a8-4b28-a71e-be46cf1edbd4 +langcode: fr +status: true +dependencies: + module: + - node +id: node.aside +label: Aside +targetEntityType: node +cache: true