diff --git a/config/sync/block.block.article.yml b/config/sync/block.block.article.yml index 6f04f8e..5429b6d 100644 --- a/config/sync/block.block.article.yml +++ b/config/sync/block.block.article.yml @@ -10,7 +10,7 @@ dependencies: id: article theme: rorschach region: content -weight: -3 +weight: -1 provider: null plugin: 'entity_field:node:field_article' settings: diff --git a/config/sync/block.block.booknavigation_2.yml b/config/sync/block.block.booknavigation_2.yml index 2cbfc14..24abb5c 100644 --- a/config/sync/block.block.booknavigation_2.yml +++ b/config/sync/block.block.booknavigation_2.yml @@ -16,7 +16,7 @@ plugin: book_navigation settings: id: book_navigation label: 'Book navigation' - label_display: visible + label_display: '0' provider: book block_mode: 'all pages' visibility: diff --git a/config/sync/block.block.breadcrumbs.yml b/config/sync/block.block.breadcrumbs.yml index a365a2d..5f21325 100644 --- a/config/sync/block.block.breadcrumbs.yml +++ b/config/sync/block.block.breadcrumbs.yml @@ -10,13 +10,13 @@ dependencies: id: breadcrumbs theme: rorschach region: content -weight: -6 +weight: -5 provider: null plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - label_display: visible + label_display: '0' provider: system visibility: context: diff --git a/config/sync/block.block.languageswitcher.yml b/config/sync/block.block.languageswitcher.yml index 4933802..971412a 100644 --- a/config/sync/block.block.languageswitcher.yml +++ b/config/sync/block.block.languageswitcher.yml @@ -16,7 +16,7 @@ plugin: 'language_block:language_interface' settings: id: 'language_block:language_interface' label: 'Language switcher' - label_display: visible + label_display: '0' provider: language visibility: context: diff --git a/config/sync/block.block.pagetitle_2.yml b/config/sync/block.block.pagetitle_2.yml index f967ea0..c8adab4 100644 --- a/config/sync/block.block.pagetitle_2.yml +++ b/config/sync/block.block.pagetitle_2.yml @@ -9,7 +9,7 @@ dependencies: id: pagetitle_2 theme: rorschach region: content -weight: -4 +weight: -3 provider: null plugin: page_title_block settings: diff --git a/config/sync/block.block.rorschach_content.yml b/config/sync/block.block.rorschach_content.yml index 26ed0fd..fcdb612 100644 --- a/config/sync/block.block.rorschach_content.yml +++ b/config/sync/block.block.rorschach_content.yml @@ -12,7 +12,7 @@ _core: id: rorschach_content theme: rorschach region: content -weight: -5 +weight: -4 provider: null plugin: system_main_block settings: diff --git a/config/sync/block.block.rorschach_primary_local_tasks.yml b/config/sync/block.block.rorschach_primary_local_tasks.yml index ac60eb6..0c95086 100644 --- a/config/sync/block.block.rorschach_primary_local_tasks.yml +++ b/config/sync/block.block.rorschach_primary_local_tasks.yml @@ -17,7 +17,7 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Primary tabs' - label_display: visible + label_display: '0' provider: core primary: true secondary: false diff --git a/config/sync/block.block.subheading.yml b/config/sync/block.block.subheading.yml new file mode 100644 index 0000000..0f42095 --- /dev/null +++ b/config/sync/block.block.subheading.yml @@ -0,0 +1,48 @@ +uuid: b76a822c-5dc5-4ce5-b4ef-5388d8a77308 +langcode: en +status: true +dependencies: + module: + - context + - ctools_block + theme: + - rorschach +id: subheading +theme: rorschach +region: content +weight: -2 +provider: null +plugin: 'entity_field:node:field_bookpage_subheading' +settings: + id: 'entity_field:node:field_bookpage_subheading' + label: 'Page SubHeading' + label_display: '0' + provider: ctools_block + context_mapping: + entity: '@node.node_route_context:node' + formatter: + type: text_default + weight: 0 + label: above + settings: { } + third_party_settings: { } +visibility: + context: + id: context + negate: null + values: '' + context_all: + id: context_all + negate: null + values: '' + user_status: + id: user_status + negate: false + context_mapping: + user: '@user.current_user_context:current_user' + user_status: + viewing_profile: '0' + logged_viewing_profile: '0' + own_page_true: '0' + field_value: '0' + user_fields: uid diff --git a/config/sync/core.entity_form_display.node.book.default.yml b/config/sync/core.entity_form_display.node.book.default.yml index c081261..fdc19bf 100644 --- a/config/sync/core.entity_form_display.node.book.default.yml +++ b/config/sync/core.entity_form_display.node.book.default.yml @@ -6,16 +6,20 @@ dependencies: - field.field.node.book.body - field.field.node.book.field_article - field.field.node.book.field_articles + - field.field.node.book.field_bookpage_subheading - field.field.node.book.field_image - field.field.node.book.field_subheading - field.field.node.book.field_tablefield - field.field.node.book.field_text - node.type.book module: + - advanced_text_formatter - field_layout - layout_discovery + - maxlength - paragraphs - path + - text third_party_settings: field_layout: id: layout_onecol @@ -30,13 +34,13 @@ mode: default content: created: type: datetime_timestamp - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } field_article: type: paragraphs - weight: 1 + weight: 2 region: content settings: title: Paragraph @@ -53,36 +57,50 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } + field_bookpage_subheading: + type: text_textfield + weight: 1 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: + maxlength: + maxlength_js: null + maxlength_js_label: 'Content limited to @limit characters, remaining: @remaining' + maxlength_js_enforce: false + advanced_text_formatter: + show_token_tree: 0 langcode: type: language_select - weight: 2 + weight: 3 region: content settings: include_locked: true third_party_settings: { } path: type: path - weight: 8 + weight: 9 region: content settings: { } third_party_settings: { } promote: type: boolean_checkbox - weight: 6 + weight: 7 region: content settings: display_label: true third_party_settings: { } status: type: boolean_checkbox - weight: 10 + weight: 11 region: content settings: display_label: true third_party_settings: { } sticky: type: boolean_checkbox - weight: 7 + weight: 8 region: content settings: display_label: true @@ -96,13 +114,13 @@ content: placeholder: '' third_party_settings: { } translation: - weight: 5 + weight: 6 region: content settings: { } third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 3 + weight: 4 region: content settings: match_operator: CONTAINS @@ -111,7 +129,7 @@ content: placeholder: '' third_party_settings: { } url_redirects: - weight: 9 + weight: 10 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_view_display.node.book.default.yml b/config/sync/core.entity_view_display.node.book.default.yml index 7622055..5c4b03d 100644 --- a/config/sync/core.entity_view_display.node.book.default.yml +++ b/config/sync/core.entity_view_display.node.book.default.yml @@ -6,6 +6,7 @@ dependencies: - field.field.node.book.body - field.field.node.book.field_article - field.field.node.book.field_articles + - field.field.node.book.field_bookpage_subheading - field.field.node.book.field_image - field.field.node.book.field_subheading - field.field.node.book.field_tablefield @@ -33,7 +34,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 0 + weight: 1 region: content field_article: type: entity_reference_revisions_entity_view @@ -53,6 +54,13 @@ content: third_party_settings: { } weight: 3 region: content + field_bookpage_subheading: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 0 + region: content field_image: type: entity_reference_revisions_entity_view label: above @@ -92,7 +100,7 @@ content: links: settings: { } third_party_settings: { } - weight: 1 + weight: 2 region: content hidden: langcode: true diff --git a/config/sync/core.entity_view_display.node.book.full.yml b/config/sync/core.entity_view_display.node.book.full.yml index 13eef7d..8b99289 100644 --- a/config/sync/core.entity_view_display.node.book.full.yml +++ b/config/sync/core.entity_view_display.node.book.full.yml @@ -7,6 +7,7 @@ dependencies: - field.field.node.book.body - field.field.node.book.field_article - field.field.node.book.field_articles + - field.field.node.book.field_bookpage_subheading - field.field.node.book.field_image - field.field.node.book.field_subheading - field.field.node.book.field_tablefield @@ -51,6 +52,7 @@ content: region: content hidden: field_article: true + field_bookpage_subheading: true field_image: true field_subheading: true field_tablefield: true diff --git a/config/sync/core.entity_view_display.node.book.teaser.yml b/config/sync/core.entity_view_display.node.book.teaser.yml index 2b54d6d..86ad16e 100644 --- a/config/sync/core.entity_view_display.node.book.teaser.yml +++ b/config/sync/core.entity_view_display.node.book.teaser.yml @@ -7,6 +7,7 @@ dependencies: - field.field.node.book.body - field.field.node.book.field_article - field.field.node.book.field_articles + - field.field.node.book.field_bookpage_subheading - field.field.node.book.field_image - field.field.node.book.field_subheading - field.field.node.book.field_tablefield @@ -52,6 +53,7 @@ content: region: content hidden: field_article: true + field_bookpage_subheading: true field_image: true field_subheading: true field_tablefield: true diff --git a/config/sync/field.field.node.book.field_bookpage_subheading.yml b/config/sync/field.field.node.book.field_bookpage_subheading.yml new file mode 100644 index 0000000..416baac --- /dev/null +++ b/config/sync/field.field.node.book.field_bookpage_subheading.yml @@ -0,0 +1,21 @@ +uuid: dedc9ff2-0efc-42ce-bb75-225e31b45824 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_bookpage_subheading + - node.type.book + module: + - text +id: node.book.field_bookpage_subheading +field_name: field_bookpage_subheading +entity_type: node +bundle: book +label: SubHeading +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text diff --git a/config/sync/field.field.paragraph.image.field_image.yml b/config/sync/field.field.paragraph.image.field_image.yml index 24e129f..6f5c547 100644 --- a/config/sync/field.field.paragraph.image.field_image.yml +++ b/config/sync/field.field.paragraph.image.field_image.yml @@ -34,7 +34,7 @@ settings: min_resolution: '' alt_field: true alt_field_required: true - title_field: false + title_field: true title_field_required: false default_image: uuid: '' diff --git a/config/sync/field.storage.node.field_bookpage_subheading.yml b/config/sync/field.storage.node.field_bookpage_subheading.yml new file mode 100644 index 0000000..604cb87 --- /dev/null +++ b/config/sync/field.storage.node.field_bookpage_subheading.yml @@ -0,0 +1,20 @@ +uuid: 848bc9ff-51f8-4492-840c-0bbc5f83bbc5 +langcode: en +status: true +dependencies: + module: + - node + - text +id: node.field_bookpage_subheading +field_name: field_bookpage_subheading +entity_type: node +type: text +settings: + max_length: 255 +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/node.type.book.yml b/config/sync/node.type.book.yml index 9ef60dc..93ae887 100644 --- a/config/sync/node.type.book.yml +++ b/config/sync/node.type.book.yml @@ -2,9 +2,16 @@ uuid: 9b0dd004-98ba-4cf1-becf-177beecfa616 langcode: fr status: true dependencies: + module: + - menu_ui enforced: module: - book +third_party_settings: + menu_ui: + available_menus: + - main + parent: 'main:' _core: default_config_hash: 2gWGA-X4ERc4McStS7cMEG3ZBpDEqfNRDPTjB1v674Y name: 'Book page' @@ -13,4 +20,4 @@ description: 'Books have a built-in hierarchical navigation. Use for ha help: '' new_revision: true preview_mode: 1 -display_submitted: true +display_submitted: false diff --git a/config/sync/views.view.book_traversal_links.yml b/config/sync/views.view.book_traversal_links.yml new file mode 100644 index 0000000..2e59416 --- /dev/null +++ b/config/sync/views.view.book_traversal_links.yml @@ -0,0 +1,201 @@ +uuid: c0be0038-de5e-4e57-b0a5-18fada0a35c8 +langcode: fr +status: true +dependencies: + config: + - block_content.type.content_book_page + module: + - block_content +id: book_traversal_links +label: 'Book traversal links' +module: views +description: '' +tag: '' +base_table: block_content_field_data +base_field: nid +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: 'Book traversal links' + fields: + info: + id: info + table: block_content_field_data + field: info + relationship: none + group_type: group + admin_label: '' + entity_type: null + entity_field: info + plugin_id: field + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: full + options: + offset: 0 + items_per_page: 5 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: none + options: { } + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: { } + filters: + status: + id: status + table: block_content_field_data + field: status + entity_type: block_content + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + reusable: + id: reusable + table: block_content_field_data + field: reusable + entity_type: block_content + entity_field: reusable + plugin_id: boolean + value: '1' + expose: + operator_limit_selection: false + operator_list: { } + type: + id: type + table: block_content_field_data + field: type + entity_type: block_content + entity_field: type + plugin_id: bundle + value: + content_book_page: content_book_page + expose: + operator_limit_selection: false + operator_list: { } + style: + type: default + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + header: { } + footer: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + tags: { } + block_1: + id: block_1 + display_title: Block + display_plugin: block + position: 1 + display_options: + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + tags: { } diff --git a/web/themes/custom/rorschach/css-compiled/styles.css b/web/themes/custom/rorschach/css-compiled/styles.css index 4eee657..2ef8a83 100644 --- a/web/themes/custom/rorschach/css-compiled/styles.css +++ b/web/themes/custom/rorschach/css-compiled/styles.css @@ -6,6 +6,12 @@ margin: auto; background-color: hotpink; } +table, th, td { + border: 1px solid; } + +#main-content { + background-color: blueviolet; } + /*global*/ @font-face { font-family: 'Font Awesome'; @@ -100,6 +106,9 @@ font-style: normal; } /* Colors used for EQL */ +.block { + box-shadow: 1px 0px 1px black; } + .layout-container { font-family: "Marianne", sans-serif; margin: none; @@ -122,24 +131,6 @@ .layout-content .field__label { visibility: hidden; } -.path-frontpage { - margin: 0; } - -.path-node { - margin: 0; } - .path-node main { - width: 100%; } - .path-node .main-content { - margin-top: 7rem; } - .path-node .field--name-field-titre .field__item { - color: #09398b; - font-weight: 900; - font-size: 2rem; } - .path-node .field--name-field-titre .field__label { - visibility: hidden; } - .path-node .inter-titre { - color: #009ee3; } - a { text-decoration: none; } @@ -799,6 +790,18 @@ a { .field--name-field-subheading { font-size: 2rem; } +.block { + border: black; } + +article.node-type-book { + width: 70%; } + article.node-type-book h2 { + visibility: hidden; } + article.node-type-book div:nth-child(1) > nav:nth-child(1) > ul:nth-child(2) { + display: flex; + flex-direction: row; + justify-content: space-between; } + /*partials*/ .layout-container { position: relative; @@ -817,6 +820,9 @@ a { color: black; top: 0%; scroll-margin: 8rem; } + #header-top .region-header-top-rigth { + display: flex; + flex-direction: row; } #header-top .region-header-top-left { display: flex; flex-direction: row; } diff --git a/web/themes/custom/rorschach/images/.png b/web/themes/custom/rorschach/images/.png deleted file mode 100644 index 846a402..0000000 Binary files a/web/themes/custom/rorschach/images/.png and /dev/null differ diff --git a/web/themes/custom/rorschach/images/Cite_architecture-Freaks_Architects026Copyright_David_Foessel_0.jpg b/web/themes/custom/rorschach/images/Cite_architecture-Freaks_Architects026Copyright_David_Foessel_0.jpg deleted file mode 100644 index 5c80dc9..0000000 Binary files a/web/themes/custom/rorschach/images/Cite_architecture-Freaks_Architects026Copyright_David_Foessel_0.jpg and /dev/null differ diff --git a/web/themes/custom/rorschach/images/Logement_sociaux_6_1.jpg b/web/themes/custom/rorschach/images/Logement_sociaux_6_1.jpg deleted file mode 100644 index b975624..0000000 Binary files a/web/themes/custom/rorschach/images/Logement_sociaux_6_1.jpg and /dev/null differ diff --git a/web/themes/custom/rorschach/images/carre_site.mp4 b/web/themes/custom/rorschach/images/carre_site.mp4 deleted file mode 100644 index b53c404..0000000 Binary files a/web/themes/custom/rorschach/images/carre_site.mp4 and /dev/null differ diff --git a/web/themes/custom/rorschach/images/evénement 308.jpg b/web/themes/custom/rorschach/images/evénement 308.jpg deleted file mode 100644 index 204aa95..0000000 Binary files a/web/themes/custom/rorschach/images/evénement 308.jpg and /dev/null differ diff --git a/web/themes/custom/rorschach/images/gouvernement_cartouche.png b/web/themes/custom/rorschach/images/gouvernement_cartouche.png deleted file mode 100644 index 2ee3249..0000000 Binary files a/web/themes/custom/rorschach/images/gouvernement_cartouche.png and /dev/null differ diff --git a/web/themes/custom/rorschach/images/ko.jpg b/web/themes/custom/rorschach/images/ko.jpg deleted file mode 100644 index 83c8f27..0000000 Binary files a/web/themes/custom/rorschach/images/ko.jpg and /dev/null differ diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu-offre.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu-offre.svg deleted file mode 100644 index 33bce20..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu-offre.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu.svg deleted file mode 100644 index d3781d2..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_annuairederecherche.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_annuairederecherche.svg deleted file mode 100644 index 3b9bea3..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_annuairederecherche.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_bdd.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_bdd.svg deleted file mode 100644 index a96844e..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_bdd.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_contact.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_contact.svg deleted file mode 100644 index a63c24b..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_contact.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_gouvernance.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_gouvernance.svg deleted file mode 100644 index 19c1e45..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_gouvernance.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_partenaire.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_partenaire.svg deleted file mode 100644 index 4c110b6..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_partenaire.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_programme.svg b/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_programme.svg deleted file mode 100644 index cb6c372..0000000 --- a/web/themes/custom/rorschach/images/pictos/carre-contour-bleu_programme.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/fleche_blanche.svg b/web/themes/custom/rorschach/images/pictos/fleche_blanche.svg deleted file mode 100644 index 2e6e8aa..0000000 --- a/web/themes/custom/rorschach/images/pictos/fleche_blanche.svg +++ /dev/null @@ -1,73 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/forme_home.svg b/web/themes/custom/rorschach/images/pictos/forme_home.svg deleted file mode 100644 index 562e340..0000000 --- a/web/themes/custom/rorschach/images/pictos/forme_home.svg +++ /dev/null @@ -1,117 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/forme_home_2.svg b/web/themes/custom/rorschach/images/pictos/forme_home_2.svg deleted file mode 100644 index e109e7e..0000000 --- a/web/themes/custom/rorschach/images/pictos/forme_home_2.svg +++ /dev/null @@ -1,123 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/forme_home_2_smartphone.svg b/web/themes/custom/rorschach/images/pictos/forme_home_2_smartphone.svg deleted file mode 100644 index 4ffbacb..0000000 --- a/web/themes/custom/rorschach/images/pictos/forme_home_2_smartphone.svg +++ /dev/null @@ -1,122 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/icons8-menu.svg b/web/themes/custom/rorschach/images/pictos/icons8-menu.svg deleted file mode 100644 index 9f75976..0000000 --- a/web/themes/custom/rorschach/images/pictos/icons8-menu.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/themes/custom/rorschach/images/pictos/linkedin_black.svg b/web/themes/custom/rorschach/images/pictos/linkedin_black.svg deleted file mode 100644 index 300a548..0000000 --- a/web/themes/custom/rorschach/images/pictos/linkedin_black.svg +++ /dev/null @@ -1,48 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/linkedin_white.svg b/web/themes/custom/rorschach/images/pictos/linkedin_white.svg deleted file mode 100644 index b4e379d..0000000 --- a/web/themes/custom/rorschach/images/pictos/linkedin_white.svg +++ /dev/null @@ -1,48 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/logo-twitter.png b/web/themes/custom/rorschach/images/pictos/logo-twitter.png deleted file mode 100644 index a2b40bf..0000000 Binary files a/web/themes/custom/rorschach/images/pictos/logo-twitter.png and /dev/null differ diff --git a/web/themes/custom/rorschach/images/pictos/menu.png b/web/themes/custom/rorschach/images/pictos/menu.png deleted file mode 100644 index 1c93b59..0000000 Binary files a/web/themes/custom/rorschach/images/pictos/menu.png and /dev/null differ diff --git a/web/themes/custom/rorschach/images/pictos/noun_Arrow_3771902-rouge.svg b/web/themes/custom/rorschach/images/pictos/noun_Arrow_3771902-rouge.svg deleted file mode 100644 index ecb4720..0000000 --- a/web/themes/custom/rorschach/images/pictos/noun_Arrow_3771902-rouge.svg +++ /dev/null @@ -1,54 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/noun_Arrow_3771902.svg b/web/themes/custom/rorschach/images/pictos/noun_Arrow_3771902.svg deleted file mode 100644 index 0f54258..0000000 --- a/web/themes/custom/rorschach/images/pictos/noun_Arrow_3771902.svg +++ /dev/null @@ -1,53 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/noun_Download_file_307900.svg b/web/themes/custom/rorschach/images/pictos/noun_Download_file_307900.svg deleted file mode 100644 index 14b1f56..0000000 --- a/web/themes/custom/rorschach/images/pictos/noun_Download_file_307900.svg +++ /dev/null @@ -1,48 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/noun_External Link_674151.svg b/web/themes/custom/rorschach/images/pictos/noun_External Link_674151.svg deleted file mode 100644 index 71c2392..0000000 --- a/web/themes/custom/rorschach/images/pictos/noun_External Link_674151.svg +++ /dev/null @@ -1,55 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/noun_Loupe_337697.svg b/web/themes/custom/rorschach/images/pictos/noun_Loupe_337697.svg deleted file mode 100644 index 1cef4b0..0000000 --- a/web/themes/custom/rorschach/images/pictos/noun_Loupe_337697.svg +++ /dev/null @@ -1,43 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/picto_faq.svg b/web/themes/custom/rorschach/images/pictos/picto_faq.svg deleted file mode 100644 index 2dc6965..0000000 --- a/web/themes/custom/rorschach/images/pictos/picto_faq.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/picto_faq_2.svg b/web/themes/custom/rorschach/images/pictos/picto_faq_2.svg deleted file mode 100644 index ea684ae..0000000 --- a/web/themes/custom/rorschach/images/pictos/picto_faq_2.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/rosace.svg b/web/themes/custom/rorschach/images/pictos/rosace.svg deleted file mode 100644 index c43d501..0000000 --- a/web/themes/custom/rorschach/images/pictos/rosace.svg +++ /dev/null @@ -1,904 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/rosace_coupee.png b/web/themes/custom/rorschach/images/pictos/rosace_coupee.png deleted file mode 100644 index bc2cdb7..0000000 Binary files a/web/themes/custom/rorschach/images/pictos/rosace_coupee.png and /dev/null differ diff --git a/web/themes/custom/rorschach/images/pictos/rosace_coupee.svg b/web/themes/custom/rorschach/images/pictos/rosace_coupee.svg deleted file mode 100644 index 1f15e40..0000000 --- a/web/themes/custom/rorschach/images/pictos/rosace_coupee.svg +++ /dev/null @@ -1,866 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/themes/custom/rorschach/images/pictos/twitter_black.svg b/web/themes/custom/rorschach/images/pictos/twitter_black.svg deleted file mode 100644 index ddbf641..0000000 --- a/web/themes/custom/rorschach/images/pictos/twitter_black.svg +++ /dev/null @@ -1,43 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/twitter_white.svg b/web/themes/custom/rorschach/images/pictos/twitter_white.svg deleted file mode 100644 index 2ecbb82..0000000 --- a/web/themes/custom/rorschach/images/pictos/twitter_white.svg +++ /dev/null @@ -1,43 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/youtube_black.svg b/web/themes/custom/rorschach/images/pictos/youtube_black.svg deleted file mode 100644 index 1fdef8f..0000000 --- a/web/themes/custom/rorschach/images/pictos/youtube_black.svg +++ /dev/null @@ -1,74 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/pictos/youtube_white.svg b/web/themes/custom/rorschach/images/pictos/youtube_white.svg deleted file mode 100644 index 2c5bc91..0000000 --- a/web/themes/custom/rorschach/images/pictos/youtube_white.svg +++ /dev/null @@ -1,78 +0,0 @@ - -image/svg+xml diff --git a/web/themes/custom/rorschach/images/sceau_excellence_def.png b/web/themes/custom/rorschach/images/sceau_excellence_def.png deleted file mode 100644 index 56969fa..0000000 Binary files a/web/themes/custom/rorschach/images/sceau_excellence_def.png and /dev/null differ diff --git a/web/themes/custom/rorschach/rorschach.info.yml b/web/themes/custom/rorschach/rorschach.info.yml index d8d33fe..0dede02 100644 --- a/web/themes/custom/rorschach/rorschach.info.yml +++ b/web/themes/custom/rorschach/rorschach.info.yml @@ -14,9 +14,9 @@ regions: header_top_left: 'Header top left' header_top_rigth: 'Header top right' header_bottom: 'Header Bottom' - help: Help + help: 'Help' page_top: 'Page top' - content: Content + content: 'Main Content' sidebar_first: 'Sidebar first' sidebar_second: 'Sidebar second' page_bottom: 'Page bottom' diff --git a/web/themes/custom/rorschach/scss/components/_tablefields.scss b/web/themes/custom/rorschach/scss/components/_tablefields.scss new file mode 100644 index 0000000..0b4a02a --- /dev/null +++ b/web/themes/custom/rorschach/scss/components/_tablefields.scss @@ -0,0 +1,14 @@ +// .tablefield{ +// border: 1px 1px 1px black; +// thead{ +// box-shadow: 1px 0px 1px $black; + +// } +// } + +thead th { + border-bottom: 1px solid #333; + text-align: center; + font-weight: bold; +} + diff --git a/web/themes/custom/rorschach/scss/global/_layout.scss b/web/themes/custom/rorschach/scss/global/_layout.scss index 7d963ae..e06f5a5 100644 --- a/web/themes/custom/rorschach/scss/global/_layout.scss +++ b/web/themes/custom/rorschach/scss/global/_layout.scss @@ -1,5 +1,14 @@ +.block{ + box-shadow: 1px 0px 1px $black; +} + +// .layout-sidebar-first{ +// clear: left; +// } + + .layout-container { font-family: $font-family-default; margin: none; @@ -14,12 +23,18 @@ flex: 0 0 100%; } main{ + position: relative; // top: -7rem; + .layout-sidebar-first{ + + } } footer{ flex: 0 0 100%; } + + } .layout-content{ padding-top: 7rem; @@ -28,31 +43,32 @@ visibility: hidden; } } -.path-frontpage{ - margin: 0; -} -.path-node { - margin: 0; +// .path-frontpage{ +// margin: 0; +// } +// .path-node { +// margin: 0; -main{ - width: 100%; -} -.main-content{ - margin-top: 7rem; -} +// main{ +// width: 100%; +// } +// .main-content{ +// margin-top: 7rem; +// } + +// .field--name-field-titre{ +// .field__item{ +// color: $blue-dark; +// font-weight: 900; +// font-size: 2rem; +// } +// .field__label{ +// visibility: hidden; +// } +// } +// .inter-titre { +// color: $blue-light; +// // text-transform: uppercase; +// } +// } - .field--name-field-titre{ - .field__item{ - color: $blue-dark; - font-weight: 900; - font-size: 2rem; - } - .field__label{ - visibility: hidden; - } - } -.inter-titre { - color: $blue-light; - // text-transform: uppercase; -} -} \ No newline at end of file diff --git a/web/themes/custom/rorschach/scss/pages/_bookpage.scss b/web/themes/custom/rorschach/scss/pages/_bookpage.scss index dbd7db2..990d6c9 100644 --- a/web/themes/custom/rorschach/scss/pages/_bookpage.scss +++ b/web/themes/custom/rorschach/scss/pages/_bookpage.scss @@ -1,3 +1,21 @@ .field--name-field-subheading{ font-size: 2rem; +} + +.block{ + border: black; +} +h2{ + +} +article.node-type-book{ + width: 70%; + h2{ + visibility: hidden; + } + div:nth-child(1) > nav:nth-child(1) > ul:nth-child(2){ + display: flex; + flex-direction: row; + justify-content: space-between; + } } \ No newline at end of file diff --git a/web/themes/custom/rorschach/scss/pages/_header.scss b/web/themes/custom/rorschach/scss/pages/_header.scss deleted file mode 100644 index f598052..0000000 --- a/web/themes/custom/rorschach/scss/pages/_header.scss +++ /dev/null @@ -1,270 +0,0 @@ - -.layout-container{ - position: relative; - header{ - // display: block; - width: 100%; - position: fixed; - z-index: 99; - // position: -webkit-sticky; - // position: sticky; - // top: 0; - // .sticky{ - // position: fixed; - // } - - } - - -} - - - -#header-top { - height: 7rem; - background-color: $white; - box-shadow: 1px 0px 8px $black; - display: flex; - flex-direction: row; - justify-content: space-between; - color: $black; - top:0%; - scroll-margin: 8rem {}; - - - // logo + menu déroulant - .region-header-top-left { - display:flex; - flex-direction: row; - padding: 1rem; - padding-left: 4%; - align-items:center; - color: $black; - font-weight: 800; - flex: 1; - - #block-logogouv{ - display: flex; - height: 100%; - align-items: center; - img{ - width: 80%; - height: auto; - } - } - #block-logoeql{ - display: flex; - height: 100%; - align-items: center; - - img{ - // min-width: 80px; - width: 80%; - height: auto; - } - } - - #block-headermenu{ - align-self: baseline; - width: 70%; - margin-left: 3rem; - margin-right: 3rem; - } - - ul{ - font-size: 1rem; - list-style: none; - display: flex; - flex-direction: row; - justify-content: space-between; - // margin-right: 20px; - width: 100%; - padding-inline-start: 0px; - padding: 1rem; - .is-active{ - color:$blue-light; - } - ul{ - display: flex; - flex-direction: column; - display: none; - min-width: 100px; - width: 100%; - justify-content: space-between; - background:$white; - // padding-inline-start: 0; - padding-inline-start: 0px; - - .is-active{ - color:$blue-light; - } - } - li{ - display: flex; - flex-direction: column; - // justify-content: space-between; - background-color: $white; - padding-bottom: 0.8rem; - max-width: inherit; - align-items: center; - // padding-left: 0; - // text-align: none - ; - // .menuOpen{ - // display: flex; - // } - a { - color: $black; - } - .is-active{ - color:$blue-light; - } - :hover{ - color: $blue-light; - } - } - - li:hover ul { - display: block; - } - } - } - - // reseaux sociaux - - #block-socialnetwork-2{ - position: relative; - top: -33px; - align-self: flex-end; - margin-left: auto; - .field--name-body{ - min-height: 75px; - margin-right: 1rem; - } - p{ - display: flex; - flex-direction: row-reverse; - margin-bottom: 0; - min-height: 65px; - justify-content: space-around; - width: 120%; - a{ - color: $white; - font-size: 0; - } - svg.ext{ - display: none; - } - .link-twitter{ - display: flex; - background-color: black; - width: 40px; - justify-content: center; - align-items: flex-end; - &:before{ - content: url("../images/pictos/twitter_white.svg"); - min-width: 30px; - padding-bottom: 0.3rem; - } - } - .link-youtube{ - display: flex; - background-color: black; - min-width: 40px; - justify-content: center; - align-items: flex-end; - &:before{ - content: url("../images/pictos/youtube_white.svg"); - min-width: 25px; - padding-bottom: 0.5rem; - } - } - .link-linkedin{ - display: flex; - background-color: black; - min-width: 40px; - justify-content: center; - align-items: flex-end; - // background-position-y: top; - - &:before{ - content: url("../images/pictos/linkedin_white.svg"); - min-width: 35px; - padding-bottom: 0.2rem; - } - } - } - - } - -// menu burger à droite - #block-burger { - z-index: 1; - background-color: $blue-light; - font-size: 0.7rem; - color: $white; - display: block; - width: 7rem; - height: 100%; - margin-top: 0; - :hover{ - cursor: pointer; - } - h2{ - padding-top: 1rem; - } - h2:after{ - display: block; - margin:auto; - height: 70px; - content:url('data:image/svg+xml, '); - } - - #block-burger-menu{ - display: block; - margin: 0; - align-self: center; - text-align: center; - // height:7rem; - } - - - // block menu open fond bleu - - .ul1:not(.sous-liste){ - width: 300%; - position: relative; - right: 260px; - margin: 0; - padding-top: 2rem; - padding-bottom: 2rem; - z-index: 99; - - } - ul { - display: none; - background-color: $blue-light; - line-height: 2rem; - list-style: none; - - .ul1 .sous-liste{ - a{ - opacity: 1; - } - } - a{ - opacity: 0.6; - color: $white; - font-weight: 800; - font-size: 1rem; - } - } - &.opened ul { - display: block; - - } - } - - -} - diff --git a/web/themes/custom/rorschach/scss/partials/_header.scss b/web/themes/custom/rorschach/scss/partials/_header.scss index 36d3ded..f1f733d 100644 --- a/web/themes/custom/rorschach/scss/partials/_header.scss +++ b/web/themes/custom/rorschach/scss/partials/_header.scss @@ -18,12 +18,8 @@ // } } - - } - - #header-top { height: 7rem; background-color: $white; @@ -36,11 +32,12 @@ scroll-margin: 8rem {}; -// .region-header-top-rigth{ -// display: flex; -// flex-direction: row; -// } + .region-header-top-rigth{ + display: flex; + flex-direction: row; + } + // logo + menu déroulant .region-header-top-left { display:flex; @@ -57,7 +54,7 @@ } } - + #block-rorschach-main-menu{ align-self: baseline; @@ -134,6 +131,7 @@ } + // menu burger à droite diff --git a/web/themes/custom/rorschach/scss/partials/_navigation.scss b/web/themes/custom/rorschach/scss/partials/_navigation.scss new file mode 100644 index 0000000..e69de29 diff --git a/web/themes/custom/rorschach/scss/styles.scss b/web/themes/custom/rorschach/scss/styles.scss index 4a77e00..dda1896 100644 --- a/web/themes/custom/rorschach/scss/styles.scss +++ b/web/themes/custom/rorschach/scss/styles.scss @@ -1,7 +1,8 @@ /*eql*/ /*components*/ -@import "components/_quotes"; +@import "components/_quotes"; +@import "components/_tablefields"; /*global*/ @@ -29,5 +30,6 @@ /*partials*/ @import "partials/_header"; @import "partials/_footer"; +@import "partials/_navigation"; diff --git a/web/themes/custom/rorschach/templates/layout/html--ressources--annuairederecherche.html.twig b/web/themes/custom/rorschach/templates/layout/html--ressources--annuairederecherche.html.twig deleted file mode 100644 index 0879e0f..0000000 --- a/web/themes/custom/rorschach/templates/layout/html--ressources--annuairederecherche.html.twig +++ /dev/null @@ -1,56 +0,0 @@ -{# -/** - * @file - * Theme override for the basic structure of a single Drupal page. - * - * Variables: - * - logged_in: A flag indicating if user is logged in. - * - root_path: The root path of the current page (e.g., node, admin, user). - * - node_type: The content type for the current node, if the page is a node. - * - head_title: List of text elements that make up the head_title variable. - * May contain one or more of the following: - * - title: The title of the page. - * - name: The name of the site. - * - slogan: The slogan of the site. - * - page_top: Initial rendered markup. This should be printed before 'page'. - * - page: The rendered page markup. - * - page_bottom: Closing rendered markup. This variable should be printed after - * 'page'. - * - db_offline: A flag indicating if the database is offline. - * - placeholder_token: The token for generating head, css, js and js-bottom - * placeholders. - * - * @see template_preprocess_html() - */ -#} -{% - set body_classes = [ - logged_in ? 'user-logged-in', - not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class, - node_type ? 'page-node-type-' ~ node_type|clean_class, - db_offline ? 'db-offline', - 'annuairederecherche', - ] -%} - - - - - {{ head_title|safe_join(' | ') }} - - - - - {# - Keyboard navigation/accessibility link to main content section in - page.html.twig. - #} - - {{ page_top }} - {{ page }} - {{ page_bottom }} - - - \ No newline at end of file diff --git a/web/themes/custom/rorschach/templates/layout/html--ressources--bdd--30.html.twig b/web/themes/custom/rorschach/templates/layout/html--ressources--bdd--30.html.twig deleted file mode 100644 index c51eb11..0000000 --- a/web/themes/custom/rorschach/templates/layout/html--ressources--bdd--30.html.twig +++ /dev/null @@ -1,57 +0,0 @@ -{# -/** - * @file - * Theme override for the basic structure of a single Drupal page. - * - * Variables: - * - logged_in: A flag indicating if user is logged in. - * - root_path: The root path of the current page (e.g., node, admin, user). - * - node_type: The content type for the current node, if the page is a node. - * - head_title: List of text elements that make up the head_title variable. - * May contain one or more of the following: - * - title: The title of the page. - * - name: The name of the site. - * - slogan: The slogan of the site. - * - page_top: Initial rendered markup. This should be printed before 'page'. - * - page: The rendered page markup. - * - page_bottom: Closing rendered markup. This variable should be printed after - * 'page'. - * - db_offline: A flag indicating if the database is offline. - * - placeholder_token: The token for generating head, css, js and js-bottom - * placeholders. - * - * @see template_preprocess_html() - */ -#} -{% - set body_classes = [ - logged_in ? 'user-logged-in', - not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class, - node_type ? 'page-node-type-' ~ node_type|clean_class, - db_offline ? 'db-offline', - 'basededonnees', - 'autres', - ] -%} - - - - - {{ head_title|safe_join(' | ') }} - - - - - {# - Keyboard navigation/accessibility link to main content section in - page.html.twig. - #} - - {{ page_top }} - {{ page }} - {{ page_bottom }} - - - \ No newline at end of file diff --git a/web/themes/custom/rorschach/templates/layout/html--ressources--bdd.html.twig b/web/themes/custom/rorschach/templates/layout/html--ressources--bdd.html.twig deleted file mode 100644 index 6f96feb..0000000 --- a/web/themes/custom/rorschach/templates/layout/html--ressources--bdd.html.twig +++ /dev/null @@ -1,56 +0,0 @@ -{# -/** - * @file - * Theme override for the basic structure of a single Drupal page. - * - * Variables: - * - logged_in: A flag indicating if user is logged in. - * - root_path: The root path of the current page (e.g., node, admin, user). - * - node_type: The content type for the current node, if the page is a node. - * - head_title: List of text elements that make up the head_title variable. - * May contain one or more of the following: - * - title: The title of the page. - * - name: The name of the site. - * - slogan: The slogan of the site. - * - page_top: Initial rendered markup. This should be printed before 'page'. - * - page: The rendered page markup. - * - page_bottom: Closing rendered markup. This variable should be printed after - * 'page'. - * - db_offline: A flag indicating if the database is offline. - * - placeholder_token: The token for generating head, css, js and js-bottom - * placeholders. - * - * @see template_preprocess_html() - */ -#} -{% - set body_classes = [ - logged_in ? 'user-logged-in', - not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class, - node_type ? 'page-node-type-' ~ node_type|clean_class, - db_offline ? 'db-offline', - 'basededonnees', - ] -%} - - - - - {{ head_title|safe_join(' | ') }} - - - - - {# - Keyboard navigation/accessibility link to main content section in - page.html.twig. - #} - - {{ page_top }} - {{ page }} - {{ page_bottom }} - - - \ No newline at end of file diff --git a/web/themes/custom/rorschach/templates/layout/html--ressources--offresdeservice.html.twig b/web/themes/custom/rorschach/templates/layout/html--ressources--offresdeservice.html.twig deleted file mode 100644 index 47b2c54..0000000 --- a/web/themes/custom/rorschach/templates/layout/html--ressources--offresdeservice.html.twig +++ /dev/null @@ -1,57 +0,0 @@ -{# -/** - * @file - * Theme override for the basic structure of a single Drupal page. - * - * Variables: - * - logged_in: A flag indicating if user is logged in. - * - root_path: The root path of the current page (e.g., node, admin, user). - * - node_type: The content type for the current node, if the page is a node. - * - head_title: List of text elements that make up the head_title variable. - * May contain one or more of the following: - * - title: The title of the page. - * - name: The name of the site. - * - slogan: The slogan of the site. - * - page_top: Initial rendered markup. This should be printed before 'page'. - * - page: The rendered page markup. - * - page_bottom: Closing rendered markup. This variable should be printed after - * 'page'. - * - db_offline: A flag indicating if the database is offline. - * - placeholder_token: The token for generating head, css, js and js-bottom - * placeholders. - * - * @see template_preprocess_html() - */ -#} -{% - set body_classes = [ - logged_in ? 'user-logged-in', - not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class, - node_type ? 'page-node-type-' ~ node_type|clean_class, - - db_offline ? 'db-offline', - 'offresdeservices', - ] -%} - - - - - {{ head_title|safe_join(' | ') }} - - - - - {# - Keyboard navigation/accessibility link to main content section in - page.html.twig. - #} - - {{ page_top }} - {{ page }} - {{ page_bottom }} - - - \ No newline at end of file