Skip to content

Develop #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinMeles merged 30 commits into from
Aug 20, 2025
Merged

Develop #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e46f3d3
add reservation note setting
ateamcms May 30, 2025
bea7826
add config to hide qr-scanning for provider and product edit page red…
dev-rminds Jul 29, 2025
dd24674
informational products
dev-rminds Aug 1, 2025
2f838ef
Merge pull request #762 from teamforus/informational-products
RobinMeles Aug 4, 2025
a978980
translations for both qr and informative products on webshop
RobinMeles Aug 5, 2025
3271dc2
Merge branch 'develop' into feature.add-reservation-note-setting
ateamcms Aug 5, 2025
d95a5f2
fix imports in product form
ateamcms Aug 5, 2025
212a7fa
Merge branch 'develop' into product-qr-scanning-config
RobinMeles Aug 6, 2025
efdfb37
remove info products from voucher create modal
dev-rminds Aug 7, 2025
ed407a4
merge develop into product-qr-scanning-config and fix conflicts
dev-rminds Aug 7, 2025
8325a1b
Merge branch 'develop' into feature.add-reservation-note-setting
dev-rminds Aug 8, 2025
0ef727f
merge product-qr-scanning-config into feature.add-reservation-note-se…
dev-rminds Aug 8, 2025
09e43fc
Improving additional information request
dev-rminds Aug 12, 2025
e7523ba
update fund-request pending screen
dev-rminds Aug 12, 2025
390de84
fix translation html tag being shown
dev-rminds Aug 12, 2025
0d7656e
Merge pull request #770 from teamforus/fixes.optional-digid-fund-appl…
RobinMeles Aug 13, 2025
78e43db
Merge branch 'develop' into product-qr-scanning-config
dev-rminds Aug 13, 2025
ab2c40b
Merge branch 'product-qr-scanning-config' into feature.add-reservatio…
dev-rminds Aug 13, 2025
540433f
Update preferences-notifications.mjs
EmielForus Aug 15, 2025
da9d1dd
add schouwen duiveland webshop
ateamcms Aug 17, 2025
a348422
minify svg
ateamcms Aug 18, 2025
14dcda8
Merge pull request #773 from teamforus/feature.add-schouwen-duiveland…
RobinMeles Aug 19, 2025
4dd0004
Merge pull request #716 from teamforus/feature.add-reservation-note-s…
RobinMeles Aug 19, 2025
d025d12
Merge branch 'develop' into product-qr-scanning-config
RobinMeles Aug 19, 2025
7633096
Merge pull request #760 from teamforus/product-qr-scanning-config
RobinMeles Aug 19, 2025
f8164cf
Merge branch 'develop' into feature.improving-additional-information-…
RobinMeles Aug 19, 2025
ddc0de4
translations for both webshop and validator
RobinMeles Aug 19, 2025
0dee2ac
Merge pull request #769 from teamforus/feature.improving-additional-i…
RobinMeles Aug 19, 2025
4f67f47
Merge pull request #771 from teamforus/translation-email
RobinMeles Aug 20, 2025
2f37b76
Merge pull request #776 from teamforus/auto/master_to_develop_update-…
RobinMeles Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions react/assets/forus-platform/scss/_common/blocks/block-attachments-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
.block.block-attachments-list {
display: flex;
flex-direction: column;
gap: 10px;

.attachment-item {
background: #fff;
display: flex;
border: 1px solid #d4d9dd;
flex-direction: row;
padding: 5px 15px 5px 10px;
border-radius: var(--border-radius);
gap: 10px;

.attachment-icon {
display: flex;
flex-direction: row;
gap: 10px;

.mdi {
font-size: 18px;
line-height: 25px;
color: #004195;
}

.attachment-size {
color: #646f79;
font: 600 13px/24px var(--base-font);
flex: 1 0 60px;
}
}

.attachment-name {
color: #262626;
font: 600 13px/24px var(--base-font);
flex: 1 1 auto;
min-width: 0;
word-wrap: break-word;
white-space: normal;
}

.attachment-date {
font: 400 13px/24px var(--base-font);
}

.attachment-preview {
display: flex;
flex-direction: row;
color: #262626;
font: 500 12px/24px var(--base-font);
gap: 5px;

.mdi {
font-size: 16px;
line-height: 24px;
height: 24px;
color: #555;

&:hover {
color: var(--color-primary);
}
}
}
}
}
199 changes: 199 additions & 0 deletions react/assets/forus-platform/scss/_common/blocks/block-request-clarification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
.block.block-request-clarification {
display: flex;
flex-direction: column;

.block-title {
font: 500 14px/26px var(--base-font);
color: #282b39;
margin-bottom: 10px;
}

.clarification-item {
display: flex;
flex-direction: row;
margin-bottom: 15px;

.clarification-item-nth {
width: 30px;
min-width: 30px;
height: 30px;
background: #fff;
border: 1px solid var(--border-color);
display: flex;
border-radius: 30px;
font: 600 13px/28px var(--base-font);
text-align: center;
justify-content: center;
margin-right: 10px;
}

.clarification-item-details {
display: flex;
flex-direction: column;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
background: #fff;
box-shadow: 2px 4px 2px rgba($color: #000000, $alpha: 0.02);
flex-grow: 1;

.clarification-item-section {
display: flex;
flex-direction: column;
border-bottom: 1px solid var(--border-color);
padding: 12px 15px;
gap: 10px;

.clarification-item-section-header {
display: flex;
flex-direction: row;
gap: 5px;

.clarification-item-section-header-label {
display: inline-flex;
gap: 4px;
border-radius: var(--border-radius);
padding: 0 3px;
font: 600 11px/20px var(--base-font);
align-items: center;

.mdi {
font-size: 15px;
height: 20px;
line-height: 20px;
}

&.clarification-item-section-header-label-question-pending {
color: #fff;
border: 1px solid #607d8b;
background: #607d8b;
}

&.clarification-item-section-header-label-question-responded {
color: #fff;
border-color: 1px solid var(--color-primary);
background: var(--color-primary);
}

&.clarification-item-section-header-label-answer-pending {
color: #151b26;
border: 1px solid #b0bec5;

.mdi {
color: #646f79;
}
}

&.clarification-item-section-header-label-answer-responded {
color: #151b26;
border: 1px solid #b0bec5;

.mdi {
color: #2987fd;
}
}
}

.clarification-item-section-header-title {
font: 600 12px/22px var(--base-font);
color: #646f79;

strong {
color: #000;
}
}
}

.clarification-item-section-body {
display: flex;
flex-direction: column;
padding-left: 22px;
gap: 10px;

.clarification-item-section-body-group {
position: relative;
display: flex;
flex-direction: column;
gap: 4px;

.clarification-item-section-body-group-title {
font: 600 12px/20px var(--base-font);
color: var(--color-primary);
}

&:before {
content: '';
left: -11px;
top: -10px;
bottom: 50%;
width: 1px;
background: var(--border-color);
transform: translate(-50%, 0);
border-radius: 5px;
position: absolute;
}

&:after {
content: '';
left: -11px;
top: 50%;
width: 5px;
height: 5px;
transform: translate(-50%, -50%);
background: var(--color-primary);
border-radius: 5px;
position: absolute;
}

&.clarification-item-section-body-group-with-title {
&:before {
bottom: 0;
top: -10px;
height: auto;
}

&:after {
top: 7.5px;
transform: translate(-50%, 0);
background: #2987fd;
}

&:last-child {
&:before {
bottom: auto;
height: 20px;
}
}
}
}

.clarification-item-section-body-bubble {
display: block;
padding: 6px 12px;
background: #f6f9fc;
border: 1px solid var(--border-color);
border-radius: 0 6px 6px 6px;
color: #000;
width: fit-content;
max-width: 100%;
font: 600 13px/22px var(--base-font);

&.clarification-item-section-body-bubble-primary {
background: #2987fd;
border-color: #2987fd;
color: #fff;
}
}
}

&:last-child {
border-bottom: none;
}
}
}

&:last-child,
&:last-of-type {
margin-bottom: 0;
}
}
}
4 changes: 4 additions & 0 deletions react/assets/forus-platform/scss/_common/components/forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
display: flex;
flex-direction: column;
gap: 10px;

.form-group {
margin-bottom: 0;
}
}

&.form-pane-lg {
Expand Down
Loading