Skip to content

Develop #607

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 20 commits into from
Feb 27, 2025
Merged

Develop #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5a7261d
add filters to identities page
ateamcms Feb 19, 2025
840bb51
dashboard css fixes
dev-rminds Feb 20, 2025
f1f1f21
product reservation save address feature
dev-rminds Feb 20, 2025
55c6281
Merge branch 'develop' into reservation-address
dev-rminds Feb 20, 2025
2520ee3
reservation address mobile version
dev-rminds Feb 20, 2025
0419d7b
add skip button for optional reservation address
dev-rminds Feb 21, 2025
7e1bcba
hide profile menu on mobile
dev-rminds Feb 25, 2025
6e9b21e
Merge branch 'develop' into reservation-address
RobinMeles Feb 26, 2025
c3b7d00
add multiline feature to select-control
dev-rminds Feb 26, 2025
16a2389
add missing postcode to profile on webshop
dev-rminds Feb 26, 2025
bf75375
Merge pull request #596 from teamforus/reservation-address
RobinMeles Feb 26, 2025
bd87302
Merge branch 'develop' into dashboard-css-fixes
RobinMeles Feb 26, 2025
521d3b1
Merge pull request #595 from teamforus/dashboard-css-fixes
RobinMeles Feb 26, 2025
6a9481b
Merge branch 'develop' into hide-profile-menu-on-mobile
RobinMeles Feb 26, 2025
386665d
Merge pull request #604 from teamforus/hide-profile-menu-on-mobile
RobinMeles Feb 26, 2025
144b12b
fix clear identities filter and console errors
ateamcms Feb 26, 2025
1e6f1cb
Merge branch 'develop' into feature.add-filters-to-identities-page
ateamcms Feb 26, 2025
bc6133a
merge develop into select-control-multiline-feature
dev-rminds Feb 27, 2025
82b00f2
Merge pull request #606 from teamforus/select-control-multiline-feature
RobinMeles Feb 27, 2025
d2b10b8
Merge pull request #592 from teamforus/feature.add-filters-to-identit…
RobinMeles Feb 27, 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
15 changes: 10 additions & 5 deletions react/assets/forus-platform/scss/_common/blocks/block-announcements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
&.block-announcements {
display: flex;
flex-direction: column;
gap: 10px;

.announcement {
margin-bottom: 20px;
position: relative;
opacity: 1;
transition: opacity 0.4s;
Expand All @@ -10,26 +13,28 @@

.announcement-wrapper {
background: #ffffff;
padding: 15px 20px;
padding: 12px 15px;
border-radius: calc(var(--border-radius));
margin-left: -3.5px;
}

.title {
font: 600 13px/16px var(--base-font);
font: 600 14px/20px var(--base-font);
color: #151b26;
margin-bottom: 7px;
margin-bottom: 6px;
}

.description {
font: 500 11px/16px var(--base-font);
font: 500 12px/18px var(--base-font);
color: #646f79;

.block.block-markdown {
font: inherit !important;
color: inherit;

p {
margin-bottom: 6px;

&:last-child {
margin-bottom: 0;
}
Expand Down
23 changes: 21 additions & 2 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 @@ -220,7 +220,7 @@
border: 1px solid var(--border-color);
background-color: #ffffff;
padding: 4px 15px;
height: 36px;
min-height: 36px;
color: var(--text-color);
font: 500 13px/24px var(--base-font);
transition: background-color 0.4s ease, border 0.4s ease;
Expand Down Expand Up @@ -272,6 +272,7 @@
.form-group-info-control {
display: flex;
flex-grow: 1;
min-width: 0;

.form-control {
border-top-right-radius: 0;
Expand All @@ -284,7 +285,7 @@
border-left: none;
box-shadow: none;
height: 100%;
align-items: center;
align-items: flex-start;
margin: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
Expand Down Expand Up @@ -635,6 +636,8 @@
overflow: hidden;
display: block;
height: 100%;
white-space: nowrap;
text-overflow: ellipsis;
}
}

Expand Down Expand Up @@ -732,6 +735,22 @@
}
}

&.multiline-selected .select-control-search .select-control-search-placeholder {
height: auto;
overflow: visible;
white-space: initial;
text-overflow: initial;
word-break: break-word;
}

&.multiline-options .select-control-options .select-control-option {
height: auto;
overflow: visible;
white-space: initial;
text-overflow: initial;
word-break: break-word;
}

&[disabled] {
pointer-events: none;
}
Expand Down
21 changes: 15 additions & 6 deletions react/assets/forus-platform/scss/_common/components/modals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,20 @@
}

.modal-icon-rounded {
background: #fff;
display: inline-block;
padding: 23px;
border-radius: 50%;
margin: 20px 0;
box-shadow: 0 7px 15px rgba(#000, 0.1);
display: flex;
margin: 0 0 20px;
flex-direction: row;
justify-content: center;

img {
background: #fff;
border-radius: 50%;
box-shadow: 0 7px 15px rgba(#000, 0.1);
flex: 0 0 30px;
padding: 15px;
display: flex;
width: 80px;
}
}

&.modal-body-visible {
Expand Down Expand Up @@ -308,6 +316,7 @@
.modal-text {
font: 500 14px/22px var(--base-font);
color: #646f79;
text-align: center;
margin: 0 0 20px;

small {
Expand Down
30 changes: 24 additions & 6 deletions react/assets/forus-platform/scss/_common/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ body {
@include webkit_scrollbar(#848588);

&.app-header {
padding: 30px 0;
padding: 20px 0;
position: relative;
z-index: 2;
width: 100%;
max-width: 1470px;
display: flex;
flex-direction: column;
gap: 30px;
gap: 20px;
margin: 0 auto;

.app-header-row {
Expand All @@ -233,6 +233,8 @@ body {

.header-organization-switcher {
width: 265px;
display: flex;
align-items: center;

.select-control {
width: 100%;
Expand Down Expand Up @@ -623,12 +625,16 @@ body {
&.app-sidebar {
flex: 0 0 260px;
padding-left: 8px;
position: relative;

.sidebar-nav {
display: flex;
flex-direction: column;
gap: 4px;
padding-bottom: 100px;
padding-bottom: 30px;
position: sticky;
left: 0;
top: 15px;

.sidebar-nav-group {
display: flex;
Expand Down Expand Up @@ -771,6 +777,7 @@ body {
display: flex;
flex-direction: column;
min-width: 0;
padding: 0 0 30px;
}

@media screen and (max-width: 1300px) {
Expand Down Expand Up @@ -1579,10 +1586,12 @@ body {
padding: 6px 0;
font: 500 12px/20px var(--base-font);
border-bottom: 1px solid var(--border-color);
word-break: break-word;
color: #646f79;

strong {
color: #000;
display: contents;
}

&:last-child {
Expand Down Expand Up @@ -3979,7 +3988,7 @@ body {
background: #fff;
display: flex;
max-width: 100%;
width: calc(50% - 10px);
width: 100%;
border: 1px solid #d4d9dd;
flex-direction: row;
padding: 5px 15px;
Expand Down Expand Up @@ -4035,9 +4044,18 @@ body {
}
}
}
}

&:nth-child(odd) {
margin-right: 20px;
&.block-attachments-list-half {
.block-attachments-inner {
margin: 0 0 -10px;
}
.attachment-item {
width: calc(50% - 10px);

&:nth-child(odd) {
margin-right: 20px;
}
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions react/assets/forus-platform/scss/_common/select-controls/select-control-funds.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@

.select-control-options {
.select-control-option {
height: auto;
min-width: var(--option-height);
padding-left: 10px;
word-break: break-word;
white-space: wrap;
}
}

Expand Down
27 changes: 24 additions & 3 deletions react/assets/forus-webshop/scss/_common/components/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@
display: block;
color: var(--form-control-color);
line-height: 24px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

&:focus {
Expand Down Expand Up @@ -311,7 +314,9 @@
line-height: 20px;
color: var(--dropdown-item-color);
background: var(--dropdown-item-background);
@include ellipsis();
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;

strong,
b {
Expand Down Expand Up @@ -339,6 +344,22 @@
border-bottom-left-radius: 0;
}
}

&.multiline-selected .select-control-search .select-control-search-placeholder {
height: auto;
overflow: visible;
white-space: initial;
text-overflow: initial;
word-break: break-word;
}

&.multiline-options .select-control-options .select-control-option {
height: auto;
overflow: visible;
white-space: initial;
text-overflow: initial;
word-break: break-word;
}
}

.select-control.select-control-country-codes {
Expand Down Expand Up @@ -1165,8 +1186,8 @@

&.form-compact {
.form-label {
font: 700 11px/26px var(--base-font);
margin: 0 0 0;
font: 700 11px/16px var(--base-font);
margin: 0 0 5px;
}

datepicker,
Expand Down
2 changes: 1 addition & 1 deletion react/assets/forus-webshop/scss/_common/components/table-pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.table-pagination-counter {
color: #282b39;
font: 600 13px/36px var(--base-font);
font: 500 13px/36px var(--base-font);
display: flex;
flex-direction: row;
gap: 10px;
Expand Down
10 changes: 10 additions & 0 deletions react/assets/forus-webshop/scss/_common/sections/blocks/block-key-value-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,15 @@
border-bottom: 1px solid var(--border-color);
color: #646f79;
position: relative;
word-break: break-word;

strong {
color: #000;
display: contents;
}

div {
display: contents;
}

.key-value-list-item-value-history-body-item-icon {
Expand Down Expand Up @@ -148,6 +154,10 @@
.key-value-list-item-value-history-body-item {
flex-direction: column;
gap: 0;

div {
display: block;
}
}
}
}
Expand Down
Loading