diff --git a/web/themes/custom/reha/dist/css/bundle.css b/web/themes/custom/reha/dist/css/bundle.css index 9916dc2..0f9ba49 100644 --- a/web/themes/custom/reha/dist/css/bundle.css +++ b/web/themes/custom/reha/dist/css/bundle.css @@ -346,7 +346,7 @@ header .region-header #block-reha-logoreha .field--name-field-logo .field__item height: 110px; } header .region-header #block-reha-logoreha .field--name-field-logo .field__item img { - max-height: 85px; + max-height: 92px; width: auto; } header .region-header #block-reha-navigationprincipale { @@ -970,17 +970,20 @@ aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-sit content: url(../images/noun-cross-1151731.svg); cursor: pointer; } -aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage { +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage, +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-evenement { text-transform: uppercase; display: flex; flex-direction: column; } -aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage > div:nth-child(1) { +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage > div:nth-child(1), +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-evenement > div:nth-child(1) { display: flex; align-items: center; flex-direction: row; } -aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage > div:nth-child(1)::before { +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage > div:nth-child(1)::before, +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-evenement > div:nth-child(1)::before { content: url("../../dist/images/noun-file-6880430.svg"); display: inline-flex; width: 70px; @@ -988,35 +991,44 @@ aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dos padding-right: 1rem; align-items: center; } -aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage .field__item { - width: 75%; - align-self: flex-end; - padding-right: 2rem; +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage .field__item .paragraph--type--dossier, +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-evenement .field__item .paragraph--type--dossier { + padding-left: 25%; } -aside.layout-sidebar-second footer { +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage .field__item .paragraph--type--dossier .field--name-field-fichiers, +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-evenement .field__item .paragraph--type--dossier .field--name-field-fichiers { + text-transform: none; + border: none; + padding-left: 10%; +} +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-de-pilotage .field__item .paragraph--type--dossier .field--name-field-fichiers span:nth-of-type(2), +aside.layout-sidebar-second .profile--type--collaborateur .field--name-field-dossier-evenement .field__item .paragraph--type--dossier .field--name-field-fichiers span:nth-of-type(2) { + display: none; +} +aside.layout-sidebar-second footer.view-footer { + margin-top: 3rem; text-transform: uppercase; border: solid black 1px; background-color: rgb(255, 255, 255); font-size: 0.9rem; width: fit-content; font-weight: 400; + padding-top: 0; + align-self: left; + margin-left: 1rem; } @media (max-width: 891px) { - aside.layout-sidebar-second footer { + aside.layout-sidebar-second footer.view-footer { font-size: 1rem; } } -aside.layout-sidebar-second footer p { +aside.layout-sidebar-second footer.view-footer p { margin: 0; padding: 0.3rem; } -aside.layout-sidebar-second footer :hover { +aside.layout-sidebar-second footer.view-footer :hover { background-color: #fdc300; } -aside.layout-sidebar-second .view-footer { - padding-top: 0; - align-self: center; -} aside.layout-sidebar-second.open { transform: translateX(90%); /* Par défaut ouvert */ @@ -2557,8 +2569,16 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div content: url("../dist/images/noun-arrow-1569918-black.svg"); } -.page-programme .block-region-first { +.page-programme .layout__region--first { + position: relative; +} +.page-programme .layout__region--first .block-region-first { padding-left: 18%; + display: flex; + justify-content: flex-end; + position: -webkit-sticky; + position: sticky; + top: 10rem; } .page-programme .block-region-second h2 { font-weight: 1000; @@ -3017,4 +3037,20 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .page-actualites .view-actus .views-row .node-type-actualite .infos-content ul.links { order: 6; display: none; +} + +.page-mon-espace-de-travail .layout-content { + width: 50%; + margin-left: 8%; +} +.page-mon-espace-de-travail .layout-content .field--type-file { + background-color: transparent; + border: none; +} +.page-mon-espace-de-travail .layout-content .js-form-type-textfield { + flex-direction: row; + align-content: center; +} +.page-mon-espace-de-travail .layout-content .js-form-type-textfield label { + margin-right: 1rem; } \ No newline at end of file diff --git a/web/themes/custom/reha/dist/images/logo_REHA-heritage_final-260628.png b/web/themes/custom/reha/dist/images/logo_REHA-heritage_final-260628.png new file mode 100644 index 0000000..5a0a120 Binary files /dev/null and b/web/themes/custom/reha/dist/images/logo_REHA-heritage_final-260628.png differ diff --git a/web/themes/custom/reha/scss/pages/le-programme.scss b/web/themes/custom/reha/scss/pages/le-programme.scss index fbabe52..f3c5c72 100644 --- a/web/themes/custom/reha/scss/pages/le-programme.scss +++ b/web/themes/custom/reha/scss/pages/le-programme.scss @@ -1,7 +1,17 @@ .page-programme{ - .block-region-first{ - padding-left: 18%; + .layout__region--first{ + + position: relative; + .block-region-first{ + padding-left: 18%; + display: flex; + justify-content: flex-end; + position: -webkit-sticky; + position: sticky; + top: 10rem; + + } } .block-region-second{ h2{ diff --git a/web/themes/custom/reha/scss/pages/page-mon-espace-de-travail.scss b/web/themes/custom/reha/scss/pages/page-mon-espace-de-travail.scss new file mode 100644 index 0000000..1224f9e --- /dev/null +++ b/web/themes/custom/reha/scss/pages/page-mon-espace-de-travail.scss @@ -0,0 +1,16 @@ +.page-mon-espace-de-travail{ + .layout-content{ + width: 50%; + margin-left: 8%; + .field--type-file{ + background-color: transparent; + border: none; + + } + .js-form-type-textfield{ + flex-direction: row; + label{margin-right: 1rem;} + align-content: center; + } + } +} \ No newline at end of file diff --git a/web/themes/custom/reha/scss/partials/_aside.scss b/web/themes/custom/reha/scss/partials/_aside.scss index 2e9b6a8..56b4cb4 100644 --- a/web/themes/custom/reha/scss/partials/_aside.scss +++ b/web/themes/custom/reha/scss/partials/_aside.scss @@ -40,83 +40,98 @@ aside.layout-sidebar-second{ padding-top: $header-height; z-index: 100; padding-left: 2rem; - h2{ - transform: translateX(-50%) translateY(40vh) rotate(-90deg); - text-transform: uppercase; - font-weight: 400; - cursor: pointer; - &::before{ - content: url('../../dist/images/noun-arrow-1569918-black.svg'); - display: inline-block; - transform: translateY(5px) rotate(90deg); - } - } - .view-current-user-doc-profile{ - padding: 0 2rem ; - display: flex; - flex-direction: column; - } - .profile--type--collaborateur{ - .field--name-field-site{ - font-size: 2rem; - font-weight: 900; - display: flex; - justify-content: space-between; - &::after{ - content: url(../images/noun-cross-1151731.svg); - cursor: pointer; + // #block-reha-views-block-current-user-doc-profile-block-1{ + h2{ + transform: translateX(-50%) translateY(40vh) rotate(-90deg); + text-transform: uppercase; + font-weight: 400; + cursor: pointer; + &::before{ + content: url('../../dist/images/noun-arrow-1569918-black.svg'); + display: inline-block; + transform: translateY(5px) rotate(90deg); } } - .field--name-field-dossier-de-pilotage{ - text-transform: uppercase; + .view-current-user-doc-profile{ + padding: 0 2rem ; display: flex; flex-direction: column; - > div:nth-child(1){ + } + .profile--type--collaborateur{ + .field--name-field-site{ + font-size: 2rem; + font-weight: 900; display: flex; - align-items: center; - flex-direction: row; + justify-content: space-between; + &::after{ + content: url(../images/noun-cross-1151731.svg); + cursor: pointer; + } + } + .field--name-field-dossier-de-pilotage, + .field--name-field-dossier-evenement{ + text-transform: uppercase; + display: flex; + flex-direction: column; + > div:nth-child(1){ + display: flex; + align-items: center; + flex-direction: row; + } + + > div:nth-child(1)::before{ + content: url('../../dist/images/noun-file-6880430.svg'); + display: inline-flex; + width: 70px; + height: auto; + padding-right: 1rem; + align-items: center; + } + .field__item{ + // align-self: flex-end; + // padding-right: 2rem; + // padding-left: 3rem; + .paragraph--type--dossier{ + padding-left: 25%; + .field--name-field-fichiers{ + text-transform: none; + border: none; + padding-left: 10%; + span:nth-of-type(2){ + display: none; + } + } + } + } + } + } + + footer.view-footer{ + margin-top: 3rem; + text-transform: uppercase; + border: solid black 1px; + background-color: $white-button; + font-size: 0.9rem; + width: fit-content; + font-weight: 400; + padding-top: 0; + align-self: left; + margin-left: 1rem; + + @media (max-width:891px) { + font-size: 1rem; + } + p{margin: 0; + padding: 0.3rem;} + :hover{ + background-color: $yellow-puca; } - > div:nth-child(1)::before{ - content: url('../../dist/images/noun-file-6880430.svg'); - display: inline-flex; - width: 70px; - height: auto; - padding-right: 1rem; - // align-content: center; - - align-items: center; - } - .field__item{ - width: 75%; - align-self: flex-end; - padding-right: 2rem; - - } - } - } - footer{ - text-transform: uppercase; - - border: solid black 1px; - background-color: $white-button; - font-size: 0.9rem; - width: fit-content; - font-weight: 400; - @media (max-width:891px) { - font-size: 1rem; - } - p{margin: 0; - padding: 0.3rem;} - :hover{ - background-color: $yellow-puca; - } - } - .view-footer{ - padding-top: 0; - align-self: center; - } + } + + // } + } aside.layout-sidebar-second.open { diff --git a/web/themes/custom/reha/scss/partials/_header.scss b/web/themes/custom/reha/scss/partials/_header.scss index 456d0a8..9b8610f 100644 --- a/web/themes/custom/reha/scss/partials/_header.scss +++ b/web/themes/custom/reha/scss/partials/_header.scss @@ -51,7 +51,7 @@ header{ .field__item{ height: $header-height; img{ - max-height: 85px; + max-height: 92px; width: auto; } } diff --git a/web/themes/custom/reha/scss/reha.scss b/web/themes/custom/reha/scss/reha.scss index 8cd4fc9..35aee15 100644 --- a/web/themes/custom/reha/scss/reha.scss +++ b/web/themes/custom/reha/scss/reha.scss @@ -40,4 +40,5 @@ @import "pages/node-site"; @import "pages/ressources"; @import "pages/node-ressource"; -@import "pages/actualites"; \ No newline at end of file +@import "pages/actualites"; +@import "pages/page-mon-espace-de-travail"; \ No newline at end of file diff --git a/web/themes/custom/reha/templates/page--user--collaborateur.html.twig b/web/themes/custom/reha/templates/page--user--collaborateur.html.twig new file mode 100644 index 0000000..0b9f23d --- /dev/null +++ b/web/themes/custom/reha/templates/page--user--collaborateur.html.twig @@ -0,0 +1,96 @@ +{# +/** + * @file + * Default theme implementation to display a single page. + * + * The doctype, html, head and body tags are not in this template. Instead they + * can be found in the html.html.twig template in this directory. + * + * Available variables: + * + * General utility variables: + * - base_path: The base URL path of the Drupal installation. Will usually be + * "/" unless you have installed Drupal in a sub-directory. + * - is_front: A flag indicating if the current page is the front page. + * - logged_in: A flag indicating if the user is registered and signed in. + * - is_admin: A flag indicating if the user has permission to access + * administration pages. + * + * Site identity: + * - front_page: The URL of the front page. Use this instead of base_path when + * linking to the front page. This includes the language domain or prefix. + * + * Page content (in order of occurrence in the default page.html.twig): + * - messages: Status and error messages. Should be displayed prominently. + * - node: Fully loaded node, if there is an automatically-loaded node + * associated with the page and the node ID is the second argument in the + * page's path (e.g. node/12345 and node/12345/revisions, but not + * comment/reply/12345). + * + * Regions: + * - page.header: Items for the header region. + * - page.primary_menu: Items for the primary menu region. + * - page.secondary_menu: Items for the secondary menu region. + * - page.highlighted: Items for the highlighted content region. + * - page.help: Dynamic help text, mostly for admin pages. + * - page.content: The main content of the current page. + * - page.sidebar_first: Items for the first sidebar. + * - page.sidebar_second: Items for the second sidebar. + * - page.footer: Items for the footer region. + * - page.breadcrumb: Items for the breadcrumb region. + * + * @see template_preprocess_page() + * @see html.html.twig + * + * @ingroup themeable + */ +#} +