diff --git a/env.example.js b/env.example.js index 663a6fb09..731878cea 100644 --- a/env.example.js +++ b/env.example.js @@ -137,6 +137,7 @@ module.exports = { globalConfigs: globalConfigs, enableOnly: ['webshop.general', 'dashboard.sponsor', 'dashboard.provider', 'dashboard.validator'], disableOnly: [], + httpsCA: null, httpsKey: null, httpsCert: null, buildGzipFiles: false, diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Bold.ttf b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Bold.ttf new file mode 100644 index 000000000..47e921e88 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Bold.ttf differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Bold.woff2 b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Bold.woff2 new file mode 100644 index 000000000..e8e2c95c2 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Bold.woff2 differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Medium.ttf b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Medium.ttf new file mode 100644 index 000000000..2a895f957 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Medium.ttf differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Medium.woff2 b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Medium.woff2 new file mode 100644 index 000000000..594028bd8 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Medium.woff2 differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Regular.ttf b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Regular.ttf new file mode 100644 index 000000000..3159f743b Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Regular.ttf differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Regular.woff2 b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Regular.woff2 new file mode 100644 index 000000000..69459c987 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Regular.woff2 differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-SemiBold.ttf b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-SemiBold.ttf new file mode 100644 index 000000000..6a48bfe5e Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-SemiBold.ttf differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-SemiBold.woff2 b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-SemiBold.woff2 new file mode 100644 index 000000000..ba86a5551 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-SemiBold.woff2 differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Thin.ttf b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Thin.ttf new file mode 100644 index 000000000..156b42853 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Thin.ttf differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Thin.woff2 b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Thin.woff2 new file mode 100644 index 000000000..229b99967 Binary files /dev/null and b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/Montserrat-Thin.woff2 differ diff --git a/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/OFL.txt b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/OFL.txt new file mode 100644 index 000000000..f435ed8b5 --- /dev/null +++ b/react/assets/forus-platform/resources/_platform-common/assets/fonts/montserrat/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/react/assets/forus-platform/resources/_platform-common/assets/img/cms-menu-background.svg b/react/assets/forus-platform/resources/_platform-common/assets/img/cms-menu-background.svg new file mode 100644 index 000000000..c22c138ce --- /dev/null +++ b/react/assets/forus-platform/resources/_platform-common/assets/img/cms-menu-background.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-platform/resources/_platform-common/assets/img/placeholders/physical-card-type.svg b/react/assets/forus-platform/resources/_platform-common/assets/img/placeholders/physical-card-type.svg new file mode 100644 index 000000000..61aee5381 --- /dev/null +++ b/react/assets/forus-platform/resources/_platform-common/assets/img/placeholders/physical-card-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-platform/scss/_common/blocks/block-2fa-restriction.scss b/react/assets/forus-platform/scss/_common/blocks/block-2fa-restriction.scss index 3c058cd92..960faede4 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-2fa-restriction.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-2fa-restriction.scss @@ -1,4 +1,4 @@ -&.block-2fa-restriction { +.block.block-2fa-restriction { display: flex; flex-direction: column; margin: 0 0 20px; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-announcements.scss b/react/assets/forus-platform/scss/_common/blocks/block-announcements.scss index 5170913bf..e628fc1e1 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-announcements.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-announcements.scss @@ -1,4 +1,4 @@ -&.block-announcements { +.block.block-announcements { display: flex; flex-direction: column; gap: 10px; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-app_download.scss b/react/assets/forus-platform/scss/_common/blocks/block-app_download.scss index 3c5be9051..b4b1c3467 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-app_download.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-app_download.scss @@ -1,4 +1,4 @@ -&.block-app_download { +.block.block-app_download { .app_download-row { display: flex; flex-direction: row; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-app_links.scss b/react/assets/forus-platform/scss/_common/blocks/block-app_links.scss index a2ebc6981..95f6c0797 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-app_links.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-app_links.scss @@ -1,4 +1,4 @@ -&.block-app_links { +.block.block-app_links { display: flex; margin: 0 0 20px; flex-direction: row; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-auth-2fa.scss b/react/assets/forus-platform/scss/_common/blocks/block-auth-2fa.scss index 46d994b6b..547352501 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-auth-2fa.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-auth-2fa.scss @@ -1,4 +1,4 @@ -&.block-auth-2fa { +.block.block-auth-2fa { margin-bottom: 20px; .auth-2fa-item { diff --git a/react/assets/forus-platform/scss/_common/blocks/block-banner-editor.scss b/react/assets/forus-platform/scss/_common/blocks/block-banner-editor.scss index 8acb01164..226ed9912 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-banner-editor.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-banner-editor.scss @@ -2,7 +2,6 @@ display: flex; flex-direction: column; width: 100%; - background-color: #fff; position: relative; background-repeat: no-repeat; background-size: cover; @@ -81,7 +80,7 @@ .banner-editor-control { display: flex; flex-direction: row; - gap: 8px; + gap: 5px; padding: 12px 0; position: relative; @@ -90,34 +89,44 @@ font: 500 11px/30px var(--base-font); } - .banner-editor-control-value { - color: #134478; - font: 700 11px/30px var(--base-font); + .banner-editor-control-value, + .banner-editor-control-color { display: flex; - gap: 0; - flex-direction: row; - align-items: center; cursor: pointer; position: relative; + flex-direction: row; & > .mdi { font-size: 18px; color: #646f79; } + + &.disabled { + color: #242424; + cursor: default; + pointer-events: none; + + & > .mdi { + display: none; + } + } + } + + .banner-editor-control-value { + color: #134478; + font: 700 11px/30px var(--base-font); + gap: 0; + align-items: center; } .banner-editor-control-color { padding: 0 5px; border: 1px solid var(--border-color); border-radius: var(--border-radius); - display: flex; - flex-direction: row; align-items: center; justify-content: center; gap: 5px; - position: relative; background: #fcfcfc; - cursor: pointer; .banner-editor-control-color-preview { width: 16px; @@ -125,11 +134,6 @@ border-radius: var(--border-radius); box-shadow: 1px 1px 5px 0 rgba(25, 39, 52, 0.11); } - - & > .mdi { - font-size: 18px; - color: #646f79; - } } .banner-editor-dropdown { diff --git a/react/assets/forus-platform/scss/_common/blocks/block-bi-info.scss b/react/assets/forus-platform/scss/_common/blocks/block-bi-info.scss index 0b59f0bb2..d93535d75 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-bi-info.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-bi-info.scss @@ -1,4 +1,4 @@ -&.block-bi-info { +.block.block-bi-info { display: flex; flex-direction: row; margin: 0 0 20px; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-cms-menu.scss b/react/assets/forus-platform/scss/_common/blocks/block-cms-menu.scss new file mode 100644 index 000000000..58d7bcffb --- /dev/null +++ b/react/assets/forus-platform/scss/_common/blocks/block-cms-menu.scss @@ -0,0 +1,76 @@ +.block.block-cms-menu { + flex-direction: column; + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 20px; + + .block-cms-menu-item { + display: flex; + align-items: flex-start; + gap: 20px; + text-decoration: none; + cursor: pointer; + + .block-cms-menu-icon { + flex: 0 0 48px; + display: flex; + align-items: center; + justify-content: center; + position: relative; + + svg { + display: block; + width: 100%; + } + + .mdi { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + font-size: 22px; + color: #282b39; + } + } + + .block-cms-menu-content { + display: flex; + flex-direction: column; + gap: 4px; + + .block-cms-menu-name { + font: 600 14px/20px var(--base-font); + color: #151b26; + margin: 0 0; + transition: color 0.4s; + } + + .block-cms-menu-description { + font: 400 13px/18px var(--base-font); + color: #282b39; + margin: 0 0; + } + } + + &:hover { + .block-cms-menu-content { + .block-cms-menu-name { + color: var(--color-primary); + text-decoration: underline; + } + } + } + + &.block-cms-menu-item-disabled { + background: #f9fbff; + border-color: transparent; + color: #9aa5b5; + + .block-cms-menu-icon .mdi, + .block-cms-menu-content .block-cms-menu-name, + .block-cms-menu-content .block-cms-menu-description { + color: #9aa5b5; + } + } + } +} diff --git a/react/assets/forus-platform/scss/_common/blocks/block-content.scss b/react/assets/forus-platform/scss/_common/blocks/block-content.scss index 6f73d8695..ee1d942f6 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-content.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-content.scss @@ -1,4 +1,4 @@ -&.block-content { +.block.block-content { color: #282b39; font: 400 14px/22px var(--base-font); diff --git a/react/assets/forus-platform/scss/_common/blocks/block-feedback-result.scss b/react/assets/forus-platform/scss/_common/blocks/block-feedback-result.scss index f3f4489d1..743dd6a6e 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-feedback-result.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-feedback-result.scss @@ -1,4 +1,4 @@ -&.block-feedback-result { +.block.block-feedback-result { padding-top: 50px; padding-bottom: 50px; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-financial-dashboard.scss b/react/assets/forus-platform/scss/_common/blocks/block-financial-dashboard.scss index 1e037033c..c352c7503 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-financial-dashboard.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-financial-dashboard.scss @@ -1,4 +1,4 @@ -&.block-financial-dashboard { +.block.block-financial-dashboard { .financial-filters { display: flex; align-items: center; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-implementation-blocks-editor.scss b/react/assets/forus-platform/scss/_common/blocks/block-implementation-blocks-editor.scss index 84f6b1357..bb5558947 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-implementation-blocks-editor.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-implementation-blocks-editor.scss @@ -1,4 +1,4 @@ -&.block-implementation-blocks-editor { +.block.block-implementation-blocks-editor { display: flex; flex-direction: column; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-inline-copy.scss b/react/assets/forus-platform/scss/_common/blocks/block-inline-copy.scss index da740ebe4..cab5f4bbe 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-inline-copy.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-inline-copy.scss @@ -8,8 +8,8 @@ .inline-copy-icon { display: inline-flex; font-size: 16px; - line-height: 18px; - height: 18px; + line-height: 20px; + height: 20px; transition: 0.4s; color: #646f79; } diff --git a/react/assets/forus-platform/scss/_common/blocks/block-inline-edit.scss b/react/assets/forus-platform/scss/_common/blocks/block-inline-edit.scss new file mode 100644 index 000000000..4c0a4bbe0 --- /dev/null +++ b/react/assets/forus-platform/scss/_common/blocks/block-inline-edit.scss @@ -0,0 +1,22 @@ +.block.block-inline-edit { + display: inline-flex; + flex-direction: row; + align-items: center; + gap: 4px; + cursor: pointer; + + .inline-edit-icon { + display: inline-flex; + font-size: 16px; + line-height: 20px; + height: 20px; + transition: 0.4s; + color: var(--color-primary); + } + + &:hover { + .inline-edit-icon { + color: var(--color-primary); + } + } +} diff --git a/react/assets/forus-platform/scss/_common/blocks/block-mail_preview.scss b/react/assets/forus-platform/scss/_common/blocks/block-mail_preview.scss index 25146ea8d..7c1c681e8 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-mail_preview.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-mail_preview.scss @@ -1,8 +1,7 @@ $mailFont: Verdana, Arial, sans-serif; -&.block-mail_preview { +.block.block-mail_preview { background: #fff; - padding: 30; .mail_preview-wrapper { padding: 30px 0; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-markdown.scss b/react/assets/forus-platform/scss/_common/blocks/block-markdown.scss index f36d802e3..f9a54636f 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-markdown.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-markdown.scss @@ -1,4 +1,4 @@ -&.block-markdown { +.block.block-markdown { text-align: left; font: 400 14px/24px var(--base-font) !important; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-markdownable.scss b/react/assets/forus-platform/scss/_common/blocks/block-markdownable.scss index 22ce764c9..1a1abe86b 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-markdownable.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-markdownable.scss @@ -1,4 +1,4 @@ -&.block-markdownable { +.block.block-markdownable { .note-editor { border: none; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-payment-connection.scss b/react/assets/forus-platform/scss/_common/blocks/block-payment-connection.scss index f7c9eeda2..1d6721ce6 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-payment-connection.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-payment-connection.scss @@ -1,4 +1,4 @@ -&.block-payment-connection { +.block.block-payment-connection { display: grid; grid-template-columns: 1fr auto; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-permissions-list.scss b/react/assets/forus-platform/scss/_common/blocks/block-permissions-list.scss index 5d0c35229..d864e47fa 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-permissions-list.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-permissions-list.scss @@ -1,4 +1,4 @@ -&.block-permissions-list { +.block.block-permissions-list { display: flex; flex-wrap: wrap; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-photo-selector-notifications.scss b/react/assets/forus-platform/scss/_common/blocks/block-photo-selector-notifications.scss index 1b9f9b225..b718d0582 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-photo-selector-notifications.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-photo-selector-notifications.scss @@ -1,4 +1,4 @@ -&.block-photo-selector-notifications { +.block.block-photo-selector-notifications { display: flex; flex-direction: row; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-pincode.scss b/react/assets/forus-platform/scss/_common/blocks/block-pincode.scss index 9de0adbef..45519d76e 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-pincode.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-pincode.scss @@ -1,4 +1,4 @@ -&.block-pincode { +.block.block-pincode { margin: 0 auto 20px; padding: 0; text-align: center; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-pre-checks-blocks-editor.scss b/react/assets/forus-platform/scss/_common/blocks/block-pre-checks-blocks-editor.scss index 2818c20f8..a81b63051 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-pre-checks-blocks-editor.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-pre-checks-blocks-editor.scss @@ -1,4 +1,4 @@ -&.block-pre-checks-blocks-editor { +.block.block-pre-checks-blocks-editor { display: flex; flex-direction: column; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-product-media-uploader.scss b/react/assets/forus-platform/scss/_common/blocks/block-product-media-uploader.scss new file mode 100644 index 000000000..d72ee113b --- /dev/null +++ b/react/assets/forus-platform/scss/_common/blocks/block-product-media-uploader.scss @@ -0,0 +1,158 @@ +.block.block-product-media-uploader { + gap: 10px; + display: flex; + flex-direction: row; + align-items: flex-start; + + .product-media-preview { + display: flex; + flex: 0 0 160px; + min-height: 100px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius); + align-items: center; + justify-content: center; + background: #fff; + overflow: hidden; + + img { + display: block; + width: 100%; + } + + .product-media-preview-icon { + font-size: 32px; + } + } + + .product-media-items { + display: flex; + flex-direction: column; + flex: 1 1 auto; + gap: 10px; + } + + .product-media-items-placeholder { + display: flex; + flex-direction: column; + gap: 4px; + + .product-media-items-placeholder-title { + font: 600 16px/24px var(--base-font); + } + + .product-media-items-placeholder-text { + font: 400 14px/20px var(--base-font); + } + } + + .product-media-items { + display: flex; + flex-direction: column; + gap: 10px; + } + + .product-media-item { + display: flex; + align-items: center; + gap: 10px; + padding: 10px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius); + background: #fff; + transition: background 0.2s ease; + + .product-media-item-drag { + display: flex; + align-items: center; + justify-content: center; + width: 10px; + color: #aaa; + flex: 0 0 20px; + margin: 0 -10px 0 -8px; + cursor: grab; + + em { + font-size: 20px; + } + + &:hover { + color: #666; + } + } + + .product-media-item-media { + flex: 0 0 60px; + flex-shrink: 0; + border: 1px solid var(--border-color); + border-radius: var(--border-radius); + overflow: hidden; + background: #f9f9f9; + display: flex; + align-items: center; + justify-content: center; + + img { + width: 100%; + display: block; + object-fit: cover; + } + } + + .product-media-item-details { + flex: 1 1 auto; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-self: flex-start; + + .product-media-item-name { + font: 600 15px/24px var(--base-font); + color: #333; + } + + .product-media-item-actions { + display: flex; + flex-direction: row; + gap: 10px; + + .product-media-item-action { + appearance: none; + border: none; + background: none; + display: flex; + padding: 0; + align-items: center; + flex-direction: row; + font: 400 13px/20px var(--base-font); + color: #646464; + gap: 2px; + cursor: pointer; + transition: color 0.3s; + + .mdi { + font-size: 14px; + line-height: 20px; + } + + &:hover { + color: #ccc; + } + } + } + } + + &.product-media-item-grabbing { + background: #f2f2f2; + + .product-media-item-drag { + cursor: grabbing; + } + } + } + + .product-media-actions { + display: flex; + justify-content: flex-start; + } +} diff --git a/react/assets/forus-platform/scss/_common/blocks/block-product.scss b/react/assets/forus-platform/scss/_common/blocks/block-product.scss index b30d2612d..618fc8f7d 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-product.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-product.scss @@ -6,14 +6,80 @@ gap: 20px; .block-product-media { + display: flex; flex: 0 0 190px; - border: 1px solid #d4d9dd; - border-radius: var(--border-radius); - overflow: hidden; + flex-direction: column; + gap: 15px; img { display: block; width: 100%; + border: 1px solid #d4d9dd; + border-radius: var(--border-radius); + } + + .block-product-media-list { + display: flex; + flex-direction: row; + align-items: center; + + .block-product-media-list-prev, + .block-product-media-list-next { + display: flex; + color: #646f79; + font-size: 22px; + line-height: 18px; + height: 18px; + cursor: pointer; + background: none; + border: none; + padding: 0; + margin: 0; + appearance: none; + outline: none; + + &:focus-visible { + outline: 2px solid #134478; + outline-offset: 2px; + } + } + + .block-product-media-list-dots { + display: flex; + flex-direction: row; + flex: 1 1 auto; + align-items: center; + gap: 8px; + justify-content: center; + padding: 4px 0; + + .block-product-media-list-dot { + display: flex; + flex: 0 0 10px; + height: 10px; + width: 10px; + border-radius: 50%; + background: #a0a4a8; + cursor: pointer; + border: 2px solid #fff; + transition: 0.3s; + appearance: none; + padding: 0; + margin: 0; + background-clip: content-box; + outline: none; + + &:focus-visible { + outline: 2px solid #134478; + outline-offset: 2px; + } + + &.block-product-media-list-dot-active { + background: #134478; + border: 2px solid #134478; + } + } + } } } diff --git a/react/assets/forus-platform/scss/_common/blocks/block-switch-table.scss b/react/assets/forus-platform/scss/_common/blocks/block-switch-table.scss index 5d774385a..f4c4fd1ff 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-switch-table.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-switch-table.scss @@ -1,4 +1,4 @@ -&.block-switch-table { +.block.block-switch-table { max-height: 300px; overflow: auto; @include webkit_scrollbar(); diff --git a/react/assets/forus-platform/scss/_common/blocks/block-system-notification-editor.scss b/react/assets/forus-platform/scss/_common/blocks/block-system-notification-editor.scss index a100fb949..ad7a0ea6c 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-system-notification-editor.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-system-notification-editor.scss @@ -1,4 +1,4 @@ -&.block-system-notification-editor { +.block.block-system-notification-editor { .editor-variables { display: flex; flex-direction: column; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-table-config.scss b/react/assets/forus-platform/scss/_common/blocks/block-table-config.scss index ec3d2819c..d7738e9da 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-table-config.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-table-config.scss @@ -1,4 +1,4 @@ -&.block-table-settings { +.block.block-table-settings { display: flex; border-bottom: 1px solid var(--border-color); diff --git a/react/assets/forus-platform/scss/_common/blocks/block-timeframe.scss b/react/assets/forus-platform/scss/_common/blocks/block-timeframe.scss index aba77b683..eaa6e6df1 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-timeframe.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-timeframe.scss @@ -1,4 +1,4 @@ -&.block-timeframes { +.block.block-timeframes { display: flex; flex-direction: row; border: 1px solid #d4d9dd; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-toast.scss b/react/assets/forus-platform/scss/_common/blocks/block-toast.scss index 11db6a9e7..fe79aec92 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-toast.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-toast.scss @@ -1,4 +1,4 @@ -&.block-toast { +.block.block-toast { background-color: #fff; position: fixed; right: 40px; diff --git a/react/assets/forus-platform/scss/_common/blocks/block-voucher-records-editor.scss b/react/assets/forus-platform/scss/_common/blocks/block-voucher-records-editor.scss index 5c529f50a..8237de697 100644 --- a/react/assets/forus-platform/scss/_common/blocks/block-voucher-records-editor.scss +++ b/react/assets/forus-platform/scss/_common/blocks/block-voucher-records-editor.scss @@ -1,4 +1,4 @@ -&.block-voucher-records-editor { +.block.block-voucher-records-editor { .block-voucher-record-list { border-radius: var(--border-radius); border: 1px dashed var(--border-color); diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-faq.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-faq.scss index 2a9993ac0..7211cee49 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-faq.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-faq.scss @@ -1,4 +1,4 @@ -&.block-feature-faq { +.block.block-feature-faq { padding: 0 25px; .feature-faq-item { diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-icons.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-icons.scss index fc64f7690..486154c08 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-icons.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-icons.scss @@ -1,4 +1,4 @@ -&.block-feature-icons { +.block.block-feature-icons { display: grid; grid-template-columns: repeat(2, 1fr); text-align: center; diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list-row.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list-row.scss new file mode 100644 index 000000000..dabf7c3e1 --- /dev/null +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list-row.scss @@ -0,0 +1,14 @@ +.block.block-feature-list-row { + display: flex; + gap: 24px; + + .block-feature-list-col { + .block-feature-list-quaternary { + height: 100%; + + .block-feature-list-items-wrapper { + height: 100%; + } + } + } +} diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list.scss index 04fd78588..3f6a06f8e 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-list.scss @@ -1,4 +1,4 @@ -&.block-feature-list { +.block.block-feature-list { color: #282b39; margin-bottom: 32px; @@ -117,19 +117,4 @@ &:last-child { margin-bottom: 0; } -} - -&.block-feature-list-row { - display: flex; - gap: 24px; - - .block-feature-list-col { - .block-feature-list-quaternary { - height: 100%; - - .block-feature-list-items-wrapper { - height: 100%; - } - } - } -} +} \ No newline at end of file diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-steps.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-steps.scss index 6c657a135..2ab835d31 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-steps.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-steps.scss @@ -1,4 +1,4 @@ -&.block-feature-steps { +.block.block-feature-steps { background: linear-gradient(180deg, #f3f8fe 14.06%, rgba(255, 255, 255, 0) 100%), #fff; border-radius: var(--border-radius); border: 1px solid #b5d6ff; diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-text-image-columns.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-text-image-columns.scss index 71dcb52be..1e383d696 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-text-image-columns.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature-text-image-columns.scss @@ -1,4 +1,4 @@ -&.block-feature-text-image-columns { +.block.block-feature-text-image-columns { display: grid; grid-template-columns: repeat(2, 1fr); border-radius: 8px; diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature.scss index 0793c72ee..10f20037e 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-feature.scss @@ -1,4 +1,4 @@ -&.block-feature { +.block.block-feature { position: relative; display: grid; grid-template-columns: 76px 1fr; diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-demo-banner.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-demo-banner.scss index d3128c169..60a9f6722 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-demo-banner.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-demo-banner.scss @@ -1,4 +1,4 @@ -&.block-features-demo-banner { +.block.block-features-demo-banner { background-repeat: no-repeat; background-size: cover; height: 320px; diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-overview.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-overview.scss index 0b94c435f..e48b46a75 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-overview.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features-overview.scss @@ -1,4 +1,4 @@ -&.block-features-overview { +.block.block-features-overview { display: flex; flex-direction: row; diff --git a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features.scss b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features.scss index 35ae4d59c..d9f1f486c 100644 --- a/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features.scss +++ b/react/assets/forus-platform/scss/_common/blocks/marketplace-features/block-features.scss @@ -1,4 +1,4 @@ -&.block-features { +.block.block-features { .features-description { font: 400 13px/20px var(--base-font); margin: 0 0 20px; diff --git a/react/assets/forus-platform/scss/_common/components/forms.scss b/react/assets/forus-platform/scss/_common/components/forms.scss index bfcc155bb..b6230f23b 100644 --- a/react/assets/forus-platform/scss/_common/components/forms.scss +++ b/react/assets/forus-platform/scss/_common/components/forms.scss @@ -29,7 +29,7 @@ position: relative; .form-pane-title { - font: 600 11px/20px var(--base-font); + font: 600 14px/20px var(--base-font); padding: 0 0; position: relative; display: flex; @@ -63,7 +63,7 @@ .form-pane-content { border: 1px solid var(--border-color); border-top: none; - padding: 5px 15px 15px; + padding: 8px 15px 15px; border-bottom-left-radius: var(--border-radius); border-bottom-right-radius: var(--border-radius); display: flex; @@ -73,6 +73,12 @@ .form-group { margin-bottom: 0; } + + .form-pane-separator { + height: 1px; + width: 100%; + border-bottom: 1px solid var(--border-color); + } } &.form-pane-lg { @@ -441,7 +447,7 @@ } .form-error { - font: 400 13px/20px var(--base-font); + font: 500 13px/20px var(--base-font); color: var(--color-danger); margin: 0; diff --git a/react/assets/forus-platform/scss/_common/components/modals.scss b/react/assets/forus-platform/scss/_common/components/modals.scss index 142b0a74c..6b4f9e91b 100644 --- a/react/assets/forus-platform/scss/_common/components/modals.scss +++ b/react/assets/forus-platform/scss/_common/components/modals.scss @@ -430,85 +430,6 @@ } } - .modal-content { - position: relative; - padding: 30px; - width: 1200px; - max-width: 100%; - background: #f7f9fc; - border-radius: var(--border-radius); - min-height: 100px; - overflow: hidden; - margin: 0 auto; - box-shadow: 0 20px 40px rgba(#000000, 0.3); - - .modal-section { - padding: 30px; - - .modal-footer { - padding: 30px 0 0; - } - } - - .subdescription { - display: inline-block; - border: 1px solid #eff6f8; - background: #fff; - padding: 10px 80px; - border-radius: var(--border-radius); - font: 400 22px/34px var(--base-font); - color: #646f79; - box-shadow: 0 5px 20px rgba(0, 0, 0, 0.05); - margin: 40px 0 30px; - - .popup-title-styled { - color: #000; - font-weight: 600; - white-space: nowrap; - } - } - - .title { - color: #282b39; - font: 700 40px var(--base-font); - text-align: center; - margin: 0 0 10px; - } - - .description { - padding: 10px 80px; - font: 400 22px/34px var(--base-font); - color: #646f79; - - .popup-title-styled { - color: var(--color-primary); - font-weight: 600; - white-space: nowrap; - } - } - - .description-small { - padding: 10px 0; - font: 400 16px/28px var(--base-font); - color: #646f79; - } - - .modal-icon { - margin-bottom: -40px; - - img { - width: 240px; - } - } - - &.modal-description-pad { - .description { - padding: 50px 0; - color: var(--color-primary) !important; - } - } - } - .modal-footer { padding: 20px 30px; display: flex; @@ -607,32 +528,6 @@ } } - &.modal-notification { - .modal-content { - .modal-section { - font: 400 18px/34px var(--base-font); - - .modal-icon { - img { - width: 140px; - } - } - - .description { - padding: 10px 30px; - font: 400 18px/34px var(--base-font); - } - - .subdescription { - margin-top: 20px; - margin-bottom: 20px; - padding: 10px 30px; - font: 400 18px/34px var(--base-font); - } - } - } - } - &.modal-fund-offers { .modal-window { width: 1400px; @@ -920,10 +815,6 @@ } @media screen and (max-width: 1500px) { - .modal-content { - width: 1000px; - } - .modal-footer { padding: 20px; @@ -958,53 +849,9 @@ right: 20px; } - .modal-content { - border-radius: 0; - height: 100%; - border: none; - transform: none; - top: 0; - left: 0; - overflow-y: auto; - padding: 50px 25px 25px; - - .modal-section { - padding: 0; - } - - .subdescription { - margin: 40px 10px 30px; - } - - .title { - padding: 10px; - } - } - &.modal-auth { padding: 0; - .modal-content { - overflow-y: auto; - padding: 50px 25px 25px; - - .modal-title { - font: 700 22px/32px var(--base-font); - margin: 0 0 10px; - } - - .modal-subtitle { - font: 400 15px/24px var(--base-font); - margin: 0 0 30px; - padding: 0; - } - - .form { - margin-bottom: 10px; - width: 100%; - } - } - .modal-footer { margin: 0 -25px 0; padding: 25px 25px 0 !important; @@ -1031,66 +878,4 @@ } } } - - @media screen and (max-width: 767px) { - .modal-content { - .button { - &:last-child { - margin-bottom: 0; - } - } - } - - &.modal-notification { - .modal-content { - .modal-section { - font: 400 18px/34px var(--base-font); - - .modal-icon { - img { - width: 140px; - } - } - - .description { - padding: 10px 30px; - font: 400 18px/34px var(--base-font); - } - - .subdescription { - margin-top: 20px; - margin-bottom: 20px; - padding: 10px 30px; - font: 400 18px/34px var(--base-font); - } - } - } - } - } - - @media screen and (max-width: 320px) { - &.modal-notification { - .modal-content { - .modal-section { - .modal-icon { - img { - width: 100px; - } - } - - .description { - padding: 10px; - font: 400 16px/34px var(--base-font); - } - - .subdescription { - margin-top: 10px; - margin-bottom: 10px; - padding: 10px 20px; - font: 400 16px/34px var(--base-font); - } - } - } - } - } } diff --git a/react/assets/forus-platform/scss/_common/dashboard.scss b/react/assets/forus-platform/scss/_common/dashboard.scss index aa62ac8dd..d525cb619 100644 --- a/react/assets/forus-platform/scss/_common/dashboard.scss +++ b/react/assets/forus-platform/scss/_common/dashboard.scss @@ -43,45 +43,45 @@ @import '../../../forus-webshop/scss/includes/blocks/block-sign_up'; @import '../../../forus-webshop/scss/includes/blocks/block-exception'; -.block { - @import 'blocks/block-app_download.scss'; - @import 'blocks/block-app_links.scss'; - @import 'blocks/block-timeframe.scss'; - @import 'blocks/block-financial-dashboard.scss'; - @import 'blocks/block-markdownable.scss'; - @import 'blocks/block-markdown.scss'; - @import 'blocks/block-switch-table.scss'; - @import 'blocks/block-system-notification-editor.scss'; - @import 'blocks/block-mail_preview.scss'; - @import 'blocks/block-photo-selector-notifications.scss'; - @import 'blocks/block-feedback-result.scss'; - @import 'blocks/block-permissions-list.scss'; - @import 'blocks/block-announcements.scss'; - @import 'blocks/block-implementation-blocks-editor'; - @import 'blocks/block-auth-2fa.scss'; - @import 'blocks/block-2fa-restriction.scss'; - @import 'blocks/block-bi-info.scss'; - @import 'blocks/block-pincode.scss'; - @import 'blocks/block-voucher-records-editor.scss'; - @import 'blocks/block-content.scss'; - - // Marketplace feature blocks - @import 'blocks/marketplace-features/block-features-overview.scss'; - @import 'blocks/marketplace-features/block-features-demo-banner.scss'; - @import 'blocks/marketplace-features/block-feature-icons.scss'; - @import 'blocks/marketplace-features/block-feature-steps.scss'; - @import 'blocks/marketplace-features/block-feature-list.scss'; - @import 'blocks/marketplace-features/block-feature-text-image-columns.scss'; - @import 'blocks/marketplace-features/block-features.scss'; - @import 'blocks/marketplace-features/block-feature.scss'; - @import 'blocks/marketplace-features/block-feature-faq.scss'; - - @import 'blocks/block-payment-connection.scss'; - @import 'blocks/block-pre-checks-blocks-editor'; - @import 'blocks/block-table-config.scss'; - @import 'blocks/block-toast.scss'; -} - +@import 'blocks/block-app_download.scss'; +@import 'blocks/block-app_links.scss'; +@import 'blocks/block-timeframe.scss'; +@import 'blocks/block-financial-dashboard.scss'; +@import 'blocks/block-markdownable.scss'; +@import 'blocks/block-markdown.scss'; +@import 'blocks/block-switch-table.scss'; +@import 'blocks/block-system-notification-editor.scss'; +@import 'blocks/block-mail_preview.scss'; +@import 'blocks/block-photo-selector-notifications.scss'; +@import 'blocks/block-feedback-result.scss'; +@import 'blocks/block-permissions-list.scss'; +@import 'blocks/block-announcements.scss'; +@import 'blocks/block-implementation-blocks-editor'; +@import 'blocks/block-auth-2fa.scss'; +@import 'blocks/block-2fa-restriction.scss'; +@import 'blocks/block-bi-info.scss'; +@import 'blocks/block-pincode.scss'; +@import 'blocks/block-voucher-records-editor.scss'; +@import 'blocks/block-content.scss'; + +// Marketplace feature blocks +@import 'blocks/marketplace-features/block-features-overview.scss'; +@import 'blocks/marketplace-features/block-features-demo-banner.scss'; +@import 'blocks/marketplace-features/block-feature-icons.scss'; +@import 'blocks/marketplace-features/block-feature-steps.scss'; +@import 'blocks/marketplace-features/block-feature-list.scss'; +@import 'blocks/marketplace-features/block-feature-list-row.scss'; +@import 'blocks/marketplace-features/block-feature-text-image-columns.scss'; +@import 'blocks/marketplace-features/block-features.scss'; +@import 'blocks/marketplace-features/block-feature.scss'; +@import 'blocks/marketplace-features/block-feature-faq.scss'; + +@import 'blocks/block-payment-connection.scss'; +@import 'blocks/block-pre-checks-blocks-editor'; +@import 'blocks/block-table-config.scss'; +@import 'blocks/block-toast.scss'; + +@import 'blocks/block-cms-menu'; @import 'blocks/block-banner-editor'; @import 'blocks/block-color-picker'; @import 'blocks/block-info-box.scss'; @@ -92,6 +92,7 @@ @import 'blocks/block-provider-products-required.scss'; @import 'blocks/block-push-notifications.scss'; @import 'blocks/block-inline-copy.scss'; +@import 'blocks/block-inline-edit.scss'; @import 'blocks/block-collapsable.scss'; @import 'blocks/block-fund-request-assigned.scss'; @import 'blocks/block-product.scss'; @@ -101,6 +102,7 @@ @import 'blocks/block-export-options.scss'; @import 'blocks/block-attachments-list.scss'; @import 'blocks/block-request-clarification.scss'; +@import 'blocks/block-product-media-uploader.scss'; // Select controls @import 'select-controls/select-control-funds'; @@ -114,7 +116,6 @@ .modal { @import 'modals/modal-photo-upload.scss'; - @import 'modals/modal-physical-cards.scss'; @import 'modals/modal-voucher-transaction.scss'; @import 'modals/modal-pin-code.scss'; @import 'modals/modal-provider-products-required.scss'; @@ -936,6 +937,10 @@ body { flex-direction: row; align-items: center; + .card-title { + margin: 0 0 !important; + } + .card-header-filters { display: flex; flex-direction: row; @@ -1083,11 +1088,12 @@ body { } .card-section { + display: flex; + flex-direction: column; padding: 20px; position: relative; cursor: inherit; font: 500 13px var(--base-font); - @include cf(); .card-title { font: 500 16px/30px var(--base-font); @@ -1265,14 +1271,6 @@ body { &:last-child { border-bottom: 0; } - - &.card-section-settings { - .card-title { - font: 600 14px/20px var(--base-font); - margin: 0 0 15px; - color: #282b39; - } - } } .card-info { @@ -1719,6 +1717,18 @@ body { } } + &.card-block-keyvalue-lg { + .keyvalue-item { + .keyvalue-key { + width: 280px; + } + + .keyvalue-value { + width: calc(100% - 280px); + } + } + } + &.card-block-keyvalue-text-sm { .keyvalue-item { padding: 0 0 4px; @@ -2200,67 +2210,6 @@ body { } } - &.card-block-implementation { - display: flex; - padding: 20px; - margin: -20px; - cursor: pointer; - - .card-block-implementation-logo { - img { - width: 70px; - height: 70px; - border: 1px solid #e7e7e7; - border-radius: 70px; - overflow: hidden; - background-color: #f1f4f7; - } - } - - .card-block-implementation-details { - display: flex; - flex-direction: column; - flex-grow: 1; - padding-left: 20px; - align-self: center; - font: 500 18px/22px var(--base-font); - - .card-block-implementation-desc { - font: 600 11px/13px var(--base-font); - color: #134478; - padding-top: 15px; - } - - .card-block-implementation-status { - font: 600 12px/15px var(--base-font); - padding-left: 20px; - } - - .card-block-implementation-website { - a { - font: 600 13px/16px var(--base-font); - text-decoration: underline; - color: #009ef4; - } - } - } - - &:hover { - background: lighten($color: #f3f4f5, $amount: 2); - } - - &.card-block-implementation-collapsed { - cursor: inherit; - background: none; - } - } - - &.card-implementation-edit { - .card-block-details { - font: 500 16px/20px var(--base-font); - } - } - &.card-block-financial { .table { .table-separator { diff --git a/react/assets/forus-platform/scss/_common/includes/fonts/montserrat.scss b/react/assets/forus-platform/scss/_common/includes/fonts/montserrat.scss new file mode 100644 index 000000000..69fdc92e1 --- /dev/null +++ b/react/assets/forus-platform/scss/_common/includes/fonts/montserrat.scss @@ -0,0 +1,44 @@ +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 300; + src: + url('./assets/fonts/montserrat/Montserrat-Thin.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Thin.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + src: + url('./assets/fonts/montserrat/Montserrat-Regular.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 500; + src: + url('./assets/fonts/montserrat/Montserrat-Medium.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 600; + src: + url('./assets/fonts/montserrat/Montserrat-SemiBold.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 700; + src: + url('./assets/fonts/montserrat/Montserrat-Bold.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Bold.ttf') format('truetype'); +} diff --git a/react/assets/forus-platform/scss/_common/modals/modal-physical-cards.scss b/react/assets/forus-platform/scss/_common/modals/modal-physical-cards.scss deleted file mode 100644 index b906e020b..000000000 --- a/react/assets/forus-platform/scss/_common/modals/modal-physical-cards.scss +++ /dev/null @@ -1,318 +0,0 @@ -&.modal-physical-cards { - .modal-window { - width: 800px; - - .modal-section { - border-bottom: 1px solid var(--border-color); - - &:last-child { - border-bottom: none; - } - } - } - - .modal-header { - background-color: #ffffff; - } - - .modal-content { - background-color: #f3f3f3; - border-radius: 0; - - .physical-card-title { - font: 700 18px/26px var(--base-font); - text-align: center; - margin-bottom: 15px; - color: var(--text-color); - } - - .physical-card-description { - font: 700 14px/21px var(--base-font); - text-align: center; - margin-bottom: 25px; - color: #646f79; - - .physical-card-order { - display: inline-block; - text-decoration: underline; - } - - & > .label { - font: inherit; - padding-left: 5px; - padding-right: 5px; - } - } - - .physical-card-media { - img, - svg { - display: block; - height: 200px; - margin: 0 auto 20px; - } - - svg { - height: auto; - } - - .mdi { - font-size: 100px; - display: flex; - justify-content: center; - } - - &.physical-card-media-sm { - img { - height: 130px; - padding: 20px; - margin: 0 auto; - } - } - } - - .physical-card-icon { - background: #134478; - text-align: center; - width: 96px; - height: 96px; - border-radius: 96px; - border: 3px solid #fff; - line-height: 90px; - font-size: 45px; - color: #fff; - margin: 0 auto 20px; - box-shadow: 2px 4px 10px rgba($color: #000000, $alpha: 0.1); - } - - .physical-card-row { - display: flex; - flex-direction: row; - justify-content: center; - margin: 0 0 20px; - - &:last-child { - margin-bottom: 0; - } - } - - .physical-card-item { - position: relative; - margin-right: 0; - padding: 15px 20px; - width: 190px; - padding: 0 20px; - display: flex; - flex-direction: column; - text-align: center; - cursor: default; - - .physical-card-item-title { - font: 700 16px/20px var(--base-font); - margin: 0 -10px 0; - color: var(--text-color); - } - - .physical-card-item-icon { - width: 100px; - height: 100px; - background-color: transparent; - border-radius: var(--border-radius); - margin: 0 auto 10px; - border: 1px dashed #767676; - transition: 0.4s; - - .mdi { - color: #626161; - line-height: 100px; - font-size: 70px; - } - } - - .physical-card-item-description { - margin: 0 -10px 0; - font: 400 12px/16px var(--base-font); - text-align: center; - color: var(--text-color); - padding-top: 15px; - } - - .physical-card-item-details { - display: flex; - flex-direction: column; - - & > .physical-card-item-title { - display: none; - } - } - - &:hover { - .physical-card-item-icon { - border-color: #303030; - background-color: #303030; - - em { - &:before { - color: #fff; - } - } - } - } - - &:last-child { - margin-right: 0; - } - } - } - - .modal-footer { - background: #f3f3f3; - padding: 20px 25px; - font: 600 16px/25px 'Source Sans Pro', sans-serif; - border-top: 1px solid #d4d9dd; - position: relative; - border-radius: 0 0 3px 3px; - } - - @media screen and (max-width: 760px) { - .modal-window { - height: 50%; - display: flex; - flex-direction: column; - } - - .modal-header { - border-radius: 0; - } - - .modal-content { - flex-grow: 1; - padding: 0; - flex-direction: column; - - .modal-section { - min-height: 100%; - flex-grow: 1; - justify-content: center; - padding: 25px 25px 25px; - - .pincode-number { - margin-right: -1px; - width: auto; - padding: 0 4px; - - &.pincode-number-block-start { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - padding-left: 15px; - } - - &.pincode-number-block-end { - margin-right: 10px; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - padding-right: 15px; - } - } - } - - .physical-card-result { - flex-direction: column; - justify-content: center; - display: flex; - flex-direction: column; - height: 100%; - padding: 50px 0; - } - - .physical-card-row { - flex-direction: column; - margin: 0 0 20px; - - .physical-card-item { - margin: 0 0 20px; - width: 100%; - border: 2px solid #767676; - border-radius: var(--border-radius); - flex-direction: row; - padding: 0; - text-align: left; - - .physical-card-item-inner { - .physical-card-item-icon { - border: none; - width: 90px; - height: 90px; - margin: 0 0; - } - } - - .physical-card-item-title { - display: none; - margin: 0 0 5px; - font: 700 13px/16px var(--base-font); - width: 100%; - } - - .physical-card-item-description { - font: 400 11px/16px var(--base-font); - margin: 0 0 0; - width: 100%; - padding: 0; - text-align: left; - } - - .physical-card-item-details { - display: flex; - flex-direction: column; - justify-content: center; - border-left: 2px solid #767676; - padding: 15px 20px; - flex-grow: 1; - - & > .physical-card-item-title { - display: block; - } - } - - &:last-child { - margin-bottom: 0; - } - - &.physical-card-item-sm { - margin: 0 0 5px; - - .physical-card-item-inner { - .physical-card-item-icon { - width: 40px; - height: 40px; - margin: -2px 0; - - .mdi { - color: #000; - &:before { - position: absolute; - margin: 0; - top: 15%; - left: 6px; - font: normal normal normal 26px/1 'Material Design Icons'; - } - } - } - } - - .physical-card-item-title { - font: 700 16px/18px var(--base-font); - margin: 0 0 0; - } - - .physical-card-item-details { - border-left: none; - padding: 5px 20px 5px 5px; - } - } - } - } - } - } -} diff --git a/react/assets/forus-platform/scss/general/style-dashboard-general.scss b/react/assets/forus-platform/scss/general/style-dashboard-general.scss index bdfcfb3d0..3af6e6dbd 100644 --- a/react/assets/forus-platform/scss/general/style-dashboard-general.scss +++ b/react/assets/forus-platform/scss/general/style-dashboard-general.scss @@ -1,3 +1,4 @@ +@import '../_common/includes/fonts/montserrat'; @import './vars'; @import '../_common/dashboard'; diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Bold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Bold.ttf new file mode 100644 index 000000000..1d23c7066 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Bold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Bold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Bold.woff2 new file mode 100644 index 000000000..a36ad7f88 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Bold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Italic.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Italic.ttf new file mode 100644 index 000000000..70a870f40 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Italic.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Italic.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Italic.woff2 new file mode 100644 index 000000000..fed2fe58f Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Italic.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Medium.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Medium.ttf new file mode 100644 index 000000000..0648fb2d7 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Medium.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Medium.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Medium.woff2 new file mode 100644 index 000000000..2b66cd309 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Medium.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Regular.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Regular.ttf new file mode 100644 index 000000000..0f3d0f837 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Regular.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Regular.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Regular.woff2 new file mode 100644 index 000000000..3f07a5f88 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-Regular.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-SemiBold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-SemiBold.ttf new file mode 100644 index 000000000..3b1bcccc3 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-SemiBold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-SemiBold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-SemiBold.woff2 new file mode 100644 index 000000000..223617e18 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/Lato-SemiBold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/OFL.txt b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/OFL.txt new file mode 100755 index 000000000..6d2c4160b --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/lato/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com), +with Reserved Font Name Lato. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Bold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Bold.ttf new file mode 100644 index 000000000..47e921e88 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Bold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Bold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Bold.woff2 new file mode 100644 index 000000000..e8e2c95c2 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Bold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Medium.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Medium.ttf new file mode 100644 index 000000000..2a895f957 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Medium.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Medium.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Medium.woff2 new file mode 100644 index 000000000..594028bd8 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Medium.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Regular.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Regular.ttf new file mode 100644 index 000000000..3159f743b Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Regular.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Regular.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Regular.woff2 new file mode 100644 index 000000000..69459c987 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-Regular.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-SemiBold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-SemiBold.ttf new file mode 100644 index 000000000..6a48bfe5e Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-SemiBold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-SemiBold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-SemiBold.woff2 new file mode 100644 index 000000000..ba86a5551 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/Montserrat-SemiBold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/OFL.txt b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/OFL.txt new file mode 100644 index 000000000..f435ed8b5 --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/montserrat/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OFL.txt b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OFL.txt new file mode 100644 index 000000000..2e76eefd4 --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OFL.txt @@ -0,0 +1,88 @@ +Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Bold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Bold.ttf new file mode 100644 index 000000000..b7fadfa4a Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Bold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Bold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Bold.woff2 new file mode 100644 index 000000000..6d6a29967 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Bold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-ExtraBold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-ExtraBold.ttf new file mode 100644 index 000000000..6e5508a90 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-ExtraBold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-ExtraBold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-ExtraBold.woff2 new file mode 100644 index 000000000..1e444f7e5 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-ExtraBold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Italic.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Italic.ttf new file mode 100644 index 000000000..e99cb92d4 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Italic.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Italic.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Italic.woff2 new file mode 100644 index 000000000..7f1be4c42 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Italic.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Light.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Light.ttf new file mode 100644 index 000000000..a0ba20432 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Light.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Light.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Light.woff2 new file mode 100644 index 000000000..2f5ee3925 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Light.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Medium.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Medium.ttf new file mode 100644 index 000000000..04d88fbf9 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Medium.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Medium.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Medium.woff2 new file mode 100644 index 000000000..f59af349c Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Medium.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Regular.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Regular.ttf new file mode 100644 index 000000000..8529c432c Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Regular.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Regular.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Regular.woff2 new file mode 100644 index 000000000..23eec574f Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-Regular.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-SemiBold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-SemiBold.ttf new file mode 100644 index 000000000..f210dd955 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-SemiBold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-SemiBold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-SemiBold.woff2 new file mode 100644 index 000000000..13b0ac022 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/open-sans/OpenSans-SemiBold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/OFL.txt b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/OFL.txt new file mode 100644 index 000000000..a417551aa --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Bold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Bold.ttf new file mode 100644 index 000000000..4658f9a67 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Bold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Bold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Bold.woff2 new file mode 100644 index 000000000..a77461f6e Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Bold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Italic.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Italic.ttf new file mode 100644 index 000000000..c3abaefb2 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Italic.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Italic.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Italic.woff2 new file mode 100644 index 000000000..435979e29 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Italic.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Medium.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Medium.ttf new file mode 100644 index 000000000..d629e9848 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Medium.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Medium.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Medium.woff2 new file mode 100644 index 000000000..8ee0c4bf8 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Medium.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Regular.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Regular.ttf new file mode 100644 index 000000000..7e3bb2f8c Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Regular.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Regular.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Regular.woff2 new file mode 100644 index 000000000..d07d0d931 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-Regular.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-SemiBold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-SemiBold.ttf new file mode 100644 index 000000000..3f348341c Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-SemiBold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-SemiBold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-SemiBold.woff2 new file mode 100644 index 000000000..45fb782f4 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/roboto/Roboto-SemiBold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/OFL.txt b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/OFL.txt new file mode 100644 index 000000000..22c601b82 --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2010-2024 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Bold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Bold.ttf new file mode 100644 index 000000000..85693ccc8 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Bold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Bold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Bold.woff2 new file mode 100644 index 000000000..304960558 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Bold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-It.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-It.ttf new file mode 100644 index 000000000..8e0576f24 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-It.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-It.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-It.woff2 new file mode 100644 index 000000000..14e9084da Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-It.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Medium.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Medium.ttf new file mode 100644 index 000000000..fbc97bf32 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Medium.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Medium.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Medium.woff2 new file mode 100644 index 000000000..37ad2e05d Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Medium.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Regular.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Regular.ttf new file mode 100644 index 000000000..c5dd0b88c Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Regular.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Regular.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Regular.woff2 new file mode 100644 index 000000000..a5ac52c63 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-Regular.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-SemiBold.ttf b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-SemiBold.ttf new file mode 100644 index 000000000..4aff9a3ae Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-SemiBold.ttf differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-SemiBold.woff2 b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-SemiBold.woff2 new file mode 100644 index 000000000..3bfbc08f5 Binary files /dev/null and b/react/assets/forus-webshop/resources/_webshop-common/assets/fonts/source-sans-pro/SourceSans3-SemiBold.woff2 differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview-variant.png b/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview-variant.png deleted file mode 100644 index 1bc7cd0ae..000000000 Binary files a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview-variant.png and /dev/null differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview-vertical.png b/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview-vertical.png deleted file mode 100644 index 5bb1fe282..000000000 Binary files a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview-vertical.png and /dev/null differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview.png b/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview.png deleted file mode 100644 index 8ec8c67f0..000000000 Binary files a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview.png and /dev/null differ diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview.svg b/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview.svg deleted file mode 100644 index 3805e38c5..000000000 --- a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-physical-cards/icon-physical-cards-preview.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-voucher-records.svg b/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-voucher-records.svg deleted file mode 100644 index 1246cdea5..000000000 --- a/react/assets/forus-webshop/resources/_webshop-common/assets/img/icon-voucher-records.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/placeholders/physical-card-type.svg b/react/assets/forus-webshop/resources/_webshop-common/assets/img/placeholders/physical-card-type.svg new file mode 100644 index 000000000..61aee5381 --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/img/placeholders/physical-card-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/product-categories-shape-bottom.svg b/react/assets/forus-webshop/resources/_webshop-common/assets/img/product-categories-shape-bottom.svg new file mode 100644 index 000000000..a96d7d56d --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/img/product-categories-shape-bottom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/product-categories-shape-top.svg b/react/assets/forus-webshop/resources/_webshop-common/assets/img/product-categories-shape-top.svg new file mode 100644 index 000000000..e89080aab --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/img/product-categories-shape-top.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/_webshop-common/assets/img/transaction-icon-bg.svg b/react/assets/forus-webshop/resources/_webshop-common/assets/img/transaction-icon-bg.svg new file mode 100644 index 000000000..ea4e64867 --- /dev/null +++ b/react/assets/forus-webshop/resources/_webshop-common/assets/img/transaction-icon-bg.svg @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/favicon.ico b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/favicon.ico new file mode 100644 index 000000000..25e2c3c57 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/favicon.ico differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/logo-normal.svg b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/logo-normal.svg new file mode 100644 index 000000000..1e863114a --- /dev/null +++ b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/logo-normal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png new file mode 100644 index 000000000..ca1cb7ad0 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png new file mode 100644 index 000000000..5183608f8 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png new file mode 100644 index 000000000..96d4cec05 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png new file mode 100644 index 000000000..90658fed2 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png new file mode 100644 index 000000000..bdad0634c Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png new file mode 100644 index 000000000..7cc9b47aa Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/payout.svg b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/payout.svg new file mode 100644 index 000000000..8a72bcc1f --- /dev/null +++ b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/payout.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png new file mode 100644 index 000000000..8bfeeda26 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png new file mode 100644 index 000000000..525fff135 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png new file mode 100644 index 000000000..82600b487 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png new file mode 100644 index 000000000..7cbff6b24 Binary files /dev/null and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png differ diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss b/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss index e2f8e76ab..9fccb132c 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss @@ -30,15 +30,14 @@ .block-card-logo { margin: 0 25px 0 0; + width: 100px; + height: 100px; display: flex; flex-direction: column; justify-content: center; img { display: block; - max-width: 230px; - margin-left: -20px; - margin-bottom: -10px; } svg { @@ -46,17 +45,6 @@ fill: var(--color-primary); } } - - &.block-card-logo-background { - width: 80px; - height: 80px; - display: flex; - background-color: rgba($color: var(--color-primary), $alpha: .075); - - svg { - margin: auto; - } - } } .block-card-details { diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-bookmark-toggle.scss b/react/assets/forus-webshop/scss/includes/blocks/block-bookmark-toggle.scss index d341675fb..deab20a0b 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-bookmark-toggle.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-bookmark-toggle.scss @@ -3,23 +3,36 @@ height: 40px; border-radius: 20px; background: #ffff; - font: 500 22px/42px arial; + line-height: 42px; text-align: center; - color: #282B39; + color: #282b39; z-index: 1; - transition: color .4s, background-color .4s; + transition: + color 0.4s, + background-color 0.4s; border: 1px solid var(--border-color); cursor: pointer; .mdi { line-height: 20px; + font-size: 20px; + height: 20px; + display: inline-flex; } &:hover { - color: #ED133C; + color: #ed133c; } &.active { - color: #ED133C; + color: #ed133c; } -} \ No newline at end of file + + &.block-bookmark-toggle-compact { + line-height: 20px; + height: 20px; + width: 20px; + border: none; + padding: 0; + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-fund-pre-check-chatbot.scss b/react/assets/forus-webshop/scss/includes/blocks/block-fund-pre-check-chatbot.scss new file mode 100644 index 000000000..ddbc06579 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-fund-pre-check-chatbot.scss @@ -0,0 +1,263 @@ +//TODO: refactor towards: +.class_name { + // attributes + // nested classes + //hover, active, etc. + //types + //media +} +.block.block-fund-pre-check-chatbot { + --spacing: 4px; + height: 75vh; + min-height: 0; + display: flex; + flex-direction: column; + + .block-title { + font: 500 36px/36px var(--base-font), sans-serif; + margin: 0 0 10px; + text-align: center; + color: #191A1C; + } + + .chatbot-header { + align-items: center; + display: flex; + flex-direction: row; + width: 100%; + gap: calc(var(--spacing) * 4); + margin-bottom: calc(var(--spacing) * 4); + } + + .progress-bar { + width: 100%; + height: calc(var(--spacing) * 6); + background: #9e9e9e; + border-radius: calc(infinity * 1px); + overflow: hidden; + flex: 1; + + .inner-bar { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + background: mediumblue; + transition-duration: 300ms; + border-radius: calc(infinity * 1px); + color: #fff; + font: var(--base-font); + font-size: 18px; + } + } + + .chatbot-messages, + .message-list { + overflow-x: hidden; + } + + .chatbot-messages { + display: flex; + flex-direction: column; + width: 100%; + height: 100%; + min-height: 0; + padding: calc(var(--spacing) * 2); + + background: #fafafa; + border: 1px solid #eee; + border-radius: 12px; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + + .message-list { + flex: 1; + overflow-y: auto; + height: 100%; + padding-inline: calc(var(--spacing) * 1); + + p { + margin-bottom: 0; + font-weight: 600; + } + + .thinking { + display: flex; + justify-content: start; + font-size: 12px; + } + + .message-wrapper { + display: flex; + flex-direction: row; + margin-bottom: calc(var(--spacing) * 2); + + .message-avatar { + margin-right: calc(var(--spacing) * 2); + display: flex; + flex-direction: column; + width: fit-content; + height: fit-content; + border-radius : calc(infinity * 1px); + align-items: center; + justify-content: center; + color: black; + font-weight: bold; + + .avatar-icon { + font-size: 1.75rem; + } + + .avatar-name { + font-size: 0.875rem; + font-family: var(--base-font), sans-serif; + } + } + + .message-content { + flex: 1; + justify-items: start; + width: 100%; + + .message-slots { + margin-top: var(--spacing); + list-style: disc; + padding-left: calc(var(--spacing) * 4); + } + + .answer-options { + display: flex; + flex-direction: column; + gap: var(--spacing); + + @media (min-width: 1024px) { + flex-direction: row; + } + + .answer-button { + background: blue; + color: white; + + //&.disabled { + // cursor: not-allowed; + // background: var(--button-disabled-background, gray); + //} + + &--is-selected { + background: purple !important; + color: white !important; + } + + &:hover { + background: var(--color-default-light); + } + + } + } + + .advice-button { + margin-top: calc(var(--spacing) * 2); + margin-left: 0; + } + + .answer-input-wrapper { + display: flex; + justify-content: space-between; + position: relative; + align-items: center; + width: calc(3/4 * 100%); + + .answer-input { + width: 100%; + text-align: center; + border: 3px solid gray; + padding-inline: 3px; + border-radius: calc(var(--spacing) * 2); + font: 400 16px/1.5em var(--base-font); + background: transparent; + } + .answer-input::placeholder { + font: 300 16px/1.5em var(--base-font); + } + + .answer-input-icon { + //position: absolute; + cursor: pointer; + font-size: 1.5rem; + line-height: 1; + background: transparent; + //right: 8px; + color: gray; + padding: 0 2px 0 2px; + margin-inline: 6px 3px; + margin-top: 2px; + width: auto; + } + .answer-send-button-icon.mdi { + float: none; + } + + .button-icon:hover { + color: black; + } + } + } + } + .message-item { + padding: calc(var(--spacing) * 2); + border-top-left-radius: 8px; + border-top-right-radius: 8px; + + width: fit-content; + max-width: 100%; + margin-bottom: calc(var(--spacing) * 2); + margin-right: calc(var(--spacing) * 2); + + white-space: pre-line; + word-wrap: break-word; + + @media (min-width: 640px) { + max-width: 80%; + margin-bottom: var(--spacing); + margin-right: 0; + font-size: 16px; + font-weight: 600; + } + + @media (min-width: 1024px) { + max-width: 60%; + } + + ul { + list-style-type: disc; + list-style-position: inside; + } + + &--error { + background: color-mix(in srgb, var(--color-danger) 50%, white) !important; + border: 2px solid color-mix(in srgb, var(--color-danger) 50%, black); + color: color-mix(in srgb, var(--color-danger) 50%, black); + } + + &--user { + background: #ddd6fe; + margin-left: auto; + text-align: right; + border-bottom-left-radius: 8px; + justify-content: end; + } + + &--bot { + justify-content: start; + background: #c7d2fe; + text-align: left; + border-bottom-right-radius: 8px; + } + + &--in-progress { + font-style: italic; + color: #6b7280; + } + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-offices.scss b/react/assets/forus-webshop/scss/includes/blocks/block-offices.scss index a1d3c3730..061ac6f71 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-offices.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-offices.scss @@ -20,7 +20,6 @@ padding: 15px 15px; border-bottom: 1px solid var(--border-color); - .office-logo-offset, .office-logo { margin: 0 15px 0 0; width: 40px; diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-organization-offices.scss b/react/assets/forus-webshop/scss/includes/blocks/block-organization-offices.scss new file mode 100644 index 000000000..0d9829456 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-organization-offices.scss @@ -0,0 +1,393 @@ +.block.block-organization-offices { + display: flex; + flex-direction: column; + gap: 15px; + + .organization-pane { + transition: box-shadow 0.4s; + flex-direction: row; + display: flex; + align-items: center; + + .organization-pane-info { + align-items: center; + display: flex; + flex: 1 1 auto; + gap: 16px; + + .organization-logo { + display: flex; + flex-direction: column; + border: 1px solid var(--border-color); + border-radius: min(var(--border-radius), 8px); + flex: 0 0 44px; + overflow: hidden; + + .organization-logo-img { + display: block; + width: 100%; + } + } + + .organization-title { + display: flex; + flex-direction: column; + text-align: left; + gap: 5px; + + .organization-title-value { + vertical-align: middle; + display: flex; + font: 700 16px/20px var(--heading-font-family); + flex-direction: column; + justify-content: center; + margin: 0 0; + color: #282b39; + } + + .organization-page-link { + display: flex; + font: 600 13px/14px var(--base-font); + color: var(--tc-link); + margin: 0 0; + text-decoration: underline; + + .mdi { + font-size: 18px; + line-height: 14px; + } + + &:hover { + text-decoration: none; + } + } + } + } + + .organization-pane-collapse { + appearance: none; + background: none; + border: none; + align-items: center; + display: flex; + cursor: pointer; + flex-direction: row; + margin: 0; + gap: 10px; + + .organization-total-offices, + .organization-total-offices-count { + font: 600 14px/20px var(--base-font); + } + + .organization-total-offices { + color: var(--tc-link); + } + + .organization-total-offices-count { + width: 25px; + height: 25px; + min-width: 20px; + line-height: 23px; + border: 1px solid var(--border-color); + border-radius: min(var(--border-radius), 7px); + font-size: 13px; + text-align: center; + background: #fff; + color: #282b39; + transition: + color 0.4s, + background-color 0.4s; + + &.active { + background: #282b39; + color: #fff; + } + } + + .organization-chevron { + line-height: 20px; + height: 20px; + font-size: 20px; + color: #769af7; + cursor: pointer; + transition: 0.4s; + + .mdi { + font-size: inherit; + color: inherit; + } + + &:hover { + color: var(--color-primary); + } + } + } + } + + .organization-offices { + padding-left: 50px; + + .organization-office-item { + display: block; + margin-bottom: 0; + position: relative; + background: #fff; + box-shadow: none; + padding-left: 15px; + + .office-chevron { + font-size: 30px; + margin-top: auto; + margin-bottom: auto; + margin-left: auto; + color: #646f79; + } + + .organization-office-item-map-icon { + color: #282b39; + background: #fff; + position: absolute; + left: -40px; + width: 24px; + height: 24px; + border: 1px solid var(--border-color); + text-align: center; + line-height: 22px; + font-size: 18px; + border-radius: min(calc(var(--border-radius) * 2), 8px); + top: 20px; + } + + .office-pane { + display: flex; + background: #ffffff; + flex-direction: column; + border-bottom: 1px solid var(--border-color); + + .office-pane-block { + display: flex; + flex-direction: row; + padding: 15px 0; + border-bottom: 1px solid var(--border-color); + + .office-details { + display: flex; + flex-direction: column; + gap: 8px; + + .office-title { + font: 600 16px/20px var(--base-font); + color: #272525; + margin: 0 0; + } + + .office-props { + display: flex; + flex-direction: row; + gap: 14px; + align-items: center; + + .office-prop-item { + display: flex; + color: #353535; + font: 400 14px/20px var(--base-font); + gap: 6px; + + .mdi { + color: #848484; + font-size: 16px; + } + } + + .office-prop-separator { + background: #e5e5e5; + width: 1px; + height: 10px; + border-radius: 1px; + } + } + } + + .office-info { + font: 600 12px/20px var(--base-font); + display: flex; + + .mdi { + float: left; + font-size: 15px; + margin: -1px 5px -1px 0; + } + + &.office-info-inline { + display: inline-flex; + } + + &:not(:last-child) { + margin-right: 20px; + } + } + + &:last-child { + border-bottom: none; + } + } + } + + &:before { + content: ''; + display: block; + position: absolute; + background: var(--border-color); + width: 1px; + top: -16px; + bottom: 0; + left: -27px; + transform: translate(-50%); + } + + &:last-child { + margin-bottom: -15px; + + .office-pane { + border-bottom: none; + } + + &:before { + bottom: auto; + height: 60px; + } + } + } + } +} + +@media (max-width: 768px) { + .block.block-organization-offices { + gap: 12px; + + .organization-pane { + flex-direction: column; + align-items: flex-start; + gap: 15px; + z-index: 1; + + .organization-pane-info { + flex-direction: row; + align-items: flex-start; + gap: 15px; + + .organization-logo { + flex: 0 0 44px; + } + + .organization-title { + gap: 8px; + + .organization-title-value { + font: 700 15px/20px var(--heading-font-family); + } + + .organization-page-link { + font: 600 12px/14px var(--base-font); + width: fit-content; + + .mdi { + font-size: 16px; + } + } + } + } + + .organization-pane-collapse { + gap: 8px; + margin-left: 59px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius); + padding: 6px 6px; + width: calc(100% - 59px); + justify-content: center; + + .organization-total-offices, + .organization-total-offices-count { + font: 600 13px/18px var(--base-font); + } + + .organization-total-offices-count { + width: 22px; + height: 22px; + line-height: 20px; + font-size: 12px; + } + + .organization-chevron { + font-size: 18px; + height: 18px; + line-height: 18px; + } + } + } + + .organization-offices { + padding-left: 40px; + + .organization-office-item { + padding-left: 5px; + + .organization-office-item-map-icon { + left: -31px; + top: 8px; + z-index: 1; + } + + .office-pane { + .office-pane-block { + flex-direction: column; + padding: 10px 0; + + .office-details { + gap: 6px; + + .office-title { + font: 600 14px/20px var(--base-font); + } + + .office-props { + flex-wrap: wrap; + gap: 5px; + + .office-prop-item { + width: 100%; + font: 500 12px/18px var(--base-font); + } + + .office-prop-separator { + display: none; + } + } + } + + .office-info { + font: 600 11px/18px var(--base-font); + margin-top: 5px; + } + } + } + + .office-chevron { + display: none; + } + + &:before { + top: -110px; + left: -19px; + bottom: -8px; + } + + &:last-child { + margin-bottom: -10px; + } + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-panel-group.scss b/react/assets/forus-webshop/scss/includes/blocks/block-panel-group.scss new file mode 100644 index 000000000..1df7ccc7b --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-panel-group.scss @@ -0,0 +1,134 @@ +.block.block-panel-group { + display: flex; + flex-direction: column; + gap: 10px; + + .panel { + border: 1px solid var(--border-color); + border-radius: min(calc(var(--border-radius) * 3), 16px); + background-color: #ffffff; + + .panel-header { + display: flex; + padding: 25px 30px; + flex-direction: row; + gap: 8px; + align-items: center; + width: 100%; + background: none; + border: none; + text-align: left; + font: inherit; + color: inherit; + cursor: pointer; + outline-offset: -2px !important; + + .panel-header-icon { + line-height: 28px; + font-size: 25px; + color: var(--color-primary); + + .mdi { + line-height: inherit; + font-size: inherit; + color: inherit; + } + } + + .panel-header-title { + display: flex; + flex: 1 1 auto; + font: 700 22px/28px var(--base-font); + margin: 0 0; + } + + .mdi { + background-color: #eceff0; + font-size: 26px; + height: 32px; + width: 32px; + border-radius: 16px; + line-height: 32px; + text-align: center; + color: #282b39; + flex: 0 0 auto; + } + } + + .panel-body { + display: flex; + flex-direction: column; + padding: 0 30px 30px; + + &[hidden] { + display: none; + } + } + } + + @media (max-width: 1000px) { + gap: 8px; + + .panel { + border-radius: min(calc(var(--border-radius) * 2), 12px); + + .panel-header { + padding: 20px 25px; + gap: 6px; + + .panel-header-icon { + font-size: 22px; + line-height: 24px; + } + + .panel-header-title { + font: 700 20px/24px var(--base-font); + } + + .mdi { + font-size: 22px; + height: 28px; + width: 28px; + line-height: 28px; + } + } + + .panel-body { + padding: 0 25px 25px; + } + } + } + + @media (max-width: 480px) { + gap: 6px; + + .panel { + border-radius: min(calc(var(--border-radius) * 1.5), 10px); + + .panel-header { + gap: 5px; + padding: 18px 20px; + + .panel-header-icon { + font-size: 20px; + line-height: 22px; + } + + .panel-header-title { + font: 700 18px/22px var(--base-font); + } + + .mdi { + font-size: 20px; + height: 26px; + width: 26px; + line-height: 26px; + } + } + + .panel-body { + padding: 0 20px 20px; + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-pincode.scss b/react/assets/forus-webshop/scss/includes/blocks/block-pincode.scss index 15ae1ab50..b7a7b294e 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-pincode.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-pincode.scss @@ -132,7 +132,7 @@ margin: 0 auto; .pincode-number { - width: 23px !important; + width: 25px !important; padding: 0; margin-right: 2px; diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-product-categories.scss b/react/assets/forus-webshop/scss/includes/blocks/block-product-categories.scss new file mode 100644 index 000000000..0938c941e --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-product-categories.scss @@ -0,0 +1,233 @@ +.block.block-product-categories { + flex-direction: column; + text-align: center; + display: flex; + gap: 0; + cursor: default; + padding: var(--section-padding); + + .product-categories-shape { + display: flex; + + svg { + display: block; + width: 100%; + height: fit-content; + + path { + fill: var(--color-primary); + opacity: 0.05; + display: block; + } + } + } + + .product-categories-content { + flex-direction: column; + text-align: center; + display: flex; + gap: 20px; + position: relative; + padding: 40px 0; + + .wrapper { + flex-direction: inherit; + text-align: inherit; + display: inherit; + gap: inherit; + } + + &:after { + content: ''; + opacity: 0.05; + background: var(--color-primary); + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; + } + } + + .product-categories-title { + font: 700 40px/54px var(--base-font); + color: #1a1a1a; + margin: 0; + } + + .product-categories-description { + font: 400 18px/24px var(--base-font); + color: #222; + margin: 0; + } + + .product-category-items { + --gap: 16px; + --items: 6; + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: calc(var(--gap) * 2) var(--gap); + justify-content: center; + padding: 20px 0; + list-style: none; + margin: 0; + + .product-category-item { + padding: 25px 10px; + gap: 5px; + display: flex; + flex-direction: column; + flex: 0 0 calc(calc(100% / var(--items)) - calc(calc(var(--gap) * calc(var(--items) - 1)) / var(--items))); + border-radius: min(var(--border-radius), 16px); + filter: brightness(1); + color: var(--button-primary-color); + box-shadow: var(--button-shadow); + background: var(--button-primary-background); + transition: 0.4s; + cursor: pointer; + min-width: 0; + justify-content: center; + text-decoration: none; + outline: none; + + .product-category-item-icon { + color: #fff; + + .mdi { + font-size: 50px; + line-height: 50px; + } + } + + .product-category-item-name { + font: 700 15px/22px var(--base-font); + letter-spacing: -0.2px; + color: #fff; + margin: 0; + } + + &:hover, + &:focus-visible { + color: var(--button-primary-hover-color); + box-shadow: var(--button-hover-shadow); + background: var(--button-primary-hover-background); + } + } + + &.product-category-items-no-icons { + --items: 5; + + .product-category-item { + padding: 20px 10px; + + .product-category-item-name { + font: 700 16px/22px var(--base-font); + } + } + } + } + + @media screen and (max-width: 1400px) { + .product-categories-content { + gap: 10px; + padding: 15px 0; + } + + .product-category-items { + --items: 5; + + .product-category-item { + .product-category-item-icon { + .mdi { + font-size: 32px; + line-height: 32px; + } + } + + .product-category-item-name { + font: 700 14px/20px var(--base-font); + } + } + + &.product-category-items-no-icons { + --items: 4; + + .product-category-item { + .product-category-item-name { + font: 700 15px/20px var(--base-font); + } + } + } + } + } + + @media screen and (max-width: 1000px) { + .product-categories-title { + font: 700 24px/32px var(--base-font); + } + + .product-categories-content { + gap: 8px; + padding: 15px 0; + } + + .product-category-items { + --items: 4; + gap: var(--gap) var(--gap); + + .product-category-item { + padding: 20px 10px; + } + + &.product-category-items-no-icons { + --items: 3; + + .product-category-item { + padding: 15px 15px; + } + } + } + } + + @media screen and (max-width: 480px) { + .product-categories-title { + font: 700 22px/30px var(--base-font); + } + + .product-categories-description { + font: 400 14px/18px var(--base-font); + margin: 0 0 15px; + } + + .product-category-items { + --items: 2; + --gap: 12px; + gap: var(--gap) var(--gap); + padding: 0; + justify-content: flex-start; + + .product-category-item { + padding: 10px 15px; + flex-direction: row; + gap: 12px; + align-items: center; + text-align: left; + justify-content: flex-start; + + .product-category-item-icon { + flex: 0 0 32px; + } + } + + &.product-category-items-no-icons { + --items: 1; + + .product-category-item { + justify-content: center; + } + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-product-category-filter.scss b/react/assets/forus-webshop/scss/includes/blocks/block-product-category-filter.scss new file mode 100644 index 000000000..13919101f --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-product-category-filter.scss @@ -0,0 +1,64 @@ +.block.block-product-category-filter { + display: flex; + flex-direction: column; + gap: 5px; + max-height: 365px; + overflow: auto; + padding-right: 10px; + @include webkit_scrollbar(); + + .category-filter-item { + display: flex; + flex-direction: row; + align-items: center; + padding: 0 0; + border-radius: var(--border-radius); + background-color: #fff; + border: 1px solid transparent; + gap: 2px; + cursor: pointer; + outline-offset: -2px !important; + transition: + background-color 0.4s, + border 0.4s, + color 0.4s; + + .category-filter-item-icon { + display: flex; + flex: 0 0 30px; + height: 30px; + line-height: 30px; + font-size: 18px; + gap: 5px; + align-items: center; + justify-content: center; + color: var(--tc); + } + + .category-filter-item-name { + display: inline-block; + font: 600 13px/20px var(--base-font); + color: var(--tc); + } + + &:hover, + &:focus { + background: #f4f4f4; + border: 1px solid var(--color-primary); + + .category-filter-item-icon, + .category-filter-item-name { + color: #282b39; + } + } + + &.category-filter-item-active { + border: 1px solid var(--color-primary); + + .category-filter-item-icon, + .category-filter-item-name { + color: #282b39; + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-product.scss b/react/assets/forus-webshop/scss/includes/blocks/block-product.scss new file mode 100644 index 000000000..a267b1a3e --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-product.scss @@ -0,0 +1,556 @@ +.block.block-product { + position: relative; + display: flex; + flex-direction: column; + padding: 40px; + background: #fff; + border-radius: min(calc(var(--border-radius) * 4), 24px); + gap: 40px; + margin: 0 0 40px; + + .product-overview { + display: flex; + flex-direction: row; + gap: 40px; + min-width: 0; + + .product-overview-media { + display: flex; + flex-direction: column; + flex: 0 0 calc(50% - 20px); + min-width: 0; + gap: 20px; + + .product-overview-media-preview { + display: flex; + justify-content: center; + + .product-overview-media-img { + display: flex; + width: 100%; + max-width: 100%; + border-radius: var(--border-radius); + } + } + + .product-overview-media-list { + display: flex; + flex-direction: row; + align-items: center; + + .product-overview-media-items { + display: flex; + flex: 1 1 auto; + flex-direction: row; + justify-content: center; + min-width: 0; + + .product-overview-media-items-list { + display: flex; + flex-direction: row; + justify-content: center; + gap: 8px; + min-width: 0; + @include webkit_scrollbar_horizontal(); + } + + .product-overview-media-item { + display: flex; + flex: 0 0 65px; + padding: 2px; + border: 2px solid transparent; + border-radius: min(var(--border-radius), 4px); + cursor: pointer; + + img { + display: block; + max-width: 100%; + border-radius: min(var(--border-radius), 4px); + opacity: 0.85; + transition: opacity 0.2s; + } + + &:focus-visible { + outline: 2px solid var(--color-primary); + outline-offset: 2px; + } + + &.active { + border-color: var(--color-primary); + + img { + opacity: 1; + } + } + } + } + + .product-overview-media-prev, + .product-overview-media-next { + appearance: none; + background: none; + border: none; + padding: 0; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + + .mdi { + font-size: 32px; + color: var(--text-color); + } + + &[disabled] { + opacity: 0.5; + cursor: default; + pointer-events: none; + } + + &:not([disabled]):hover { + .mdi { + color: var(--color-primary); + } + } + } + } + } + + .product-overview-details { + display: flex; + flex-direction: column; + flex: 0 0 calc(50% - 20px); + min-width: 0; + gap: 15px; + + .product-overview-provider { + display: inline-flex; + flex-direction: row; + font: 600 14px/20px var(--base-font); + gap: 4px; + + .product-overview-provider-name { + display: flex; + flex: 1 1 auto; + font: inherit; + } + + & > .mdi { + font-size: 20px; + line-height: 20px; + height: 20px; + display: flex; + } + } + + .product-overview-price { + white-space: nowrap; + font: 700 24px/32px var(--base-font); + } + + .product-overview-name { + font: 700 30px/42px var(--base-font); + margin: 0; + display: block; + } + + .product-prop-item-category { + display: inline-flex; + border: 1px solid var(--border-color); + padding: 5px 10px; + border-radius: 5px; + gap: 8px; + font: 600 14px/24px var(--base-font); + align-items: center; + color: #282b39; + width: fit-content; + + .mdi { + flex: 0 0 16px; + font-size: 16px; + line-height: 24px; + color: inherit; + } + } + + .product-overview-apply { + display: inline-flex; + justify-content: center; + align-items: center; + font: 400 14px/20px var(--base-font); + gap: 4px; + + .product-overview-apply-link { + display: inline-flex; + color: var(--tc-link); + font: inherit; + font-weight: 600; + gap: 2px; + cursor: pointer; + appearance: none; + background: none; + border: none; + padding: 0; + margin: 0; + line-height: inherit; + text-align: left; + + .mdi { + font-size: 15px; + line-height: 20px; + color: #dbdcdb; + } + + &:hover { + text-decoration: underline; + } + } + } + } + } + + .product-props { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 30px 40px; + padding: 40px 40px; + border-radius: min(calc(var(--border-radius) * 3), 16px); + background: #f5f5f5; + + .product-prop-item { + display: flex; + flex: 0 0 calc(50% - 25px); + flex-direction: row; + gap: 8px; + align-items: flex-start; + + .product-prop-item-icon { + display: flex; + flex-direction: row; + justify-content: center; + flex: 0 0 25px; + + .mdi { + font-size: 24px; + line-height: 28px; + color: #222222; + } + } + + .product-prop-item-details { + display: flex; + flex-direction: column; + gap: 4px; + + .product-prop-item-title { + font: 700 16px/24px var(--base-font); + color: #222222; + margin: 0; + display: block; + } + + .product-prop-item-description { + font: 500 16px/22px var(--base-font); + color: #353535; + margin: 0; + + .product-prop-item-payment-options { + display: flex; + flex-direction: row; + gap: 15px; + align-items: center; + + .product-prop-item-payment-option { + flex: 0 0 24px; + + .mdi { + font-size: 24px; + line-height: 24px; + } + + img { + display: flex; + width: 24px; + } + } + } + + .product-prop-item-payment-info { + appearance: none; + background: transparent; + border: none; + padding: 0; + cursor: pointer; + font: 600 14px/20px var(--base-font); + color: var(--tc-link); + text-align: left; + + &:hover { + text-decoration: underline; + } + } + } + } + } + } + + .product-funds-list { + display: flex; + flex-direction: column; + flex-grow: 1; + cursor: default; + + .product-funds-item { + display: flex; + flex-direction: row; + border-bottom: 1px solid var(--border-color); + align-items: flex-start; + gap: 15px; + padding: 20px 0; + + .product-funds-item-media { + display: flex; + border: 1px solid var(--border-color); + border-radius: min(var(--border-radius), 8px); + flex-direction: column; + align-items: flex-start; + overflow: hidden; + flex: 0 0 44px; + + .product-funds-item-media-img { + display: block; + width: 100%; + } + } + + .product-funds-item-content { + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 15px; + flex: 1 1 auto; + + .product-funds-item-details { + display: flex; + flex-direction: column; + flex: 1 1 auto; + margin: -2px 0; + gap: 4px; + + .product-funds-item-details-name { + font: 700 20px / 24px var(--base-font); + margin: 0; + } + + .product-funds-item-details-props { + display: flex; + flex-direction: row; + align-items: center; + gap: 14px; + + .product-funds-item-details-prop-separator { + background: #e5e5e5; + width: 1px; + height: 10px; + border-radius: 1px; + } + + .product-funds-item-details-prop { + font: 400 14px / 18px var(--base-font); + white-space: nowrap; + display: flex; + align-items: center; + color: #353535; + gap: 5px; + + .mdi { + display: flex; + line-height: 18px; + font-size: 14px; + color: #595959; + } + + &.product-funds-item-details-prop-price { + font: 700 16px/18px var(--base-font); + } + } + } + } + + .product-funds-item-actions { + display: flex; + flex-direction: column; + align-items: flex-start; + flex: 0 0 auto; + } + } + + &:first-child { + padding-top: 0; + } + + &:last-child { + padding-bottom: 0; + border-bottom: none; + } + } + } + + .product-map-container { + display: flex; + width: 100%; + height: 360px; + position: relative; + border-radius: 8px; + overflow: hidden; + border: 1px solid var(--border-color); + } + + @media (max-width: 768px) { + padding: 0 0; + gap: 20px; + margin: 0 0 20px; + + .product-overview { + flex-direction: column; + gap: 20px; + + .product-overview-media, + .product-overview-details { + flex: 1 1 100%; + } + + .product-overview-media { + gap: 15px; + + .product-overview-media-list { + .product-overview-media-items { + .product-overview-media-items-list { + gap: 4px; + } + + .product-overview-media-item { + flex: 0 0 50px; + } + } + } + } + + .product-overview-details { + gap: 10px; + + .product-overview-provider { + .block-bookmark-toggle-compact { + width: 24px; + height: 24px; + line-height: 24px; + font-size: 16px; + + .mdi { + font-size: 24px; + } + } + } + + .product-overview-name { + font: 700 22px/32px var(--base-font); + } + + .product-overview-price { + font: 700 20px/28px var(--base-font); + } + + .product-prop-item-category { + font: 600 13px/20px var(--base-font); + padding: 4px 8px; + } + } + } + + .product-props { + flex-direction: column; + padding: 20px; + gap: 20px; + + .product-prop-item { + flex: 1 1 100%; + gap: 10px; + + .product-prop-item-icon .mdi { + font-size: 20px; + } + + .product-prop-item-details { + .product-prop-item-title { + font: 700 15px/22px var(--base-font); + } + + .product-prop-item-description { + font: 500 14px/20px var(--base-font); + } + } + } + } + + .product-funds-list { + .product-funds-item { + gap: 15px; + padding: 15px 0; + + .product-funds-item-media { + flex: 0 0 auto; + width: 44px; + } + + .product-funds-item-content { + flex: 1 1 auto; + display: flex; + flex-direction: column; + + .product-funds-item-details { + gap: 10px; + + .product-funds-item-details-name { + font: 700 16px/20px var(--base-font); + } + + .product-funds-item-details-props { + flex-direction: column; + align-items: flex-start; + gap: 5px; + + .product-funds-item-details-prop-separator { + display: none; + } + + .product-funds-item-details-prop { + font: 600 13px/18px var(--base-font); + + &.product-funds-item-details-prop-price { + font: 700 16px/20px var(--base-font); + padding-bottom: 5px; + } + } + } + } + + .product-funds-item-actions { + display: flex; + flex-direction: column; + gap: 10px; + width: 100%; + + .button { + width: 100%; + } + } + } + } + } + + .product-map-container { + height: 240px; + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-showcase.scss b/react/assets/forus-webshop/scss/includes/blocks/block-showcase.scss index 6242090f9..8fa1343b3 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-showcase.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-showcase.scss @@ -4,6 +4,27 @@ cursor: default; margin: 0 0 30px; + .showcase-splash { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 420px; + overflow: hidden; + + .showcase-splash-shape { + position: absolute; + left: 50%; + bottom: 0; + width: 10000px; + height: 10000px; + transform: translate(-50%, -0); + border-radius: 50%; + background: var(--color-primary); + opacity: 0.05; + } + } + .showcase-title { font: 700 22px/36px var(--base-font); color: var(--tc); @@ -76,39 +97,101 @@ } } - .showcase-aside-block-title { - margin: 0 0; - font: 600 15px/18px var(--base-font); - } - - .showcase-aside-block-info { + .showcase-aside-group { display: flex; flex-direction: column; + gap: 10px; + padding: 0 0 12px; + border-bottom: var(--showcase-aside-border); - .showcase-aside-block-info-link { - font: 600 13px var(--base-font); - color: #282b39; + .showcase-aside-group-title { + margin: 0 0; + font: 600 15px/24px var(--base-font); display: flex; flex-direction: row; - gap: 5px; - align-items: center; - cursor: pointer; - text-decoration: underline; - .mdi { - font-size: 18px; + .showcase-aside-group-title-toggle { + all: unset; + cursor: pointer; + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.5rem; + flex: 1 1 auto; + font: inherit; + + .showcase-aside-group-title-toggle-icon { + transition: transform 0.2s ease; + + .mdi { + font-size: 18px; + height: 18px; + line-height: 18px; + display: flex; + flex: 0 0 auto; + color: #848484; + } + + &.showcase-aside-group-title-toggle-icon-open { + transform: rotate(0deg); + } + + &.showcase-aside-group-title-toggle-icon-closed { + transform: rotate(-90deg); + } + } + + &:focus { + outline: 2px solid #005fcc; + outline-offset: 2px; + } } + } - &:hover { - text-decoration: none; + .showcase-aside-group-body { + display: flex; + flex-direction: column; + gap: 10px; + + &[hidden] { + display: none; } } + + .showcase-aside-group-info { + display: flex; + flex-direction: column; + + .showcase-aside-group-info-link { + font: 600 13px var(--base-font); + color: #282b39; + display: flex; + flex-direction: row; + gap: 5px; + align-items: center; + cursor: pointer; + text-decoration: underline; + + .mdi { + font-size: 18px; + } + + &:hover { + text-decoration: none; + } + } + } + + &:last-of-type { + border-bottom: none; + padding-bottom: 0; + } } .showcase-aside-block-options { display: flex; flex-direction: column; - gap: 8px; + gap: 6px; margin: 0 -6px; .showcase-aside-block-option { @@ -118,7 +201,7 @@ background: transparent; border-radius: var(--border-radius); cursor: pointer; - align-items: center; + align-items: flex-start; gap: 8px; transition: background-color 0.4s; @@ -183,19 +266,6 @@ } } - .showcase-aside-block-separator { - display: block; - height: 10px; - padding: 10px 0; - - &:after { - content: ''; - display: block; - height: 1px; - background: var(--border-color); - } - } - .showcase-aside-tabs { display: flex; border-color: var(--color-primary); @@ -576,6 +646,15 @@ } } + &.block-showcase-narrow { + .section-product, + .section-voucher-details { + .wrapper { + width: calc(1020px + 50px); + } + } + } + @media screen and (max-width: 1300px) { .showcase-layout { .showcase-aside { @@ -619,6 +698,10 @@ position: relative; } + .showcase-splash { + display: none; + } + .showcase-mobile-filters { background: #fff; margin: 0 -20px 0; diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-transactions.scss b/react/assets/forus-webshop/scss/includes/blocks/block-transactions.scss new file mode 100644 index 000000000..611a46218 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-transactions.scss @@ -0,0 +1,106 @@ +.block.block-transactions { + display: flex; + flex-direction: column; + + .transactions-list { + display: flex; + flex-direction: column; + + .transactions-item { + border-bottom: 1px solid #d4d9dd; + padding: 12px 0; + display: flex; + align-self: flex-start; + gap: 15px; + width: 100%; + + .transactions-item-icon { + width: 36px; + height: 36px; + border-radius: 50%; + text-align: center; + line-height: 36px; + color: #000000; + display: flex; + flex: 0 0 36px; + align-items: center; + justify-content: center; + position: relative; + + .mdi { + font-size: 18px; + color: inherit; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + } + + svg { + display: block; + width: 100%; + height: 100%; + } + } + + .transactions-item-details { + display: flex; + flex-direction: column; + flex: 1 1 auto; + gap: 5px; + + .transactions-item-counterpart { + font: 700 16px/22px var(--base-font); + color: #282b39; + margin: 0 0; + + a { + color: #004d93; + font: inherit; + } + } + + .transactions-item-date { + font: 600 12px/18px var(--base-font); + color: #595959; + margin: 0 0; + } + } + + .transactions-item-amount { + text-align: right; + + .transactions-item-value { + font: 700 16px/22px var(--base-font); + color: var(--tc); + margin-bottom: 5px; + white-space: nowrap; + } + + .transactions-item-type { + font: 600 12px/18px var(--base-font); + color: var(--tc); + } + } + + &:last-child { + padding-bottom: 0; + border-bottom: none; + } + } + } + + @media screen and (max-width: 480px) { + .transactions-list { + .transactions-item { + .transactions-item-details { + gap: 10px; + + .transactions-item-counterpart { + font: 700 14px/24px var(--base-font); + } + } + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-voucher-share-options.scss b/react/assets/forus-webshop/scss/includes/blocks/block-voucher-share-options.scss new file mode 100644 index 000000000..fceb4e1ef --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-voucher-share-options.scss @@ -0,0 +1,49 @@ +.block-voucher-share-options { + display: flex; + flex-direction: row; + gap: 10px; + + .share-option { + display: flex; + flex-direction: column; + align-items: center; + gap: 12px; + padding: 20px 20px; + border: 1px solid var(--border-color); + border-radius: min(calc(var(--border-radius) * 3), 16px); + background-color: #fff; + cursor: pointer; + transition: all 0.3s ease-in-out; + font: 600 15px/24px var(--base-font); + flex: 1 1 auto; + box-shadow: none; + + .share-option-icon { + display: flex; + align-items: center; + justify-content: center; + width: 36px; + height: 36px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius); + background-color: #fbfbfb; + font-size: 24px; + line-height: 34px; + color: var(--tc); + transition: all 0.3s ease-in-out; + } + + &:hover { + background-color: var(--color-primary); + border: 1px solid var(--color-primary); + color: #fff; + box-shadow: var(--box-shadow); + + .share-option-icon { + background-color: #fff; + border-color: #fff; + color: var(--tc); + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-voucher.scss b/react/assets/forus-webshop/scss/includes/blocks/block-voucher.scss new file mode 100644 index 000000000..b8babfd03 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/blocks/block-voucher.scss @@ -0,0 +1,491 @@ +.block.block-voucher { + display: flex; + flex-direction: column; + gap: 30px; + + .voucher-fund-overview { + display: flex; + flex-direction: row; + gap: 24px; + align-items: center; + padding-top: 20px; + + .voucher-fund-overview-media { + display: flex; + flex: 0 0 100px; + border: 1px solid var(--border-color); + border-radius: min(var(--border-radius), 8px); + overflow: hidden; + + img { + display: block; + width: 100%; + } + } + + .voucher-fund-overview-content { + display: flex; + flex-direction: column; + gap: 10px; + + .voucher-fund-overview-title { + font: 700 36px/46px var(--base-font); + } + .voucher-fund-overview-description { + font: 400 16px/24px var(--base-font); + } + } + } + + .voucher-cards { + --gap: 32px; + gap: var(--gap); + display: flex; + flex-direction: row; + + .voucher-details { + display: flex; + background: #fff; + flex-direction: column; + flex: 0 0 calc(50% - calc(var(--gap) / 2)); + border-radius: min(calc(var(--border-radius) * 2), 16px); + border: 1px solid var(--border-color); + overflow: hidden; + + .voucher-details-info { + display: flex; + flex-direction: column; + padding: 24px 32px; + gap: 10px; + flex: 1 1 auto; + + .voucher-details-info-fund { + font: 700 22px/28px var(--base-font); + color: #222222; + } + + .voucher-details-info-sponsor { + font: 600 15px/20px var(--base-font); + color: #282b39; + } + + .voucher-details-info-date { + font: 500 14px/20px var(--base-font); + color: #595959; + } + + .voucher-details-info-amount { + font: 700 22px/30px var(--base-font); + color: #222222; + } + } + + .voucher-details-records { + display: flex; + flex-direction: column; + background: #fbfbfb; + padding: 32px; + border-top: 1px solid var(--border-color); + gap: 20px; + + .voucher-details-records-title { + font: 700 16px/20px var(--base-font); + color: #222222; + } + + .voucher-details-records-list { + display: flex; + flex-direction: column; + gap: 8px; + + .voucher-details-records-item { + display: flex; + flex-direction: row; + gap: 20px; + + .voucher-details-records-item-label { + display: flex; + flex: 0 0 calc(50% - 10px); + font: 500 16px/20px var(--base-font); + color: #595959; + } + + .voucher-details-records-item-value { + display: flex; + flex: 0 0 calc(50% - 10px); + font: 600 16px/20px var(--base-font); + color: #222222; + } + } + } + } + + &:last-child { + flex: 0 0 100%; + } + } + + .voucher-actions { + display: flex; + flex-direction: column; + background: var(--color-primary); + flex: 0 0 calc(50% - calc(var(--gap) / 2)); + border-radius: min(calc(var(--border-radius) * 2), 16px); + border: 1px solid var(--border-color); + padding: 25px 25px; + gap: 25px; + + .voucher-actions-qr { + display: flex; + flex: 1 1 auto; + align-items: center; + justify-content: center; + + .voucher-actions-qr-svg { + flex: 0 0 140px; + height: 140px; + width: 140px; + background-color: #fff; + border-radius: var(--border-radius); + align-items: center; + justify-content: center; + display: flex; + + svg { + zoom: 1.25; + } + + .fill-color-primary { + fill: var(--color-primary); + } + } + + .block.block-qr-code { + padding: 0 0; + + .qr_code { + border-radius: min(var(--border-radius), 8px); + padding: 10px; + width: 160px; + height: 160px; + } + } + } + + .voucher-actions-buttons { + display: flex; + flex-direction: column; + gap: 8px; + + .voucher-actions-button { + appearance: none; + border: 1px solid #dbdcdb; + background: #fff; + padding: 15px 25px; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + font: 600 16px/20px var(--base-font); + border-radius: min(var(--border-radius), 8px); + color: #282b39; + outline-offset: -2px !important; + gap: 8px; + cursor: pointer; + + .mdi { + font-size: 20px; + line-height: 20px; + } + + &:hover { + color: #535561; + } + } + } + } + } + + .voucher-help { + display: flex; + flex-direction: column; + gap: 20px; + + .voucher-help-title { + display: flex; + align-items: center; + font: 700 16px/24px var(--base-font); + color: #222222; + } + + .voucher-help-props { + display: flex; + flex-direction: column; + gap: 10px; + + .voucher-help-prop { + display: flex; + align-items: center; + gap: 10px; + + .voucher-help-prop-label { + display: flex; + font: 400 16px/24px var(--base-font); + flex: 0 0 200px; + color: #353535; + } + + .voucher-help-prop-value { + display: flex; + font: 600 16px/24px var(--base-font); + flex: 1 1 auto; + color: #353535; + + &.voucher-help-prop-value-link { + color: var(--tc-link); + text-decoration: none; + cursor: pointer; + + &:hover { + text-decoration: underline; + } + } + } + } + } + } + + .voucher-physical-cards { + display: flex; + flex-direction: column; + + .physical-card { + display: flex; + flex-direction: row; + padding: 20px 0; + border-bottom: 1px solid var(--border-color); + gap: 20px; + align-items: flex-start; + + .physical-card-media { + flex: 0 0 56px; + overflow: hidden; + + img { + display: block; + width: 100%; + border-radius: min(var(--border-radius), 8px); + border: 1px solid var(--border-color); + } + } + + .physical-card-content { + display: flex; + flex-direction: row; + flex: 1 1 auto; + align-items: flex-start; + gap: 20px; + + .physical-card-description { + display: flex; + flex-direction: column; + flex: 1 1 auto; + gap: 5px; + align-self: center; + + .physical-card-description-title { + font: 600 14px/24px var(--base-font); + margin: 0; + } + + .physical-card-description-code { + font: 700 18px/26px var(--base-font); + } + } + + .physical-card-actions { + display: flex; + } + } + + &:first-child { + padding-top: 0; + } + + &:last-child { + border-bottom: none; + padding-bottom: 0; + } + } + } + + .voucher-map-container { + display: flex; + width: 100%; + height: 360px; + position: relative; + border-radius: 8px; + overflow: hidden; + border: 1px solid var(--border-color); + } + + @media screen and (max-width: 800px) { + gap: 25px; + + .voucher-fund-overview { + align-items: flex-start; + gap: 15px; + + .voucher-fund-overview-media { + flex: 0 0 48px; + } + + .voucher-fund-overview-content { + gap: 2px; + + .voucher-fund-overview-title { + font: 700 18px/24px var(--base-font); + } + + .voucher-fund-overview-description { + font: 400 14px/22px var(--base-font); + } + } + } + + .voucher-cards { + --gap: 25px; + display: flex; + flex-direction: column-reverse; + + .voucher-details { + .voucher-details-info { + gap: 5px; + padding: 20px 20px; + + .voucher-details-info-fund { + font: 700 16px/24px var(--base-font); + } + + .voucher-details-info-sponsor { + font: 600 15px/22px var(--base-font); + } + + .voucher-details-info-date { + font: 500 14px/20px var(--base-font); + } + + .voucher-details-info-amount { + font: 700 22px/28px var(--base-font); + padding-top: 15px; + } + } + + .voucher-details-records { + padding: 20px 20px; + gap: 10px; + + .voucher-details-records-title { + font: 700 14px/18px var(--base-font); + } + + .voucher-details-records-list { + gap: 10px; + + .voucher-details-records-item { + flex-direction: column; + gap: 5px; + + .voucher-details-records-item-label { + flex: auto; + font: 500 14px/18px var(--base-font); + } + + .voucher-details-records-item-value { + flex: auto; + font: 600 14px/18px var(--base-font); + } + } + } + } + + &:last-child { + } + } + + .voucher-actions { + .voucher-actions-qr { + .voucher-actions-qr-svg { + flex: 0 0 80px; + height: 80px; + width: 80px; + + svg { + zoom: 1; + } + } + } + .voucher-actions-buttons { + .voucher-actions-button { + padding: 13px 25px; + font: 700 14px/20px var(--base-font); + + .mdi { + font-size: 18px; + } + } + } + } + } + + .voucher-help { + .voucher-help-title { + font: 700 15px/24px var(--base-font); + } + + .voucher-help-props { + gap: 20px; + + .voucher-help-prop { + flex-direction: column; + align-items: flex-start; + gap: 0; + + .voucher-help-prop-label { + flex: auto; + font: 600 14px/20px var(--base-font); + } + + .voucher-help-prop-value { + flex: auto; + font: 700 14px/20px var(--base-font); + } + } + } + } + + .voucher-physical-cards { + .physical-card { + flex-direction: column; + + .physical-card-media { + flex: 0 0 48px; + } + + .physical-card-content { + .physical-card-description { + gap: 0; + + .physical-card-description-title { + font: 400 12px/24px var(--base-font); + } + + .physical-card-description-code { + font: 700 14px/24px var(--base-font); + } + } + } + } + } + } +} diff --git a/react/assets/forus-webshop/scss/includes/blocks/product.scss b/react/assets/forus-webshop/scss/includes/blocks/product.scss deleted file mode 100644 index 1ca0dec49..000000000 --- a/react/assets/forus-webshop/scss/includes/blocks/product.scss +++ /dev/null @@ -1,384 +0,0 @@ -.block.block-product { - position: relative; - - .product-content { - display: flex; - cursor: default; - flex-direction: row; - gap: 30px; - margin: 0 0 30px; - align-items: flex-start; - - .product-photo { - display: flex; - flex: 0 0 35%; - border-radius: var(--border-radius); - border: 1px solid var(--border-color); - box-shadow: var(--box-shadow); - background-color: #fff; - overflow: hidden; - user-select: none; - pointer-events: none; - - img { - width: 100%; - display: block; - } - } - - .product-details { - display: flex; - flex: 1 1 auto; - flex-direction: column; - width: 100%; - position: relative; - background: #fff; - border-radius: var(--border-radius); - border-top-right-radius: inherit; - border-bottom-right-radius: inherit; - gap: 10px; - - .product-name, - .organization-name { - padding-right: 50px; - color: var(--product-title-color); - margin: 0 0; - } - - .product-name { - font: var(--product-title-font); - word-wrap: break-word; - hyphens: auto; - } - - .organization-name { - font: 700 14px/24px var(--base-font); - margin: 0 0 10px; - } - - .product-properties { - display: flex; - flex-direction: column; - padding: 0 0 20px; - margin: 0 0 20px; - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - gap: 20px; - - .product-property { - min-width: 250px; - display: flex; - flex-direction: column; - gap: 10px; - - .product-property-label { - display: flex; - font: 600 12px/16px var(--base-font); - color: #646f79; - margin: 0 0; - } - - .product-property-value { - margin: 0; - color: #282b39; - font: 600 16px/18px var(--base-font); - - p:last-child { - margin-bottom: 0; - } - } - - .product-property-icons { - display: flex; - flex-direction: row; - - .product-property-icons-item { - display: flex; - flex-direction: row; - gap: 8px; - font: 600 14px/18px var(--base-font); - align-items: center; - flex: 0 0 calc(100% / 3); - padding-right: 20px; - - .mdi { - font-size: 24px; - line-height: 24px; - } - - img { - display: block; - width: 24px; - height: 24px; - } - } - } - - .product-property-info-link { - background: none; - border: none; - padding: 0; - margin: 0; - appearance: none; - color: inherit; - display: inline-flex; - width: fit-content; - font: 600 13px/18px var(--base-font); - text-decoration: underline; - align-items: center; - cursor: pointer; - gap: 4px; - - .mdi { - font-size: 16px; - } - - &:hover { - text-decoration: none; - } - } - - } - - &:last-child { - border-bottom: none; - margin: 0; - padding: 0; - } - } - } - - .block-bookmark-toggle { - position: absolute; - top: 0; - right: 0; - } - } - - .product-funds-list { - display: flex; - flex-direction: column; - flex-grow: 1; - cursor: default; - - .fund-item { - display: flex; - flex-direction: row; - border-bottom: 1px solid var(--border-color); - border-radius: var(--border-radius); - - .fund-item-section { - border-right: 1px solid var(--border-color); - padding: 15px 25px; - min-width: 175px; - display: flex; - flex-direction: column; - - .button { - display: inline-flex; - justify-content: center; - } - - .fund-item-section-label { - display: flex; - font: 700 12px/20px var(--base-font); - color: #646f79; - justify-content: flex-end; - } - - .flex-start { - justify-content: flex-start; - } - - .fund-item-section-value { - display: flex; - font: 700 22px/30px var(--base-font); - justify-content: flex-end; - - &.fund-item-section-value-sm { - font: 700 16px/30px var(--base-font); - } - } - - &.fund-item-section-details { - padding-left: 0; - display: flex; - flex-direction: row; - flex-grow: 1; - border-right: 1px solid var(--border-color); - border-right: 0; - - .fund-item-media { - width: 80px; - padding: 0 15px; - - .fund-item-media-img { - width: 100%; - display: block; - border-radius: var(--border-radius); - } - } - - .fund-item-content { - display: flex; - flex-direction: column; - - .fund-item-title { - font: 700 18px/25px var(--base-font); - color: #303030; - } - - .fund-item-subtitle { - font: 400 14px/25px var(--base-font); - color: #303030; - } - } - } - - &:last-child { - border-right: 0; - min-width: 270px; - } - } - - &:last-child { - border-bottom: 0; - } - } - } - - .block.block-organizations { - .organization-item { - .organization-pane { - box-shadow: var(--box-shadow); - } - - .organization-offices { - .block.block-offices { - box-shadow: var(--box-shadow); - } - } - } - } - - @media screen and (max-width: 1200px) { - .product-funds-list { - .fund-item { - .fund-item-section { - padding: 10px; - - .fund-item-section-value { - &.fund-item-section-value-sm { - font: 700 14px/32px var(--base-font); - } - } - } - } - } - } - - @media screen and (max-width: 1000px) { - .product-content { - flex-direction: column; - - .product-photo { - flex: 0 0 auto; - } - - .product-details { - .product-properties { - flex-direction: column; - - .product-property { - width: 100%; - display: flex; - flex-direction: column; - margin: 0 0 10px; - - &:last-child { - margin-bottom: 0; - } - } - } - - .product-name { - font: 600 18px/28px var(--heading-font-family); - } - - .organization-name { - word-wrap: break-word; - } - - .product-properties { - .product-property { - .product-property-icons { - flex-direction: column; - gap: 15px; - justify-content: flex-start; - } - } - } - } - } - - .product-funds-list { - .fund-item { - flex-direction: column; - - .fund-item-section { - padding: 15px; - border: none; - display: flex; - flex-direction: row; - border-bottom: 1px solid var(--border-color); - - .button { - width: 100%; - } - .fund-item-section-label, - .fund-item-section-value { - width: 50%; - flex-direction: column; - justify-content: flex-start; - } - - .fund-item-content { - .fund-item-section-value { - width: 100%; - } - } - - .fund-item-section-label { - text-align: left; - align-items: flex-start; - flex-direction: row; - } - - .fund-item-section-value { - text-align: right; - align-items: flex-end; - font-size: 13px; - line-height: 20px; - - &.fund-item-section-value-sm { - font-size: 13px; - line-height: 20px; - } - } - - &.fund-item-section-details { - padding: 15px; - - .fund-item-media { - padding-left: 0; - width: 65px; - } - } - - &:last-child { - border-bottom: 0; - } - } - } - } - } -} diff --git a/react/assets/forus-webshop/scss/includes/blocks/transactions.scss b/react/assets/forus-webshop/scss/includes/blocks/transactions.scss deleted file mode 100644 index d66ba1a1a..000000000 --- a/react/assets/forus-webshop/scss/includes/blocks/transactions.scss +++ /dev/null @@ -1,190 +0,0 @@ -.block.block-transactions { - border: 1px solid var(--border-color); - border-radius: var(--border-radius); - box-shadow: var(--box-shadow); - background: #fff; - - .transactions-header { - display: flex; - align-items: center; - border-top-left-radius: inherit; - border-top-right-radius: inherit; - padding: 25px; - border-bottom: 1px solid #d4d9dd; - - .transactions-title { - color: #282b39; - font: 700 22px/24px var(--base-font); - margin: 0 5px 0 0; - } - } - - .transactions-body { - border-bottom-left-radius: inherit; - border-bottom-right-radius: inherit; - position: relative; - } - - .transactions-list { - .transactions-item { - border-bottom: 1px solid #d4d9dd; - padding: 20px; - display: flex; - @include cf(); - - .transactions-item-icon { - background: #ededed; - width: 35px; - height: 35px; - border-radius: 35px; - text-align: center; - line-height: 35px; - margin: 5px 15px 5px 0; - color: #000000; - - .mdi { - font-size: 18px; - color: inherit; - } - } - - .transactions-item-details { - flex-grow: 1; - - .transactions-item-empty { - font: 400 16px var(--base-font); - text-align: center; - color: #282b39; - margin-bottom: 5px; - } - - .transactions-item-counterpart { - font: 700 16px var(--base-font); - color: #282b39; - margin-bottom: 5px; - - a { - color: #004d93; - font: 700 16px var(--base-font); - } - } - - .transactions-item-date { - font: 400 13px var(--base-font); - color: #646f79; - } - } - - .transactions-item-amount { - text-align: right; - padding-left: 15px; - - .transactions-item-value { - font: 700 16px var(--base-font); - color: var(--tc); - margin-bottom: 5px; - white-space: nowrap; - } - - .transactions-item-type { - font: 400 13px var(--base-font); - color: var(--tc); - } - } - - &:last-child { - border-bottom: 0; - } - } - } - - @media screen and (max-width: 1700px) { - .transactions-header { - padding: 15px 25px; - - .transactions-title { - font: 700 16px/22px var(--base-font); - } - } - - .transactions-list { - .transactions-item { - padding: 15px 20px; - - .transactions-item-icon { - margin: 0 15px 0 0; - } - - .transactions-item-details { - .transactions-item-counterpart { - font: 700 14px/20px var(--base-font); - margin: 0; - } - - .transactions-item-date { - font: 400 12px/15px var(--base-font); - margin: 0; - } - } - - .transactions-item-amount { - .transactions-item-value { - font: 700 14px/20px var(--base-font); - margin: 0; - } - - .transactions-item-type { - font: 400 12px/15px var(--base-font); - margin: 0; - } - } - } - } - } - - @media screen and (max-width: 1000px) { - margin-bottom: 30px; - border: 1px solid #ddecff; - - .transactions-header { - padding: 15px 20px; - border-color: #ddecff; - - .transactions-title { - font: 700 14px var(--base-font); - } - } - - .transactions-list { - .transactions-item { - padding: 10px 15px; - border-color: #ddecff; - - .transactions-item-icon { - width: 30px; - height: 30px; - min-width: 30px; - line-height: 30px; - margin-right: 10px; - } - - .transactions-item-details { - .transactions-item-counterpart { - padding: 4px 0; - font: 700 12px/16px var(--base-font); - margin-bottom: 0; - } - - .transactions-item-date { - font: 400 10px/14px var(--base-font); - } - } - - &.transactions-item-out .transactions-item-amount .transactions-item-value, - &.transactions-item-out .transactions-item-amount .transactions-item-type { - font-size: 14px; - } - } - } - } -} diff --git a/react/assets/forus-webshop/scss/includes/blocks/voucher-product.scss b/react/assets/forus-webshop/scss/includes/blocks/voucher-product.scss deleted file mode 100644 index ac34258fb..000000000 --- a/react/assets/forus-webshop/scss/includes/blocks/voucher-product.scss +++ /dev/null @@ -1,111 +0,0 @@ -.block { - &.block-voucher-product { - position: relative; - z-index: 1; - - .product-card { - background-color: #fff; - border-radius: var(--border-radius); - margin-bottom: 30px; - box-shadow: var(--box-shadow); - height: 150px; - cursor: default; - position: relative; - display: block; - overflow: hidden; - @include cf(); - - .product-photo { - width: 200px; - float: left; - - img { - width: 100%; - height: 100%; - } - } - - .product-details { - float: left; - padding: 35px 30px 45px; - - .product-name { - color: #00122a; - font: 700 26px/30px var(--base-font); - margin-bottom: 10px; - - .label { - margin-top: 6px; - float: right; - margin-left: 10px; - } - } - - .product-price { - vertical-align: middle; - @include cf(); - - .product-price-new { - font: 700 24px/30px var(--base-font); - color: #151b26; - float: left; - margin-right: 4px; - } - - .product-price-old { - font: 400 18px/26px var(--base-font); - color: #646f79; - text-decoration: line-through; - float: left; - padding-top: 4px; - } - } - } - } - } - @media screen and (max-width: 1000px) { - &.block-voucher-product { - .product-card { - height: auto; - border-radius: 10px; - - .product-photo { - width: 100%; - max-width: 100%; - height: 200px; - border-top-right-radius: inherit; - border-bottom-left-radius: 0; - - img { - border-top-right-radius: inherit; - } - - } - .product-details { - padding: 25px; - width: 100%; - - .product-name { - margin: 0 0 20px; - display: inline-block; - color: var(--bc); - } - - .product-price { - margin: 0 0 15px; - - .product-price-new { - font: 700 20px/20px var(--base-font); - margin: 0 0 0; - width: 100%; - } - - .product-price-old { - font: 400 15px/15px var(--base-font); - } - } - } - } - } - } -} \ No newline at end of file diff --git a/react/assets/forus-webshop/scss/includes/blocks/voucher.scss b/react/assets/forus-webshop/scss/includes/blocks/voucher.scss deleted file mode 100644 index 44317cb88..000000000 --- a/react/assets/forus-webshop/scss/includes/blocks/voucher.scss +++ /dev/null @@ -1,693 +0,0 @@ -.block.block-voucher { - position: relative; - display: flex; - margin-bottom: 30px; - - .base-card { - background-color: #fff; - border-radius: var(--border-radius); - box-shadow: var(--box-shadow); - cursor: default; - position: relative; - overflow: hidden; - flex-direction: row; - display: flex; - min-height: 200px; - @include cf(); - - .label { - margin-bottom: 10px; - border-radius: 5px; - padding: 0 10px; - } - - .card-inner { - flex-direction: column; - flex: 1; - display: flex; - min-height: 200px; - } - - .card-actions { - display: flex; - flex: 1; - - .action-col { - flex-grow: 1; - display: flex; - flex-direction: row; - justify-content: center; - - .action-item { - cursor: pointer; - flex-direction: column; - text-align: center; - display: inline-flex; - color: var(--bc); - align-items: center; - - .action-item-icon { - width: 40px; - height: 40px; - line-height: 40px; - text-align: center; - text-transform: inherit; - background: var(--voucher-card-action-background); - border: 1px solid var(--voucher-card-action-border-color); - border-radius: var(--voucher-card-action-border-radius); - color: var(--voucher-card-action-color); - font-size: 20px; - transition: - background 0.4s, - border 0.4s, - color 0.4s; - cursor: pointer; - position: relative; - margin-bottom: 7.5px; - - .action-item-tooltip { - opacity: 0; - user-select: none; - visibility: hidden; - position: absolute; - background: #fff; - border: 1px solid #dbdcdb; - padding: 4px 10px; - font: 600 13px/20px var(--base-font); - color: var(--bc); - border-radius: 5px; - white-space: nowrap; - top: 100%; - margin-top: 5px; - left: 50%; - transform: translate3d(-50%, 0, 0) scale3d(0, 0, 0); - box-shadow: 2px 5px 35px rgba(0, 0, 0, 0.15); - transition: - opacity 0.4s, - transform 0.4s, - visibility 0.4s; - - &:after { - left: 50%; - position: absolute; - display: block; - content: ''; - @extend .triangle; - bottom: 100%; - border-color: transparent transparent #fff transparent; - transform: translate3d(-50%, 4px, 0); - } - } - } - - .action-item-name { - color: #000; - font: 600 12px var(--base-font); - transition: color 0.4s; - margin: 0 3px; - } - - &:last-child { - margin-right: 0; - } - - &:hover { - .action-item-icon { - background: var(--voucher-card-action-hover-background); - border: 1px solid var(--voucher-card-action-hover-border-color); - border-color: var(--voucher-card-action-hover-border-radius); - color: var(--voucher-card-action-hover-color); - - .action-item-tooltip { - opacity: 1; - visibility: visible; - transform: translate3d(-50%, 0, 0) scale3d(1, 1, 1); - } - } - } - } - - &.card-actions-center { - justify-content: center; - } - } - } - - .card-label { - color: var(--tc); - font: 400 14px/16px var(--base-font); - - a { - color: #646f79; - text-decoration: underline; - } - } - - .block-link { - font: 600 13px/22px var(--base-font); - color: var(--color-default); - display: inline-block; - - .mdi { - color: var(--color-default); - font-size: 1.3em; - float: right; - margin-left: 5px; - transition: margin-right 0.4s; - line-height: 22px; - } - - &:hover { - .mdi { - margin-left: 10px; - } - } - } - - .card-value { - font: 700 14px/16px var(--base-font); - color: var(--tc); - margin-top: 10px; - - &.card-value-sm { - font-weight: 400; - font-size: 14px; - } - - &:last-child { - margin-bottom: 10px; - } - } - - .card-value.euro { - font-size: 25px; - } - - .card-label.euro { - font-size: 15px; - } - - .card-qr_code { - width: 200px; - padding: 15px 15px; - background: #efefef; - text-align: center; - - img, - canvas { - display: block; - width: 150px; - margin-bottom: 20px; - padding: 5px; - background: #fff; - border-radius: 5px; - box-shadow: 0 2px 20px rgba(0, 0, 0, 0.05); - } - - .card-qr_code-desc { - color: #272525; - font: 500 12px var(--base-font); - margin: 0 -10px 10px -10px; - } - } - - .card-body { - position: relative; - background: #fff; - display: flex; - - .card-photo { - padding: 20px 0 20px 20px; - - img { - width: 100px; - display: block; - border-radius: 5px; - } - } - - .card-section { - padding: 20px; - flex: 1; - } - - .card-title { - color: #272525; - font: 700 16px var(--base-font); - margin: 0 0 5px; - } - - .card-subtitle { - color: #272525; - font: 500 14px var(--base-font); - margin: 0 0 5px; - } - - .card-description { - font: 400 13px/18px var(--base-font); - color: #272525; - } - - .card-price { - color: #646f79; - font: 400 16px var(--base-font); - - strong { - color: #083f49; - font: 700 24px var(--base-font); - } - } - } - - .card-footer { - width: 100%; - height: 100%; - background: #fcfcfc; - padding: 20px 25px; - border-top: 1px solid var(--border-color); - position: relative; - display: flex; - flex-direction: column; - } - - &.base-card-sponsor { - border: 1px solid var(--border-color); - width: 38%; - } - - &.base-card-voucher { - width: 62%; - margin-right: 30px; - border: 1px solid var(--border-color); - - .block-qr-code { - width: 100%; - padding-bottom: 10px; - - .qr_code { - width: 100px; - height: 100px; - padding: 0; - background: unset; - margin: auto; - border-radius: 0; - box-shadow: unset; - - img, - canvas { - display: block; - width: 100%; - } - } - } - - .card-body { - .card-title { - font: 600 24px var(--base-font); - color: #272525; - margin-bottom: 10px; - } - } - } - } - - &.block-voucher-regular { - .base-card { - &.base-card-sponsor { - width: 50%; - margin-left: 15px; - } - - &.base-card-voucher { - width: 50%; - margin-right: 15px; - } - } - } - - &.block-voucher-combined { - .base-card { - &.base-card-voucher { - width: 100%; - margin-right: 0; - - .card-footer { - .card-section { - margin-bottom: 20px; - - .card-title { - margin: 0 0 10px; - font: 600 15px/22px var(--base-font); - } - - .card-description { - font: 400 14px/20px var(--base-font); - - .card-description-link { - font: 400 14px/20px var(--base-font); - color: #0000cd; - text-decoration: underline; - - &:hover { - text-decoration: none; - } - } - } - } - } - } - } - } - - &:last-child { - margin-bottom: 0; - } - - @media screen and (max-width: 1700px) { - .base-card { - .label { - margin-bottom: 5px; - font-size: 11px; - line-height: 20px; - } - - .card-label { - font: 400 14px/16px var(--base-font); - } - - .card-value { - font: 700 16px var(--base-font); - - &.card-value-sm { - font-weight: 400; - } - } - - .card-body { - .card-photo { - img { - width: 100px; - } - } - - .card-read_more { - font: 600 12px/18px var(--base-font); - } - - .card-description { - font-size: 14px; - } - } - - .card-actions { - .action-item { - margin-right: 15px; - } - } - - &.base-card-voucher { - .card-body { - .card-title { - font: 700 24px var(--base-font); - } - } - } - } - - .card-inner { - min-height: 300px; - } - } - - @media screen and (max-width: 1000px) { - flex-direction: column; - margin: auto; - width: 100%; - - .base-card { - overflow: visible; - box-shadow: 2px 2px 20px rgba($color: #000000, $alpha: 0.05); - border-top-left-radius: 8px; - border-top-right-radius: 8px; - width: 100%; - margin-left: 0; - - .card-inner { - text-align: center; - } - - .card-label { - font: 600 10px/16px var(--base-font); - margin: 0 0 5px; - color: #646f79; - text-transform: uppercase; - - &.euro { - font-size: 10px; - margin: 0; - } - } - - .card-value { - color: #282b39; - font: 700 16px/24px var(--base-font); - margin: 0 0 15px; - - &.card-value-sm { - font: 400 12px var(--base-font); - color: #134478; - - strong { - display: block; - font: 700 15px var(--base-font); - color: #282b39; - } - } - - &.euro { - font-size: 20px; - } - } - - .card-qr_code { - width: 100%; - background: #fff; - border: 1px solid #ddecff; - border-bottom: 0; - - img { - margin: 0 auto 20px; - background: #fff; - padding: 10px; - border-radius: 5px; - width: 200px; - max-width: 100%; - box-shadow: 5px 5px 20px rgba($color: #000000, $alpha: 0.1); - } - } - - .card-body { - flex-direction: column; - padding-top: 30px; - border: 1px solid #ddecff; - border-bottom: 0; - border-top-left-radius: 6px; - border-top-right-radius: 6px; - min-height: auto; - - .card-photo { - padding: 0; - position: absolute; - top: 0; - left: 50%; - transform: translate(-50%, -50%); - background: #fff; - border-radius: 60px; - - img { - margin: auto; - width: 60px; - max-width: 100%; - border-radius: 60px; - box-shadow: 2px 3px 20px rgba($color: #000000, $alpha: 0.1); - background: #fff; - } - } - - .card-section { - width: auto; - max-width: 100%; - margin: 0 auto; - } - - .card-title { - font: 700 17.5px var(--base-font); - color: #00122a; - } - - .card-description { - font: 400 12px/18px var(--base-font); - color: #00122a; - } - } - - .card-footer { - border: 1px solid #ddecff; - border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; - min-height: auto; - } - - &.base-card-sponsor, - &.base-card-voucher { - width: 100%; - margin: 0 0 30px; - flex-direction: column-reverse; - } - - &.base-card-voucher { - margin: 0 0 30px 0; - - .card-body { - padding: 0; - flex-direction: column-reverse; - - .card-qr_code { - width: 100%; - padding: 20px; - border: none; - background: linear-gradient(to right, #eff0ef, #fefefe); - - .card-qr_code-desc { - font: 400 12px/16px var(--base-font); - } - - .qr_code { - width: 140px; - height: 140px; - - img, - canvas { - border-radius: 0; - padding: 0; - box-shadow: none; - margin: 0 0 10px; - width: 100%; - } - } - } - - .card-photo { - display: none; - } - - .label { - margin-bottom: 10px; - } - - .card-title { - margin: 0 0 5px; - font: 700 14px var(--base-font); - } - - .card-section { - text-align: center; - } - } - - .card-footer { - padding: 15px; - flex-direction: column; - justify-content: center; - justify-items: center; - - .card-section { - margin: 0; - width: auto; - justify-content: center; - } - - .card-actions { - margin: 0; - flex-flow: column; - flex-grow: 1; - max-width: 100%; - - .action-col { - width: 100%; - margin: 0 0 10px; - - .action-item { - background: #f4f5f7; - border-radius: 20px; - padding: 10px; - text-align: center; - display: flex; - justify-content: flex-start; - flex-direction: unset; - width: 100%; - - .action-item-icon { - background-color: unset; - width: 30px; - height: 30px; - line-height: 30px; - border-radius: 40px; - margin: 0 10px 0 0; - } - - &:hover { - .action-item-icon { - color: #fff; - background-color: #000; - } - } - } - - &:last-child { - margin-bottom: 0; - } - } - } - } - - .card-inner:first-child { - .card-body { - border-top-left-radius: 0; - border-top-right-radius: 0; - } - } - } - } - - &.block-voucher-regular { - .base-card { - &.base-card-sponsor, - &.base-card-voucher { - width: 100%; - margin: 0 0 30px; - flex-direction: column-reverse; - } - } - } - - &.block-voucher-combined { - .base-card { - &.base-card-voucher { - .card-footer { - .card-section { - .card-title { - margin: 0 0 5px; - font: 600 12px/18px var(--base-font); - } - - .card-description { - font: 400 12px/16px var(--base-font); - } - } - } - } - } - } - } -} diff --git a/react/assets/forus-webshop/scss/includes/blocks/vouchers.scss b/react/assets/forus-webshop/scss/includes/blocks/vouchers.scss index c8d06c746..56f5fa024 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/vouchers.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/vouchers.scss @@ -110,7 +110,6 @@ align-items: center; .voucher-overview-items { - margin-bottom: 10px; float: left; position: absolute; bottom: 15px; diff --git a/react/assets/forus-webshop/scss/includes/fonts/lato.scss b/react/assets/forus-webshop/scss/includes/fonts/lato.scss new file mode 100644 index 000000000..c85a71123 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/fonts/lato.scss @@ -0,0 +1,44 @@ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: + url('./assets/fonts/lato/Lato-Regular.woff2') format('woff2'), + url('./assets/fonts/lato/Lato-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Lato'; + font-style: italic; + font-weight: 400; + src: + url('./assets/fonts/lato/Lato-Italic.woff2') format('woff2'), + url('./assets/fonts/lato/Lato-Italic.ttf') format('truetype'); +} + +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 500; + src: + url('./assets/fonts/lato/Lato-Medium.woff2') format('woff2'), + url('./assets/fonts/lato/Lato-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 600; + src: + url('./assets/fonts/lato/Lato-SemiBold.woff2') format('woff2'), + url('./assets/fonts/lato/Lato-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 700; + src: + url('./assets/fonts/lato/Lato-Bold.woff2') format('woff2'), + url('./assets/fonts/lato/Lato-Bold.ttf') format('truetype'); +} diff --git a/react/assets/forus-webshop/scss/includes/fonts/montserrat.scss b/react/assets/forus-webshop/scss/includes/fonts/montserrat.scss new file mode 100644 index 000000000..c6f983d1b --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/fonts/montserrat.scss @@ -0,0 +1,35 @@ +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + src: + url('./assets/fonts/montserrat/Montserrat-Regular.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 500; + src: + url('./assets/fonts/montserrat/Montserrat-Medium.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 600; + src: + url('./assets/fonts/montserrat/Montserrat-SemiBold.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 700; + src: + url('./assets/fonts/montserrat/Montserrat-Bold.woff2') format('woff2'), + url('./assets/fonts/montserrat/Montserrat-Bold.ttf') format('truetype'); +} diff --git a/react/assets/forus-webshop/scss/includes/fonts/open-sans.scss b/react/assets/forus-webshop/scss/includes/fonts/open-sans.scss new file mode 100644 index 000000000..2e6fc3e70 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/fonts/open-sans.scss @@ -0,0 +1,44 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: + url('./assets/fonts/open-sans/OpenSans-Regular.woff2') format('woff2'), + url('./assets/fonts/open-sans/OpenSans-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: + url('./assets/fonts/open-sans/OpenSans-Italic.woff2') format('woff2'), + url('./assets/fonts/open-sans/OpenSans-Italic.ttf') format('truetype'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 500; + src: + url('./assets/fonts/open-sans/OpenSans-Medium.woff2') format('woff2'), + url('./assets/fonts/open-sans/OpenSans-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: + url('./assets/fonts/open-sans/OpenSans-SemiBold.woff2') format('woff2'), + url('./assets/fonts/open-sans/OpenSans-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: + url('./assets/fonts/open-sans/OpenSans-Bold.woff2') format('woff2'), + url('./assets/fonts/open-sans/OpenSans-Bold.ttf') format('truetype'); +} diff --git a/react/assets/forus-webshop/scss/includes/fonts/roboto.scss b/react/assets/forus-webshop/scss/includes/fonts/roboto.scss new file mode 100644 index 000000000..e5e031426 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/fonts/roboto.scss @@ -0,0 +1,44 @@ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: + url('./assets/fonts/roboto/Roboto-Regular.woff2') format('woff2'), + url('./assets/fonts/roboto/Roboto-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: + url('./assets/fonts/roboto/Roboto-Italic.woff2') format('woff2'), + url('./assets/fonts/roboto/Roboto-Italic.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: + url('./assets/fonts/roboto/Roboto-Medium.woff2') format('woff2'), + url('./assets/fonts/roboto/Roboto-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 600; + src: + url('./assets/fonts/roboto/Roboto-SemiBold.woff2') format('woff2'), + url('./assets/fonts/roboto/Roboto-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: + url('./assets/fonts/roboto/Roboto-Bold.woff2') format('woff2'), + url('./assets/fonts/roboto/Roboto-Bold.ttf') format('truetype'); +} diff --git a/react/assets/forus-webshop/scss/includes/fonts/source-sans-pro.scss b/react/assets/forus-webshop/scss/includes/fonts/source-sans-pro.scss new file mode 100644 index 000000000..0173a7a8f --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/fonts/source-sans-pro.scss @@ -0,0 +1,44 @@ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: + url('./assets/fonts/source-sans-pro/SourceSans3-Regular.woff2') format('woff2'), + url('./assets/fonts/source-sans-pro/SourceSans3-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: italic; + font-weight: 400; + src: + url('./assets/fonts/source-sans-pro/SourceSans3-It.woff2') format('woff2'), + url('./assets/fonts/source-sans-pro/SourceSans3-It.ttf') format('truetype'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 500; + src: + url('./assets/fonts/source-sans-pro/SourceSans3-Medium.woff2') format('woff2'), + url('./assets/fonts/source-sans-pro/SourceSans3-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + src: + url('./assets/fonts/source-sans-pro/SourceSans3-SemiBold.woff2') format('woff2'), + url('./assets/fonts/source-sans-pro/SourceSans3-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 700; + src: + url('./assets/fonts/source-sans-pro/SourceSans3-Bold.woff2') format('woff2'), + url('./assets/fonts/source-sans-pro/SourceSans3-Bold.ttf') format('truetype'); +} diff --git a/react/assets/forus-webshop/scss/includes/includes/helpers.scss b/react/assets/forus-webshop/scss/includes/includes/helpers.scss index 334bf9c4b..e72100ac6 100644 --- a/react/assets/forus-webshop/scss/includes/includes/helpers.scss +++ b/react/assets/forus-webshop/scss/includes/includes/helpers.scss @@ -57,6 +57,25 @@ @include webkit_scrollbar($color); } + +@mixin webkit_scrollbar_horizontal($thumbColor: var(--color-primary), $trackColor: #f1f1f1) { + &::-webkit-scrollbar { + height: 6px; + } + + &::-webkit-scrollbar-track { + background: $trackColor; + } + + &::-webkit-scrollbar-thumb { + border-radius: 3px; + background-color: $thumbColor; + background-clip: padding-box; + box-shadow: inset -1px -1px 0 rgba(0, 0, 0, 0.05), inset 1px 1px 0 rgba(0, 0, 0, 0.05); + } +} + + @mixin anim_blink() { animation: blink 1.5s ease-in-out infinite; diff --git a/react/assets/forus-webshop/scss/includes/includes/shame.scss b/react/assets/forus-webshop/scss/includes/includes/shame.scss index f5aa2e1f6..0d372475a 100644 --- a/react/assets/forus-webshop/scss/includes/includes/shame.scss +++ b/react/assets/forus-webshop/scss/includes/includes/shame.scss @@ -123,10 +123,6 @@ body { font-size: 24px !important; } } - - .section-voucher-details { - margin-top: 25px; - } } @media screen and (max-width: 1500px) { diff --git a/react/assets/forus-webshop/scss/includes/modals/modal-precheck-answer-check.scss b/react/assets/forus-webshop/scss/includes/modals/modal-precheck-answer-check.scss new file mode 100644 index 000000000..687d5a765 --- /dev/null +++ b/react/assets/forus-webshop/scss/includes/modals/modal-precheck-answer-check.scss @@ -0,0 +1,28 @@ +.modal.modal-precheck-answer-check { + .modal-window { + + .modal-header.modal-answer-check-header { + font: 700 18px/25px var(--base-font); + } + + .modal-body { + .modal-section.modal-precheck-answer-check-section { + width: max-content; + align-self: center; + + .modal-answer-check-description { + font: 500 16px/20px var(--base-font); + padding-inline: 20px; + text-align: left; + } + + .modal-answer-check-list { + display: flex; + flex-direction: column; + padding-block: 10px; + padding-inline: 20px; + } + } + } + } +} \ No newline at end of file diff --git a/react/assets/forus-webshop/scss/style-webshop-berg_en_dal-vars.scss b/react/assets/forus-webshop/scss/style-webshop-berg_en_dal-vars.scss index 13b24a493..d069375b4 100644 --- a/react/assets/forus-webshop/scss/style-webshop-berg_en_dal-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-berg_en_dal-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400&display=swap'); +@import "./includes/fonts/open-sans"; // do not use these scss variables outside this file $primaryColor: #15694B; diff --git a/react/assets/forus-webshop/scss/style-webshop-berkelland-vars.scss b/react/assets/forus-webshop/scss/style-webshop-berkelland-vars.scss index 4a921cfb7..b522fe046 100644 --- a/react/assets/forus-webshop/scss/style-webshop-berkelland-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-berkelland-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700'); +@import "./includes/fonts/source-sans-pro"; /*========== Style Sheet - Vars ==========*/ $primaryColor: #041c37; diff --git a/react/assets/forus-webshop/scss/style-webshop-ede-vars.scss b/react/assets/forus-webshop/scss/style-webshop-ede-vars.scss index ffa8fb0e1..c9720aa2f 100644 --- a/react/assets/forus-webshop/scss/style-webshop-ede-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-ede-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Open+Sans"); +@import "./includes/fonts/open-sans"; /*========== Style Sheet - Vars ==========*/ $primaryColor: #3558a2; diff --git a/react/assets/forus-webshop/scss/style-webshop-eemsdelta-vars.scss b/react/assets/forus-webshop/scss/style-webshop-eemsdelta-vars.scss index b5fc4aceb..da485b297 100644 --- a/react/assets/forus-webshop/scss/style-webshop-eemsdelta-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-eemsdelta-vars.scss @@ -1,5 +1,4 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css?family=Verdana'); /*========== Style Sheet - Vars ==========*/ $primaryColor: #0d4379; diff --git a/react/assets/forus-webshop/scss/style-webshop-fijnder-vars.scss b/react/assets/forus-webshop/scss/style-webshop-fijnder-vars.scss new file mode 100644 index 000000000..da2ed01c4 --- /dev/null +++ b/react/assets/forus-webshop/scss/style-webshop-fijnder-vars.scss @@ -0,0 +1,380 @@ +@import "./includes/fonts/open-sans"; + +// do not use these scss variables outside this file +$primaryColor: #E6494F; +$primaryColorLight: #4D5971; + +:root { + --zoom: 100%; + --zoom-mobile: 100%; + + --border-color: #dddddd; + --border-radius: 8px; + --box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.05); + + --color-primary: #{$primaryColor}; + --color-primary-light: #{$primaryColorLight}; + + --color-default: #305dfb; + --color-default-light: #4c74ff; + + --color-danger: #e63b3b; + + // navbar + --navbar-box-shadow: none; + + --navbar-menu-gap: 22px; + --navbar-menu-order: 1; + --navbar-menu-background: #ffffff; + + --navbar-search-gap: 20px; + --navbar-search-order: 2; + --navbar-search-padding: 20px 0px; + --navbar-search-background: #ffffff; + --navbar-search-border-bottom: 1px solid var(--border-color); + + --navbar-menu-item-font: 400 18px/21px var(--base-font); + --navbar-menu-item-color: #282b39; + --navbar-menu-item-color-hover: #4D5971; + --navbar-menu-item-padding: 16px 0; + --navbar-menu-item-background: transparent; + --navbar-menu-item-background-hover: transparent; + + --navbar-menu-separator-opacity: 0.25; + --navbar-menu-separator-background: var(--navbar-menu-item-color); + + --navbar-auth-font: 600 16px/20px var(--base-font); + + --navbar-logo-height: 50px; + + // Nav item line position + --navbar-menu-item-line-position-top: 0; + --navbar-menu-item-line-position-bottom: auto; + + // wrapper + --wrapper-width: calc(1280px + 50px); + --wrapper-padding: 20px; + + // Outline + --focus-outline: 2px solid #315efd; + --focus-outline-offset: 2px; + --focus-box-shadow: 0 0 0 3px white; + + // navbar (auth) (default button) + --tc-auth-menu: #305dfb; + --tc-auth-btn: #fff; + --btn-auth-bg: #E6494F; + --btn-auth-border: #E6494F; + --auth-avater-bg: #305dfb; + --auth-avater-svg: #fff; + + // navbar (start modal primary) + --tc-start-btn: #fff; + --btn-start-bg: #4D5971; + --btn-start-btn: #305dfb; + --btn-start-border: transparent; + + // header background + --bg-values: url('../img/splash-top-b.png') no-repeat 100% 0; + + // Header banner + --header-banner-pane-banner-padding: 50px 0; + --header-banner-pane-banner-max-width: 650px; + --header-banner-pane-banner-background: transparent; + --header-banner-pane-banner-border-color: initial; + --header-banner-pane-banner-border-radius: initial; + + // base font + --base-font: 'Open Sans', arial, sans-serif; + + // text color + --tc: #282b39; + --htc: var(--tc); + --tc-var: inherit; + --tc-link: #004d93; + --tc-muted: #595959; + + // heading font + --heading-font-family: var(--base-font); + --heading-font: 700 40px/60px var(--heading-font-family); + --heading-color: var(--tc); + --heading-pane-font: 700 22px/30px var(--heading-font-family); + + // base color + --bc: #d13b3b; + + // background color + --body-background: #fff; + + // footer color + --footer_padding: 0; + --footer_background: transparent; + --footer_color: #353535; + --footer_color_link: #282B39; + + --footer_social_color: var(--footer_color); + --footer_social_background: transparent; + --footer_social_border_color: var(--footer_color); + --footer_social_border_radius: var(--border-radius); + + --footer-copyright-color: #ffffff; + --footer-copyright-font: 400 14px/30px var(--base-font); + --footer-copyright-background: #4D5971; + --footer-copyright-border-color: var(--border-color); + --footer-copyright-padding: 40px; + + // not displayed + --footer_display: none; + + // product image + --product-image-padding: 10px 0 0 10px; + + // Markdown + --markdown-font: 400 16px/24px var(--base-font); + + // Forms + --form-control-color: #222222; + --form-control-background: #ffffff; + --form-control-border-color: #646464; + --form-control-border-color-focus: #282b39; + --form-control-placeholder-font: 400 13px/20px var(--base-font); + --form-control-placeholder-color: #535561; + --form-label-color: #595959; + --form-label-font: 700 11px/16px var(--base-font); + + // Search bar + --color-search-icon-medium: #{$primaryColor}; + --color-search-icon-dark: #{darken($primaryColor, 10%)}; + --color-search-icon-light: #{lighten($primaryColor, 25%)}; + + --search-bar-point-color: #ececec; + --search-bar-point-radius: 0px; + + --search-bar-input-radius: var(--border-radius); + --search-bar-input-border: 1px solid var(--form-control-border-color); + --search-bar-input-background: #fff; + --search-bar-input-icon-color: #666666; + + --search-bar-label-top: -7px; + --search-bar-label-left: 16px; + --search-bar-label-padding: 4px; + --search-bar-label-background: #ffffff; + + // Dropdowns + --dropdown-item-font: 500 13px/20px var(--base-font); + --dropdown-item-color: #282b39; + --dropdown-item-background: #ffffff; + --dropdown-item-hover-color: #000000; + --dropdown-item-hover-background: #e5e5e5; + + // Paginator + --paginator-border-radius: var(--border-radius); + --paginator-button-color: #282b39; + --paginator-button-border: #9e9e9e; + --paginator-button-background: #fff; + --paginator-button-hover-color: #fff; + --paginator-button-hover-background: #535561; + --paginator-button-active-color: #fff; + --paginator-button-active-background: #292b39; + --paginator-button-disabled-color: #535561; + --paginator-button-disabled-border: #e5e5e5; + --paginator-button-disabled-background: #f5f5f5; + + // Labels + --label-default-color: #fff; + --label-default-background: #595959; + + --label-primary-color: #fff; + --label-primary-background: var(--color-primary); + + --label-danger-color: #030304; + --label-danger-background: #d38c87; + + --label-success-color: #030304; + --label-success-background: #9bbfa1; + + // Label sets + --label-set-border-radius: var(--border-radius); + --label-set-border-color: #9e9e9e; + --label-set-color: #272525; + --label-set-background: #ffffff; + --label-set-active-color: #ffffff; + --label-set-active-background: var(--color-primary-light); + --label-set-hover-color: #ffffff; + --label-set-hover-background: #{rgba($primaryColor, 0.8)}; + --label-set-focus-color: #272525; + --label-set-focus-background: #f4f5f7; + --label-set-focus-border-color: #9e9e9e; + + // Buttons + --button-font: 700 16px/24px var(--base-font); + --button-color: #282b39; + --button-shadow: none; + --button-decoration: none; + --button-border-radius: calc(var(--border-radius) * 0.75); + --button-hover-shadow: 0 10px 20px rgba(0, 0, 0, 0.3); + --button-hover-decoration: none; + --button-disabled-color: #616161; + --button-disabled-background: #e5e5e5; + + --button-primary-color: #fff; + --button-primary-border: 1px solid var(--color-primary); + --button-primary-decoration: none; + --button-primary-background: var(--color-primary); + --button-primary-hover-color: #fff; + --button-primary-hover-border: 1px solid var(--color-primary-light); + --button-primary-hover-decoration: none; + --button-primary-hover-background: var(--color-primary-light); + + --button-primary-outline-color: var(--color-primary); + --button-primary-outline-border: 1px solid var(--color-primary); + --button-primary-outline-decoration: none; + --button-primary-outline-background: transparent; + --button-primary-outline-hover-color: #fff; + --button-primary-outline-hover-border: 1px solid var(--color-primary); + --button-primary-outline-hover-decoration: none; + --button-primary-outline-hover-background: var(--color-primary); + + --button-read_more-color: var(--button-primary-color); + --button-read_more-border: var(--color-primary-light); + --button-read_more-decoration: var(--button-primary-decoration); + --button-read_more-background: var(--color-primary-light); + --button-read_more-hover-color: var(--button-primary-hover-color); + --button-read_more-hover-border: var(--button-primary-hover-border); + --button-read_more-hover-decoration: var(--button-primary-hover-decoration); + --button-read_more-hover-background: var(--button-primary-hover-background); + + // Sign up + --sign_up_accent_color: #282b39; + --sign_up_accent_color_light: #bdcbff; + --sign_up_link_color: #e60003; + --sign_up_step_btns_color: var(--color-primary-light); + --sign_up_digid_btn_bkg: #e1e7ff; + --sign_up_digid_btn_text: #4b71ff; + --sign_up_digid_btn_border: none; + --sign_up_digid_btn_border_radius: 5px; + --sign_up_loader_icon_color: #282b39; + + //- Showcase + --showcase-aside-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.06); + --showcase-aside-padding: 20px; + --showcase-aside-background: #fff; + --showcase-aside-border: 1px solid #e5e5e5; + --showcase-aside-border-radius: var(--border-radius); + + --showcase-item-shadow: var(--showcase-aside-shadow); + --showcase-item-background: var(--showcase-aside-background); + --showcase-item-border: var(--showcase-aside-border); + --showcase-item-border-radius: var(--showcase-aside-border-radius); + --showcase-item-hover-shadow: 2px 8px 14px 0px rgba(0, 0, 0, 0.1); + + --showcase-aside-button-color: var(--color-primary); + --showcase-aside-button-border: 1px solid var(--color-primary); + --showcase-aside-button-background: transparent; + --showcase-aside-button-hover-color: #fff; + --showcase-aside-button-hover-border: 1px solid var(--color-primary); + --showcase-aside-button-hover-background: var(--color-primary); + + --showcase-title-font: 600 18px/30px var(--heading-font-family); + --showcase-title-color: var(--tc); + --showcase-title-count-color: #fff; + --showcase-title-count-background: var(--color-primary-light); + --showcase-title-count-border-radius: calc(var(--border-radius) / 2); + + // Breadcrumbs + --breadcrumb-size: 16px; + --breadcrumb-color: var(--color-primary-light); + --breadcrumb-color-active: #353535; + --breadcrumb-padding: 20px; + + // Loader + --loader-background: #f5f5f5; + --loader-color: var(--color-primary); + + // Profile + --profile-menu-item-gap: 16px; + --profile-menu-item-color: var(--color-primary); + --profile-menu-item-color-icon: var(--profile-menu-item-color); + --profile-menu-item-shadow: var(--box-shadow); + --profile-menu-item-background: #ffffff; + --profile-menu-item-border-color: var(--border-color); + --profile-menu-item-border-radius: var(--border-radius); + --profile-menu-item-hover-color: #fff; + --profile-menu-item-hover-shadow: 0 5px 20px rgba(0, 0, 0, 0.2); + --profile-menu-item-hover-background: var(--color-primary); + --profile-menu-item-hover-border-color: var(--color-primary); + --profile-menu-item-hover-border-radius: var(--border-radius); + + // Vouchers + --vouchers-label-color: #646f79; + --vouchers-value-color: var(--tc); + --vouchers-organization-color: var(--tc); + + // Voucher card + --voucher-card-action-color: var(--color-primary); + --voucher-card-action-background: transparent; + --voucher-card-action-border-color: var(--color-primary); + --voucher-card-action-border-radius: 0px; + --voucher-card-action-hover-color: #fff; + --voucher-card-action-hover-background: var(--color-primary); + --voucher-card-action-hover-border-color: var(--color-primary); + + // Products + --products-title-color: var(--tc); + --products-title-hover-color: var(--tc); + --products-text-color: var(--tc); + + // Product + --product-title-font: 700 22px/28px var(--heading-font-family); + --product-title-color: var(--tc); + + // Map + --map-title-color: #0B0E12; + --map-title-font: 700 40px var(--heading-font-family); + + // Sections + --section-padding: 0 0 30px; + --section-background: transparent; + + --section-title-font: 700 40px/60px var(--heading-font-family); + --section-title-align: center; + + --section-cms-padding: var(--section-padding); + --section-cms-background: var(--section-background); + --section-map-padding: var(--section-padding); + --section-map-background: var(--section-background); + --section-faq-padding: 30px 0; + --section-faq-background: var(--section-background); + --section-footer-padding: 35px 0; + --section-footer-background: #F0F1F4; + --section-pre-check-padding: 0 0 30px; + --section-pre-check-background: var(--section-background); + --section-profile-padding: var(--section-padding); + --section-profile-background: var(--section-background); + --section-products-padding: var(--section-padding); + --section-products-background: var(--section-background); + --section-breadcrumbs-padding: 0; + --section-breadcrumbs-background: var(--section-background); + --section-voucher-details-padding: var(--section-padding); + --section-voucher-details-background: var(--section-background); + + // Search bar + --search-result-sidebar-item-active-color: #a80a2d; + --search-result-sidebar-item-active-background: #fff; + + // CMS funds + --cms-funds-title-font: 400 24px/36px var(--base-font); + --cms-funds-title-color: var(--htc); + --cms-funds-label-font-size: 11px; + --cms-funds-label-background: var(--color-primary); + + --cms-funds-compact-title-font: 400 24px/36px var(--base-font); + --cms-funds-compact-title-color: var(--htc); + + --cms-funds-link-color: var(--color-primary); + --cms-funds-link-font: 600 18px/20px var(--base-font); + + // Section order + --order-page-voucher-map: 0; + --order-page-voucher-products: 0; +} diff --git a/react/assets/forus-webshop/scss/style-webshop-geertruidenberg-vars.scss b/react/assets/forus-webshop/scss/style-webshop-geertruidenberg-vars.scss index f5622b0db..5cbbf9f47 100644 --- a/react/assets/forus-webshop/scss/style-webshop-geertruidenberg-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-geertruidenberg-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Roboto:400,900italic,900,700,700italic,500italic,500,400italic,300,100italic,100,300italic&subset=latin,cyrillic,latin-ext"); +@import "./includes/fonts/roboto"; /*========== Style Sheet - Vars ==========*/ $primaryColor: #666666; diff --git a/react/assets/forus-webshop/scss/style-webshop-general-vars.scss b/react/assets/forus-webshop/scss/style-webshop-general-vars.scss index cea0b28e8..eda66f956 100644 --- a/react/assets/forus-webshop/scss/style-webshop-general-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-general-vars.scss @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400&display=swap'); +@import "./includes/fonts/open-sans"; // do not use these scss variables outside this file $primaryColor: #305dfb; diff --git a/react/assets/forus-webshop/scss/style-webshop-goereeoverflakkee-vars.scss b/react/assets/forus-webshop/scss/style-webshop-goereeoverflakkee-vars.scss index 484e8e3ed..ced57c71c 100644 --- a/react/assets/forus-webshop/scss/style-webshop-goereeoverflakkee-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-goereeoverflakkee-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900&display=swap&subset=latin,cyrillic,latin-ext'); +@import "./includes/fonts/roboto"; // do not use these scss variables outside this file $primaryColor: #627c18; diff --git a/react/assets/forus-webshop/scss/style-webshop-hartvanwestbrabant-vars.scss b/react/assets/forus-webshop/scss/style-webshop-hartvanwestbrabant-vars.scss index 7a35217d7..03b098424 100644 --- a/react/assets/forus-webshop/scss/style-webshop-hartvanwestbrabant-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-hartvanwestbrabant-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Montserrat:ital,wght@0,300;0,400;0,500;0,700;1,400"); +@import "./includes/fonts/montserrat"; /*========== Style Sheet - Vars ==========*/ $primaryColor: #1c7878; diff --git a/react/assets/forus-webshop/scss/style-webshop-heumen-vars.scss b/react/assets/forus-webshop/scss/style-webshop-heumen-vars.scss index 0208bdf6a..622315b41 100644 --- a/react/assets/forus-webshop/scss/style-webshop-heumen-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-heumen-vars.scss @@ -1,5 +1,4 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Verdana"); /*========== Style Sheet - Vars ==========*/ $primaryColor: #22398e; diff --git a/react/assets/forus-webshop/scss/style-webshop-kerstpakket-vars.scss b/react/assets/forus-webshop/scss/style-webshop-kerstpakket-vars.scss index 6a9f6ffbb..713574dc5 100644 --- a/react/assets/forus-webshop/scss/style-webshop-kerstpakket-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-kerstpakket-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Cherry+Swash&family=Montserrat:ital,wght@0,300;0,400;0,500;0,700;1,400&display=swap"); +@import "./includes/fonts/montserrat"; /*========== Style Sheet - Vars ==========*/ $primaryColor: #90191a; diff --git a/react/assets/forus-webshop/scss/style-webshop-midden_drenthe-vars.scss b/react/assets/forus-webshop/scss/style-webshop-midden_drenthe-vars.scss index 71519f0ce..abe2a233c 100644 --- a/react/assets/forus-webshop/scss/style-webshop-midden_drenthe-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-midden_drenthe-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400&display=swap'); +@import "./includes/fonts/open-sans"; // do not use these scss variables outside this file $primaryColor: #8f1354; diff --git a/react/assets/forus-webshop/scss/style-webshop-oostgelre-vars.scss b/react/assets/forus-webshop/scss/style-webshop-oostgelre-vars.scss index 724a23f67..8a72c98db 100644 --- a/react/assets/forus-webshop/scss/style-webshop-oostgelre-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-oostgelre-vars.scss @@ -1,5 +1,4 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Verdana"); /*========== Style Sheet - Vars ==========*/ $primaryColor: #3d013d; diff --git a/react/assets/forus-webshop/scss/style-webshop-schouwen_duiveland-vars.scss b/react/assets/forus-webshop/scss/style-webshop-schouwen_duiveland-vars.scss index 83aeeaf53..a35dc20cf 100644 --- a/react/assets/forus-webshop/scss/style-webshop-schouwen_duiveland-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-schouwen_duiveland-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400&display=swap'); +@import "./includes/fonts/open-sans"; // do not use these scss variables outside this file $primaryColor: #1B7A00; diff --git a/react/assets/forus-webshop/scss/style-webshop-vergoedingen-vars.scss b/react/assets/forus-webshop/scss/style-webshop-vergoedingen-vars.scss index 8aeb2f2fe..afcd3a03d 100644 --- a/react/assets/forus-webshop/scss/style-webshop-vergoedingen-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-vergoedingen-vars.scss @@ -103,8 +103,7 @@ $primaryColorLight: #2f7f6b; font-display: swap; } -@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700'); -@import url('https://fonts.googleapis.com/css?family=Source+Serif+Pro:400,400i,600,700'); +@import "./includes/fonts/source-sans-pro"; :root { --zoom: 100%; diff --git a/react/assets/forus-webshop/scss/style-webshop-waalwijk-vars.scss b/react/assets/forus-webshop/scss/style-webshop-waalwijk-vars.scss index ce77fb8bb..0171da04c 100644 --- a/react/assets/forus-webshop/scss/style-webshop-waalwijk-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-waalwijk-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url("https://fonts.googleapis.com/css?family=Lato:300,300i,400,400i,700"); +@import "./includes/fonts/lato"; $primaryColor: #2a2a7f; $primaryColorLight: #2a2a7f; diff --git a/react/assets/forus-webshop/scss/style-webshop-wadenheuvel-vars.scss b/react/assets/forus-webshop/scss/style-webshop-wadenheuvel-vars.scss index 61d25431d..2a8c5da53 100644 --- a/react/assets/forus-webshop/scss/style-webshop-wadenheuvel-vars.scss +++ b/react/assets/forus-webshop/scss/style-webshop-wadenheuvel-vars.scss @@ -1,5 +1,5 @@ @import "style-webshop-general-vars"; -@import url('https://fonts.googleapis.com/css2?family=Cantarell&family=Montserrat:ital,wght@0,300;0,400;0,500;0,700;1,400&display=swap'); +@import "./includes/fonts/open-sans"; $primaryColor: #2a2a7f; $primaryColorLight: #2a2a7f; diff --git a/react/assets/forus-webshop/scss/webshop.scss b/react/assets/forus-webshop/scss/webshop.scss index ba4f9a160..c2ccbfa1b 100644 --- a/react/assets/forus-webshop/scss/webshop.scss +++ b/react/assets/forus-webshop/scss/webshop.scss @@ -55,14 +55,14 @@ @import 'includes/blocks/fund_criteria'; @import 'includes/blocks/map'; @import 'includes/blocks/phone-number'; -@import 'includes/blocks/product'; +@import 'includes/blocks/block-product'; @import 'includes/blocks/record_categories'; @import 'includes/blocks/records'; -@import 'includes/blocks/transactions'; +@import 'includes/blocks/block-transactions'; @import 'includes/blocks/validations'; @import 'includes/blocks/validators'; -@import 'includes/blocks/voucher-product'; -@import 'includes/blocks/voucher'; +@import 'includes/blocks/block-voucher'; +@import 'includes/blocks/block-voucher-share-options'; @import 'includes/blocks/vouchers'; @import 'includes/blocks/fund-add-records'; @import 'includes/blocks/block-profile'; @@ -76,11 +76,13 @@ @import 'includes/blocks/block-show-more'; @import 'includes/blocks/block-warning'; @import 'includes/blocks/block-qr-code'; +@import 'includes/blocks/block-panel-group'; @import 'includes/blocks/block-markdown'; @import 'includes/blocks/block-showcase'; @import 'includes/blocks/block-label-tabs'; @import 'includes/blocks/block-organizations'; +@import 'includes/blocks/block-organization-offices'; @import 'includes/blocks/block-offices'; @import 'includes/blocks/block-office'; @import 'includes/blocks/block-provider'; @@ -134,6 +136,7 @@ @import 'includes/blocks/block-pre-check-banner'; @import 'includes/blocks/block-fund-pre-check'; @import 'includes/blocks/block-fund-pre-check-result'; +@import 'includes/blocks/block-fund-pre-check-chatbot'; @import 'includes/blocks/block-key-value-list'; @import 'includes/blocks/block-card-table'; @import 'includes/blocks/block-loader'; @@ -143,6 +146,8 @@ @import 'includes/blocks/block-lang-control'; @import 'includes/blocks/block-reservation-address'; @import 'includes/blocks/block-banner'; +@import 'includes/blocks/block-product-category-filter'; +@import 'includes/blocks/block-product-categories'; @import 'includes/modals/modal-file-preview'; @import 'includes/modals/modal-photo-cropper'; diff --git a/react/public/index.ejs b/react/public/index.ejs index ae2a076da..02165a30d 100644 --- a/react/public/index.ejs +++ b/react/public/index.ejs @@ -9,7 +9,6 @@ <% if (disable_indexing) { %> <% } %> - <% if (['sponsor', 'provider', 'validator'].includes(type)) { %> diff --git a/react/src/dashboard/components/elements/auth2fa-restriction/Auth2FARestriction.tsx b/react/src/dashboard/components/elements/auth2fa-restriction/Auth2FARestriction.tsx index 2facc4f72..8f75beacd 100644 --- a/react/src/dashboard/components/elements/auth2fa-restriction/Auth2FARestriction.tsx +++ b/react/src/dashboard/components/elements/auth2fa-restriction/Auth2FARestriction.tsx @@ -3,6 +3,7 @@ import useAssetUrl from '../../../hooks/useAssetUrl'; import { get } from 'lodash'; import Fund from '../../../props/models/Fund'; import StateNavLink from '../../../modules/state_router/StateNavLink'; +import { DashboardRoutes } from '../../../modules/state_router/RouterBuilder'; export default function Auth2FARestriction({ type, @@ -45,7 +46,9 @@ export default function Auth2FARestriction({ accountaanpassingen kunnen worden gemaakt.