Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
3398e0a
epic - physical cards update
dev-rminds Sep 8, 2025
cbd48a0
merge develop into epic.physical-cards and fix conflicts
dev-rminds Sep 8, 2025
80882c9
generate translations
dev-rminds Sep 8, 2025
7e65405
physical card types epic - feedback and refactoring
dev-rminds Sep 10, 2025
ea3a07e
physical cards refactoring
dev-rminds Sep 10, 2025
0644c86
add invoice number to reservation
ateamcms Sep 16, 2025
c90afa7
Merge branch 'develop' into feature.add-invoice-number-to-reservation
dev-rminds Sep 23, 2025
6bd4faf
update the design of the reservation details page for providers
dev-rminds Sep 23, 2025
bf5f9d8
update filters design for products and providers on webshop
dev-rminds Sep 24, 2025
854891a
update reservation, extra payment and transaction page design
ateamcms Sep 26, 2025
1671060
Merge branch 'develop' into feature.add-invoice-number-to-reservation
RobinMeles Sep 29, 2025
ee10753
Merge branch 'feature.add-invoice-number-to-reservation' into feature…
dev-rminds Sep 30, 2025
18c2a12
add pane separator, add transfer_in to transactions table, update tra…
ateamcms Oct 2, 2025
e90cc8f
merge develop into epic.physical-cards and fix clonflicts
dev-rminds Oct 3, 2025
7bb14c6
replace keys with constants
dev-rminds Oct 3, 2025
fefb7d7
merge develop into feature.webshop-filters-design-update and fix conf…
dev-rminds Oct 9, 2025
5f5d16e
add root product category feature to implementations
dev-rminds Oct 9, 2025
51730b4
update dusk key
dev-rminds Oct 9, 2025
74483e9
merge develop into into feature.add-invoice-number-to-reservation and…
dev-rminds Oct 9, 2025
b16b024
merge feature.add-invoice-number-to-reservation into feature.update-r…
dev-rminds Oct 9, 2025
dcc2508
Merge branch 'develop' into feature.add-invoice-number-to-reservation
dev-rminds Oct 9, 2025
54deeb2
add permissions to workflows
dev-rminds Oct 9, 2025
741ec3c
Merge pull request #829 from teamforus/update-workflows
RobinMeles Oct 9, 2025
769e19f
Merge branch 'feature.add-invoice-number-to-reservation' into feature…
RobinMeles Oct 13, 2025
2f80bef
Merge pull request #824 from teamforus/feature.webshop-filters-design…
RobinMeles Oct 14, 2025
fe1e008
Merge branch 'develop' into feature.webshop-filters-design-update
RobinMeles Oct 14, 2025
b1fd1eb
update product categories filter color
dev-rminds Oct 14, 2025
98b27ff
update products page title
dev-rminds Oct 14, 2025
00e22a7
Merge pull request #811 from teamforus/feature.webshop-filters-design…
RobinMeles Oct 14, 2025
ac3421d
Merge pull request #813 from teamforus/feature.update-reservation-and…
RobinMeles Oct 14, 2025
59046e7
Merge branch 'develop' into feature.add-invoice-number-to-reservation
RobinMeles Oct 14, 2025
d558f1d
minor translations
RobinMeles Oct 14, 2025
1f6af15
Merge pull request #803 from teamforus/feature.add-invoice-number-to-…
RobinMeles Oct 14, 2025
02cb124
Merge branch 'develop' into epic.physical-cards
RobinMeles Oct 14, 2025
92cd134
hide physical card action buttons when not physical card types are av…
dev-rminds Oct 15, 2025
cc4a1ee
translations for both dashboard and webshop
RobinMeles Oct 15, 2025
6c23ebf
Merge branch 'epic.physical-cards' of https://github.com/teamforus/fo…
RobinMeles Oct 15, 2025
4b489c9
fix mailto and tel links in markdown editor
ateamcms Oct 16, 2025
1e38a6b
tooltip translations
RobinMeles Oct 17, 2025
5fc9b61
Merge pull request #792 from teamforus/epic.physical-cards
RobinMeles Oct 17, 2025
458b470
Merge branch 'develop' into fixes.mailto-and-tel-links-in-markdown-ed…
RobinMeles Oct 21, 2025
b07e9b3
Merge pull request #833 from teamforus/fixes.mailto-and-tel-links-in-…
RobinMeles Oct 21, 2025
b7e6752
translations for tooltip on product edit
RobinMeles Oct 23, 2025
21892b6
Merge pull request #836 from teamforus/missing-translation-tooltip-pr…
RobinMeles Oct 23, 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
3 changes: 3 additions & 0 deletions .github/workflows/auto_pr_on_master_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
jobs:
create_pr:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- name: Checkout master branch
uses: actions/checkout@v4
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/compile_and_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on: [pull_request]
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
215 changes: 0 additions & 215 deletions react/assets/forus-platform/scss/_common/components/modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -920,10 +815,6 @@
}

@media screen and (max-width: 1500px) {
.modal-content {
width: 1000px;
}

.modal-footer {
padding: 20px;

Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
}
}
}
}
}
18 changes: 17 additions & 1 deletion react/assets/forus-platform/scss/_common/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -114,7 +115,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';
Expand Down Expand Up @@ -936,6 +936,10 @@ body {
flex-direction: row;
align-items: center;

.card-title {
margin: 0 0 !important;
}

.card-header-filters {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -1719,6 +1723,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;
Expand Down
Loading