diff --git a/web/sites/development.services.yml b/web/sites/development.services.yml index d2857c6..99d3902 100644 --- a/web/sites/development.services.yml +++ b/web/sites/development.services.yml @@ -1,9 +1,228 @@ -# Local development services. -# -# To activate this feature, follow the instructions at the top of the -# 'example.settings.local.php' file, which sits next to this file. parameters: - http.response.debug_cacheability_headers: true -services: - cache.backend.null: - class: Drupal\Core\Cache\NullBackendFactory + session.storage.options: + # Default ini options for sessions. + # + # Some distributions of Linux (most notably Debian) ship their PHP + # installations with garbage collection (gc) disabled. Since Drupal depends + # on PHP's garbage collection for clearing sessions, ensure that garbage + # collection occurs by using the most common settings. + # @default 1 + gc_probability: 1 + # @default 100 + gc_divisor: 100 + # + # Set session lifetime (in seconds), i.e. the grace period for session + # data. Sessions are deleted by the session garbage collector after one + # session lifetime has elapsed since the user's last visit. When a session + # is deleted, authenticated users are logged out, and the contents of the + # user's session is discarded. + # @default 200000 + gc_maxlifetime: 200000 + # + # Set session cookie lifetime (in seconds), i.e. the time from the session + # is created to the cookie expires, i.e. when the browser is expected to + # discard the cookie. The value 0 means "until the browser is closed". + # @default 2000000 + cookie_lifetime: 2000000 + # + # Drupal automatically generates a unique session cookie name based on the + # full domain name used to access the site. This mechanism is sufficient + # for most use-cases, including multi-site deployments. However, if it is + # desired that a session can be reused across different subdomains, the + # cookie domain needs to be set to the shared base domain. Doing so assures + # that users remain logged in as they cross between various subdomains. + # To maximize compatibility and normalize the behavior across user agents, + # the cookie domain should start with a dot. + # + # @default none + # cookie_domain: '.example.com' + # + # Set the SameSite cookie attribute: 'None', 'Lax', or 'Strict'. If set, + # this value will override the server value. See + # https://www.php.net/manual/en/session.security.ini.php for more + # information. + # @default no value + cookie_samesite: Lax + # + # Set the session ID string length. The length can be between 22 to 256. The + # PHP recommended value is 48. See + # https://www.php.net/manual/session.security.ini.php for more information. + # This value should be kept in sync with + # \Drupal\Core\Session\SessionConfiguration::__construct() + # @default 48 + sid_length: 48 + # + # Set the number of bits in encoded session ID character. The possible + # values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-", + # ","). The PHP recommended value is 6. See + # https://www.php.net/manual/session.security.ini.php for more information. + # This value should be kept in sync with + # \Drupal\Core\Session\SessionConfiguration::__construct() + # @default 6 + sid_bits_per_character: 6 + twig.config: + # Twig debugging: + # + # When debugging is enabled: + # - The markup of each Twig template is surrounded by HTML comments that + # contain theming information, such as template file name suggestions. + # - Note that this debugging markup will cause automated tests that directly + # check rendered HTML to fail. When running automated tests, 'debug' + # should be set to FALSE. + # - The dump() function can be used in Twig templates to output information + # about template variables. + # - Twig templates are automatically recompiled whenever the source code + # changes (see auto_reload below). + # + # For more information about debugging Twig templates, see + # https://www.drupal.org/node/1906392. + # + # Enabling Twig debugging is not recommended in production environments. + # @default false + debug: true + # Twig auto-reload: + # + # Automatically recompile Twig templates whenever the source code changes. + # If you don't provide a value for auto_reload, it will be determined + # based on the value of debug. + # + # Enabling auto-reload is not recommended in production environments. + # @default null + auto_reload: null + # Twig cache: + # + # By default, Twig templates will be compiled and stored in the filesystem + # to increase performance. Disabling the Twig cache will recompile the + # templates from source each time they are used. In most cases the + # auto_reload setting above should be enabled rather than disabling the + # Twig cache. + # + # Disabling the Twig cache is not recommended in production environments. + # @default true + cache: true + # File extensions: + # + # List of file extensions the Twig system is allowed to load via the + # twig.loader.filesystem service. Files with other extensions will not be + # loaded unless they are added here. For example, to allow a file named + # 'example.partial' to be loaded, add 'partial' to this list. To load files + # with no extension, add an empty string '' to the list. + # + # @default ['css', 'html', 'js', 'svg', 'twig'] + allowed_file_extensions: + - css + - html + - js + - svg + - twig + renderer.config: + # Renderer required cache contexts: + # + # The Renderer will automatically associate these cache contexts with every + # render array, hence varying every render array by these cache contexts. + # + # @default ['languages:language_interface', 'theme', 'user.permissions'] + required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions'] + # Renderer automatic placeholdering conditions: + # + # Drupal allows portions of the page to be automatically deferred when + # rendering to improve cache performance. That is especially helpful for + # cache contexts that vary widely, such as the active user. On some sites + # those may be different, however, such as sites with only a handful of + # users. If you know what the high-cardinality cache contexts are for your + # site, specify those here. If you're not sure, the defaults are fairly safe + # in general. + # + # For more information about rendering optimizations see + # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing + auto_placeholder_conditions: + # Max-age at or below which caching is not considered worthwhile. + # + # Disable by setting to -1. + # + # @default 0 + max-age: 0 + # Cache contexts with a high cardinality. + # + # Disable by setting to []. + # + # @default ['session', 'user'] + contexts: ['session', 'user'] + # Tags with a high invalidation frequency. + # + # Disable by setting to []. + # + # @default [] + tags: [] + # Renderer cache debug: + # + # Allows cache debugging output for each rendered element. + # + # Enabling render cache debugging is not recommended in production + # environments. + # @default false + debug: false + # Cacheability debugging: + # + # Responses with cacheability metadata (CacheableResponseInterface instances) + # get X-Drupal-Cache-Tags, X-Drupal-Cache-Contexts and X-Drupal-Cache-Max-Age + # headers. + # + # For more information about debugging cacheable responses, see + # https://www.drupal.org/developing/api/8/response/cacheable-response-interface + # + # Enabling cacheability debugging is not recommended in production + # environments. + # @default false + http.response.debug_cacheability_headers: false + factory.keyvalue: {} + # Default key/value storage service to use. + # @default keyvalue.database + # default: keyvalue.database + # Collection-specific overrides. + # state: keyvalue.database + factory.keyvalue.expirable: {} + # Default key/value expirable storage service to use. + # @default keyvalue.database.expirable + # default: keyvalue.database.expirable + # Allowed protocols for URL generation. + filter_protocols: + - http + - https + - ftp + - news + - nntp + - tel + - telnet + - mailto + - irc + - ssh + - sftp + - webcal + - rtsp + + # Configure Cross-Site HTTP requests (CORS). + # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS + # for more information about the topic in general. + # Note: By default the configuration is disabled. + cors.config: + enabled: false + # Specify allowed headers, like 'x-allowed-header'. + allowedHeaders: [] + # Specify allowed request methods, specify ['*'] to allow all possible ones. + allowedMethods: [] + # Configure requests allowed from specific origins. Do not include trailing + # slashes with URLs. + allowedOrigins: ['*'] + # Sets the Access-Control-Expose-Headers header. + exposedHeaders: false + # Sets the Access-Control-Max-Age header. + maxAge: false + # Sets the Access-Control-Allow-Credentials header. + supportsCredentials: false + + queue.config: + # The maximum number of seconds to wait if a queue is temporarily suspended. + # This is not applicable when a queue is suspended but does not specify + # how long to wait before attempting to resume. + suspendMaximumWait: 30 diff --git a/web/themes/custom/reha/css/reha.css b/web/themes/custom/reha/css/reha.css index d1d3577..4ae2122 100644 --- a/web/themes/custom/reha/css/reha.css +++ b/web/themes/custom/reha/css/reha.css @@ -2,7 +2,7 @@ /*reha*/ /*global*/ /* Colors used for REHA */ -.field--type-link, .field--type-file, .links, .create-account-link, .request-password-link { +.field--type-link, .field--type-file, .links, .create-account-link, .request-password-link, .views-field-edit-node, .views-field-edit-user, .layout-sidebar-first #block-reha-phase1 footer { text-transform: uppercase; padding: 1rem; border: solid black 1px; @@ -20,6 +20,15 @@ .create-account-link { width: 80%; } +.views-field-edit-node { + width: fit-content; } + +.views-field-edit-user { + width: fit-content; } + +#edit-unlock { + display: none; } + .mailto { text-decoration: underline; } @@ -110,7 +119,6 @@ font-family: 'Marianne'; font-weight: 400; font-style: normal; - margin: none; top: 0%; left: 0%; width: 100%; @@ -119,19 +127,27 @@ flex-flow: row wrap; } .layout-container header { flex: 0 0 100%; } - .layout-container main { - position: relative; } .layout-container footer { flex: 0 0 100%; } .layout-content { + order: 2; padding-top: 3rem; padding-bottom: 6rem; - width: 60%; + width: 70%; margin: auto; } +aside { + width: 20%; + order: 1; + margin-top: 5rem; + margin-left: 10rem; } + main { - width: 100%; } + width: 100%; + display: flex; + flex-direction: row; + position: relative; } .main-content { margin-top: 7rem; } @@ -148,6 +164,12 @@ a { :visited { color: black; } +html.js body { + margin: 0 !important; } + +html.js body div.dialog-off-canvas-main-canvas div.layout-container { + margin: 0 !important; } + /*partials*/ header { display: block; @@ -282,6 +304,12 @@ header { box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; clip-path: inset(0px -10px -10px -10px); padding: 5% 10% 5% 45%; } + header .region-header #block-reha-views-block-current-user-block-block-1 .connected .connected-full ul { + width: 70%; + display: flex; + flex-direction: column; } + header .region-header #block-reha-views-block-current-user-block-block-1 .connected .connected-full ul li { + margin-bottom: 3rem; } header .bouton { align-self: flex-end; width: fit-content; } @@ -351,7 +379,8 @@ label { padding-bottom: 0.5rem; } input { - height: 2rem; } + height: 2rem; + width: 50%; } .form-submit { background-color: white; @@ -361,7 +390,8 @@ input { height: 5rem !important; margin-bottom: 1rem; font-size: 1.3rem; - font-weight: 300; } + font-weight: 300; + width: fit-content; } #user-login-form .form-item { flex-direction: row; @@ -369,6 +399,25 @@ input { #user-login-form .form-item label { padding-right: 0.5rem; } +.layout-sidebar-first #block-reha-phase1 { + border: solid #fdc300 1px; + font-weight: 800; + padding: 1rem; + width: 80%; } + .layout-sidebar-first #block-reha-phase1 h2 { + margin-top: 0; + margin-bottom: 0; + text-transform: lowercase; + font-weight: 1000; + line-height: 1rem; + font-size: 1.5rem; } + .layout-sidebar-first #block-reha-phase1 p { + font-size: 1.5rem; + line-height: 1.8rem; + margin-top: 0.8rem; } + .layout-sidebar-first #block-reha-phase1 footer { + width: fit-content; } + /*pages*/ .home-page-layout-content .layout--onecol { margin: auto; @@ -452,11 +501,14 @@ input { font-size: 3rem !important; font-weight: 600; } -.layout-content footer { - background-color: none; } - .node-type-operation footer { display: none; } -html.js body div.dialog-off-canvas-main-canvas div.layout-container main div.layout-content div.region.region-content div#block-reha-contenudelapageprincipale.block.block-system.block-system-main-block div.views-element-container div.js-view-dom-id-a0244ead401fde300c9a64579f8ed0aa9edefe33021041a9393441d1bd0be0e2 footer { - background-color: none; } +.node-type-operation .views-field-edit-node { + background-color: rgba(153, 147, 174, 0) !important; } + +#block-reha-contenudelapageprincipale #node-operation-form #edit-field-fiche-candidature-wrapper { + width: fit-content; } + +#block-reha-contenudelapageprincipale #node-operation-form #edit-field-dossier-de-candidature-wrapper { + width: 40%; } diff --git a/web/themes/custom/reha/scss/global/_layout.scss b/web/themes/custom/reha/scss/global/_layout.scss index 0050cf6..f5aec70 100644 --- a/web/themes/custom/reha/scss/global/_layout.scss +++ b/web/themes/custom/reha/scss/global/_layout.scss @@ -9,7 +9,6 @@ $width-menu-slidedown : 550px; font-family: 'Marianne'; font-weight: 400; font-style: normal; - margin: none; top: 0%; left: 0%; width: 100%; @@ -20,24 +19,34 @@ $width-menu-slidedown : 550px; header{ flex: 0 0 100%; } - main{ - position: relative; - // top: -7rem; - } + // main{ + // // position: relative; + // // top: -7rem; + // } footer{ flex: 0 0 100%; } } .layout-content{ + order: 2; padding-top: 3rem; padding-bottom: 6rem; - width: 60%; + width: 70%; margin: auto; } - +aside{ + width: 20%; + order: 1; + margin-top: 5rem; + margin-left: 10rem; +} main{ width: 100%; + display: flex; + flex-direction: row; + position: relative; + } .main-content{ diff --git a/web/themes/custom/reha/scss/global/_reset.scss b/web/themes/custom/reha/scss/global/_reset.scss index 260031f..0e9d491 100644 --- a/web/themes/custom/reha/scss/global/_reset.scss +++ b/web/themes/custom/reha/scss/global/_reset.scss @@ -10,4 +10,11 @@ a{ :visited{ color: black; +} + +html.js body{ + margin: 0 !important; +} +html.js body div.dialog-off-canvas-main-canvas div.layout-container{ + margin: 0 !important; } \ No newline at end of file diff --git a/web/themes/custom/reha/scss/global/variables/_buttons.scss b/web/themes/custom/reha/scss/global/variables/_buttons.scss index 5f0f25f..7b03d82 100644 --- a/web/themes/custom/reha/scss/global/variables/_buttons.scss +++ b/web/themes/custom/reha/scss/global/variables/_buttons.scss @@ -36,4 +36,19 @@ } .request-password-link{ @extend %buttonwithborder; +} +.views-field-edit-node{ + @extend %buttonwithborder; + width: fit-content; +} + +.views-field-edit-user{ + @extend %buttonwithborder; + width: fit-content; +} +footer{ + +} +#edit-unlock{ + display: none; } \ No newline at end of file diff --git a/web/themes/custom/reha/scss/pages/_operations.scss b/web/themes/custom/reha/scss/pages/_operations.scss index 16e0dcf..cfaa1c2 100644 --- a/web/themes/custom/reha/scss/pages/_operations.scss +++ b/web/themes/custom/reha/scss/pages/_operations.scss @@ -1,16 +1,24 @@ -.layout-content{ - footer{ - background-color: none; - } -} +// .layout-content{ +// footer{ +// background-color: none; +// } +// } + + + + + .node-type-operation{ footer{ display: none; } + .views-field-edit-node{ + background-color: rgba(153, 147, 174, 0) !important; + + } } - -html.js body div.dialog-off-canvas-main-canvas div.layout-container main div.layout-content div.region.region-content div#block-reha-contenudelapageprincipale.block.block-system.block-system-main-block div.views-element-container div.js-view-dom-id-a0244ead401fde300c9a64579f8ed0aa9edefe33021041a9393441d1bd0be0e2 footer{ - background-color: none; +html.js body div.dialog-off-canvas-main-canvas div.layout-container main div.layout-content div.region.region-content div#block-reha-contenudelapageprincipale.block.block-system.block-system-main-block div.views-element-container div.js-view-dom-id-586565a78462afa14f00a79092967e0998bcad1d346481ed34544a2c80124f64 footer{ + background-color: rgba(153, 147, 174, 0) !important; } \ No newline at end of file diff --git a/web/themes/custom/reha/scss/pages/_proposer-une-operation.scss b/web/themes/custom/reha/scss/pages/_proposer-une-operation.scss new file mode 100644 index 0000000..92a399d --- /dev/null +++ b/web/themes/custom/reha/scss/pages/_proposer-une-operation.scss @@ -0,0 +1,15 @@ + +#block-reha-contenudelapageprincipale{ + #node-operation-form{ + #edit-field-fiche-candidature-wrapper{ + // background-color: rgba(153, 147, 174, 0) !important; + // border: none; + width: fit-content; + } + #edit-field-dossier-de-candidature-wrapper{ + // background-color: rgba(153, 147, 174, 0) !important; + // border: none; + width: 40%; + } + } +} diff --git a/web/themes/custom/reha/scss/partials/_aside.scss b/web/themes/custom/reha/scss/partials/_aside.scss new file mode 100644 index 0000000..e9d74e4 --- /dev/null +++ b/web/themes/custom/reha/scss/partials/_aside.scss @@ -0,0 +1,31 @@ +.layout-sidebar-first{ + + #block-reha-phase1{ + border: solid $yellow-puca 1px; + font-weight: 800; + padding: 1rem; + width: 80%; + h2{ + margin-top: 0; + margin-bottom: 0; + text-transform: lowercase; + font-weight: 1000; + line-height: 1rem; + font-size:1.5rem ; + + } + + p{ + font-size: 1.5rem; + line-height: 1.8rem; + margin-top: 0.8rem; + } + + footer{ + @extend %buttonwithborder; + width: fit-content; + } + } + + +} \ No newline at end of file diff --git a/web/themes/custom/reha/scss/partials/_forms.scss b/web/themes/custom/reha/scss/partials/_forms.scss index f6d8d37..9c8c245 100644 --- a/web/themes/custom/reha/scss/partials/_forms.scss +++ b/web/themes/custom/reha/scss/partials/_forms.scss @@ -7,6 +7,7 @@ label{ } input{ height: 2rem; + width: 50%; } .form-submit{ background-color: white; @@ -17,6 +18,7 @@ input{ margin-bottom: 1rem; font-size: 1.3rem; font-weight: 300; + width: fit-content; } #user-login-form{ @@ -28,4 +30,4 @@ input{ } } } - \ No newline at end of file + diff --git a/web/themes/custom/reha/scss/partials/_header.scss b/web/themes/custom/reha/scss/partials/_header.scss index 0fc2580..ebecbcd 100644 --- a/web/themes/custom/reha/scss/partials/_header.scss +++ b/web/themes/custom/reha/scss/partials/_header.scss @@ -167,6 +167,14 @@ header{ box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; clip-path: inset(0px -10px -10px -10px); padding: 5% 10% 5% 45%; + ul{ + width: 70%; + display: flex; + flex-direction: column; + li{ + margin-bottom: 3rem; + } + } } } } diff --git a/web/themes/custom/reha/scss/reha.scss b/web/themes/custom/reha/scss/reha.scss index 75952d5..b4a6414 100644 --- a/web/themes/custom/reha/scss/reha.scss +++ b/web/themes/custom/reha/scss/reha.scss @@ -5,7 +5,7 @@ /*global*/ -@import "global/variables/colors.scss"; +@import "global/variables/colors"; @import "global/variables/typography"; @import "global/variables/buttons"; @import "global/core"; @@ -15,11 +15,13 @@ /*partials*/ @import "partials/header"; -@import "partials/footer.scss"; +@import "partials/footer"; @import "partials/forms"; +@import "partials/aside"; /*pages*/ @import "pages/home"; @import "pages/creer-un-compte"; -@import "pages/operations.scss"; \ No newline at end of file +@import "pages/operations"; +@import "pages/proposer-une-operation"; \ No newline at end of file diff --git a/web/themes/custom/reha/templates/views-mini-pager.html.twig b/web/themes/custom/reha/templates/views-mini-pager.html.twig new file mode 100644 index 0000000..b18eaef --- /dev/null +++ b/web/themes/custom/reha/templates/views-mini-pager.html.twig @@ -0,0 +1,44 @@ +{# +/** + * @file + * Default theme implementation for a views mini-pager. + * + * Available variables: + * - heading_id: Pagination heading ID. + * - items: List of pager items. + * + * @see template_preprocess_views_mini_pager() + * + * @ingroup themeable + */ +#} +{% if items.previous or items.next %} + +{% endif %}