From ba3e290741900f8399d0a166a88b3917b4eab60b Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Tue, 13 Mar 2018 15:20:26 +0100 Subject: [PATCH] header menus + languages in header, fix #15 --- .../edlptheme/assets/dist/styles/app.min.css | 36 ++++++++- .../custom/edlptheme/assets/styles/app.scss | 73 +++++++++---------- .../edlptheme/assets/styles/base/_layout.scss | 4 + .../sync/block.block.languageswitcher.yml | 2 +- .../sync/block.block.mainnavigation.yml | 2 +- .../sync/block.block.selecteurdelangue_2.yml | 20 +++++ sites/default/config/sync/core.extension.yml | 1 + .../config/sync/migrate_drupal.settings.yml | 1 + 8 files changed, 98 insertions(+), 41 deletions(-) create mode 100644 sites/default/config/sync/block.block.selecteurdelangue_2.yml 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 bb0e7515a..292f1ac31 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 @@ -1104,6 +1104,9 @@ header[role="banner"] { padding: 0.5em 0; border-bottom: 1px solid red; height: 70px; } + header[role="banner"] > .wrapper > .region { + height: 100%; + position: relative; } main[role="main"] { z-index: 1; @@ -1160,7 +1163,8 @@ header[role="banner"] { overflow: hidden; } #block-mainnavigation { - float: right; } + float: right; + margin-top: 30px; } #block-mainnavigation ul { margin: 0; padding: 0; @@ -1180,7 +1184,7 @@ header[role="banner"] { display: inline-block; width: 0.6em; height: 0.6em; - border: 1px solid #000; + border: 1px solid red; margin-right: 0.3em; } #block-mainnavigation ul li a.ajax-loading:before { -webkit-animation: rotation 2s infinite linear; @@ -1205,6 +1209,34 @@ header[role="banner"] { border-color: red; background-color: red; } +.block-language { + float: right; + margin-top: 29px; + margin-left: 2em; } + .block-language ul { + margin: 0; + padding: 0; } + .block-language ul li { + display: inline-block; + vertical-align: middle; + list-style: none; } + .block-language ul li a { + font-size: 0.690em; + color: inherit; + text-decoration: none; + text-transform: capitalize; + margin-left: 0.8em; } + .block-language ul li a:before { + content: ""; + display: inline-block; + width: 0.6em; + height: 0.6em; + border: 1px solid red; + margin-right: 0.3em; } + .block-language ul li.is-active a:before, .block-language ul li:hover a:before { + border-color: red; + background-color: red; } + main[role="main"] .layout-content { pointer-events: none; } main[role="main"] .layout-content .row { diff --git a/sites/all/themes/custom/edlptheme/assets/styles/app.scss b/sites/all/themes/custom/edlptheme/assets/styles/app.scss index 133e7780b..312b8457f 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/app.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/app.scss @@ -79,47 +79,12 @@ header[role="banner"]{ text-indent: 500px; overflow: hidden; } - // font-size: 1.5em; - // text-transform: lowercase; - // a{ - // $col_w:3.74em; - // $col_gap:2em; - // line-height: 0.93; - // text-align: center; - // color: inherit; - // text-decoration: none; - // display: inline-block; - // columns:$col_w 2; - // column-gap: $col_gap; - // word-break:break-all; - // hyphens:auto; - // position: relative; - // &:after, &:before{ - // content: ''; - // position: absolute; - // top:50%; - // height:0; - // } - // &:before{ - // left:$col_w; - // border-bottom:0.08em solid #000; - // width:2.5em; - // transform: rotateZ(-45deg); - // } - // &:after{ - // $w:0.5em; - // top:47%; - // left:($col_w+$col_gap/2); - // border-top:0.2em solid red; - // width:$w; - // transform: rotateZ(45deg); - // } - // } } } #block-mainnavigation{ float:right; + margin-top: 30px; ul{ margin:0; padding: 0; white-space: nowrap; @@ -137,7 +102,7 @@ header[role="banner"]{ display:inline-block; $sq:0.6em; width: $sq; height:$sq; - border: 1px solid #000; + border: 1px solid red; margin-right: 0.3em; } &.ajax-loading:before{ @@ -153,6 +118,40 @@ header[role="banner"]{ } } +.block-language{ + float: right; + margin-top: 29px; + margin-left: 2em; + ul{ + margin:0; padding:0; + li{ + display: inline-block; vertical-align: middle; + list-style: none; + a{ + font-size: 0.690em; + color:inherit; + text-decoration: none; + text-transform: capitalize; + margin-left: 0.8em; + &:before{ + content: ""; + display:inline-block; + $sq:0.6em; + width: $sq; height:$sq; + border: 1px solid red; + margin-right: 0.3em; + } + } + &.is-active, + &:hover{ + a:before{ + border-color: red; + background-color: red; + } + } + } + } +} // _ // _ __ __ _(_)_ _ diff --git a/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss b/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss index 56eea7a9f..52713f892 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss @@ -29,6 +29,10 @@ header[role="banner"]{ border-bottom: 1px solid red; // TODO: what header height to fit well with player ?? height:70px; + >.region{ + height:100%; + position: relative; + } } } diff --git a/sites/default/config/sync/block.block.languageswitcher.yml b/sites/default/config/sync/block.block.languageswitcher.yml index 3035c0fdf..7fb58cd16 100644 --- a/sites/default/config/sync/block.block.languageswitcher.yml +++ b/sites/default/config/sync/block.block.languageswitcher.yml @@ -1,6 +1,6 @@ uuid: 85586498-0023-422f-a6b2-19db835228b3 langcode: en -status: true +status: false dependencies: module: - domain diff --git a/sites/default/config/sync/block.block.mainnavigation.yml b/sites/default/config/sync/block.block.mainnavigation.yml index e99d15ee7..2ffdd6817 100644 --- a/sites/default/config/sync/block.block.mainnavigation.yml +++ b/sites/default/config/sync/block.block.mainnavigation.yml @@ -12,7 +12,7 @@ dependencies: id: mainnavigation theme: edlptheme region: header -weight: -4 +weight: -3 provider: null plugin: 'system_menu_block:main' settings: diff --git a/sites/default/config/sync/block.block.selecteurdelangue_2.yml b/sites/default/config/sync/block.block.selecteurdelangue_2.yml new file mode 100644 index 000000000..c6a440803 --- /dev/null +++ b/sites/default/config/sync/block.block.selecteurdelangue_2.yml @@ -0,0 +1,20 @@ +uuid: 36a3cd2e-2c2d-4f9c-98d6-5edf13f971aa +langcode: fr +status: true +dependencies: + module: + - language + theme: + - edlptheme +id: selecteurdelangue_2 +theme: edlptheme +region: header +weight: -4 +provider: null +plugin: 'language_block:language_interface' +settings: + id: 'language_block:language_interface' + label: 'Sélecteur de langue' + provider: language + label_display: '0' +visibility: { } diff --git a/sites/default/config/sync/core.extension.yml b/sites/default/config/sync/core.extension.yml index 3a72c938a..06ed22e89 100644 --- a/sites/default/config/sync/core.extension.yml +++ b/sites/default/config/sync/core.extension.yml @@ -58,6 +58,7 @@ module: migrate_drupal: 0 migrate_plus: 0 migrate_tools: 0 + module_missing_message_fixer: 0 node: 0 options: 0 page_cache: 0 diff --git a/sites/default/config/sync/migrate_drupal.settings.yml b/sites/default/config/sync/migrate_drupal.settings.yml index 55482b4d9..f18377b82 100644 --- a/sites/default/config/sync/migrate_drupal.settings.yml +++ b/sites/default/config/sync/migrate_drupal.settings.yml @@ -1,3 +1,4 @@ enforce_source_module_tags: - 'Drupal 6' - 'Drupal 7' +langcode: fr