Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
65ee4bd
move prevalidations to organization level
dev-rminds Apr 29, 2025
123df0c
Merge branch 'develop' into prevalidations-refactoring
dev-rminds Apr 29, 2025
108e942
Merge branch 'develop' into prevalidations-refactoring
dev-rminds Apr 29, 2025
d7cb9ba
ui consistency, refactoring and cleanup for labels, borders and form …
dev-rminds May 10, 2025
805fd94
merge develop into prevalidations-refactoring and fix conflicts
dev-rminds May 13, 2025
614e41d
merge prevalidations-refactoring into ui-consistency
dev-rminds May 13, 2025
d757c7b
Merge pull request #687 from teamforus/ui-consistency
RobinMeles May 14, 2025
e4528d5
fix apply fund if fund request was approved and voucher received
ateamcms May 15, 2025
e857b4d
remove revoked_budget notification
ateamcms May 16, 2025
7d7e76a
add created at and last activity to employees table
ateamcms May 16, 2025
631c0e2
Merge branch 'develop' into prevalidations-refactoring
RobinMeles May 19, 2025
d0457c7
Merge branch 'develop' into feature.remove-revoked_budget-notification
RobinMeles May 19, 2025
8049af1
Merge branch 'develop' into fixes.apply-fund-if-fund-request-was-appr…
RobinMeles May 19, 2025
0ce0ea8
Merge branch 'develop' into prevalidations-refactoring
dev-rminds May 19, 2025
57b63af
translation fixes for extra payments
dev-rminds May 19, 2025
6f2db0a
Merge branch 'develop' into feature.remove-revoked_budget-notification
dev-rminds May 19, 2025
c39793d
Merge branch 'develop' into feature.add-created-at-and-last-activity-…
ateamcms May 19, 2025
929c013
fix tests
dev-rminds May 20, 2025
cc723b1
Merge pull request #694 from teamforus/feature.remove-revoked_budget-…
RobinMeles May 20, 2025
5dc2298
Merge branch 'develop' into translation-fixes.extra-payments
RobinMeles May 20, 2025
e62e574
Merge pull request #698 from teamforus/translation-fixes.extra-payments
RobinMeles May 20, 2025
805ea3c
Merge branch 'develop' into prevalidations-refactoring
RobinMeles May 20, 2025
3a24414
Merge pull request #677 from teamforus/prevalidations-refactoring
RobinMeles May 20, 2025
aba9cf5
Merge pull request #700 from teamforus/auto/master_to_develop_update-…
RobinMeles May 20, 2025
f221e39
redirect to voucher page if fund request was approved and has active …
ateamcms May 20, 2025
0b4c91d
Merge branch 'develop' into fixes.apply-fund-if-fund-request-was-appr…
ateamcms May 20, 2025
e4c4f24
Merge branch 'develop' into feature.add-created-at-and-last-activity-…
RobinMeles May 20, 2025
27fe47f
Merge pull request #695 from teamforus/feature.add-created-at-and-las…
RobinMeles May 20, 2025
6908247
Merge branch 'develop' into fixes.apply-fund-if-fund-request-was-appr…
RobinMeles May 20, 2025
958bc8b
Merge pull request #693 from teamforus/fixes.apply-fund-if-fund-reque…
RobinMeles May 20, 2025
92f9dfa
webshop layout refactoring and fix providers map view size
dev-rminds May 21, 2025
c7031b0
remove sort order dropdown from providers map on webshop
dev-rminds May 21, 2025
15b5937
Merge branch 'develop' into webshop-layout-refactoring
RobinMeles May 21, 2025
e928468
Merge pull request #702 from teamforus/webshop-layout-refactoring
RobinMeles May 21, 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
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
gap: 10px;
padding: 30px 30px;
z-index: 1;
border-radius: 4px;
border-radius: var(--border-radius);

.banner-editor-title {
font: 500 15px/20px var(--base-font);
Expand Down Expand Up @@ -109,7 +109,7 @@
.banner-editor-control-color {
padding: 0 5px;
border: 1px solid var(--border-color);
border-radius: 5px;
border-radius: var(--border-radius);
display: flex;
flex-direction: row;
align-items: center;
Expand All @@ -122,7 +122,7 @@
.banner-editor-control-color-preview {
width: 16px;
height: 16px;
border-radius: 4px;
border-radius: var(--border-radius);
box-shadow: 1px 1px 5px 0 rgba(25, 39, 52, 0.11);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
border: 1px solid var(--color-danger);
border-radius: 3px;
border-radius: var(--border-radius);
background: #fff;
align-items: center;
margin-bottom: 20px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
flex-basis: 33.333%;
margin-right: 20px;
background: #ffffff;
border-radius: 5px;
border-radius: var(--border-radius);
box-shadow: 0 2px 8px rgba(#000, 0.1);
cursor: default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ $mailFont: Verdana, Arial, sans-serif;
padding: 5px 75px;
font: 600 14px/40px $mailFont;
color: #fff;
border-radius: 3px;
border-radius: var(--border-radius);
text-decoration: none;
background-color: #315efd;
cursor: pointer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

.note-editing-area {
border: 1px solid var(--border-color);
border-radius: 3px;
border-radius: var(--border-radius);
background-color: #ffffff;

.note-placeholder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
width: 40px;
border: 1px solid var(--border-color);
background: #fff;
border-radius: 4px;
border-radius: var(--border-radius);
margin-right: 6px;
padding: 9px 0;
font: 600 18px/38px 'Open Sans', arial, sans-serif;
Expand Down Expand Up @@ -84,7 +84,7 @@
background: #b7bfc6;
width: 7px;
height: 2px;
border-radius: 5px;
border-radius: var(--border-radius);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 4px;
border-radius: var(--border-radius);
border: 1px solid var(--border-color);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.block-product-media {
flex: 0 0 190px;
border: 1px solid #d4d9dd;
border-radius: 4px;
border-radius: var(--border-radius);
overflow: hidden;

img {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
display: block;
width: 3px;
height: 3px;
border-radius: 3px;
border-radius: var(--border-radius);
position: absolute;
left: 0;
top: 50%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
display: flex;
flex-direction: row;
background: #ffffff;
border-radius: 5px;
border-radius: var(--border-radius);
box-shadow: 0 2px 8px rgba(#000, 0.1);
margin: 0 0 30px;
overflow: hidden;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
&.block-voucher-records-editor {
.block-voucher-record-list {
border-radius: 5px;
border-radius: var(--border-radius);
border: 1px dashed var(--border-color);
padding: 15px;
margin-bottom: 20px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
display: block;
width: 5px;
height: 100%;
border-radius: 3px;
border-radius: var(--border-radius);
background: linear-gradient(0deg, #7db75a 0%, #7db75a 100%), #e6eeaf;
position: absolute;
top: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
.block-feature-label {
font: 600 11px/14px var(--base-font);
padding: 2px 4px;
border-radius: 4px;
border-radius: var(--border-radius);
border: 1px solid #dadfe5;
background: #ebeef1;
color: #151b26;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
.features-label {
font: 600 11px/14px var(--base-font);
padding: 2px 4px;
border-radius: 4px;
border-radius: var(--border-radius);
border: 1px solid #dadfe5;
background: #ebeef1;
color: #151b26;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.button {
display: inline-flex;
width: fit-content;
border-radius: 3px;
border-radius: var(--border-radius);
font: 500 13px/20px var(--base-font);
padding: 7px 10px;
box-shadow: var(--box-shadow);
Expand Down
173 changes: 6 additions & 167 deletions react/assets/forus-platform/scss/_common/components/forms.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
.form {
datepicker,
.datepicker {
border: none;
outline: none;
position: relative;

.form-control {
position: absolute;
left: -1px;
top: -1px;
right: -1px;
bottom: -1px;
width: calc(100% + 2px) !important;
}
}

.form-label {
display: block;
cursor: default;
Expand Down Expand Up @@ -224,7 +208,7 @@
color: var(--text-color);
font: 500 13px/24px var(--base-font);
transition: background-color 0.4s ease, border 0.4s ease;
border-radius: 3px;
border-radius: var(--border-radius);
appearance: none;

&[disabled] {
Expand Down Expand Up @@ -387,7 +371,7 @@
height: 36px;
color: var(--text-color);
font: 600 16px/24px var(--base-font);
border-radius: 3px;
border-radius: var(--border-radius);

&.form-value-placeholder-sm {
padding: 0 0;
Expand Down Expand Up @@ -467,132 +451,6 @@
}
}

&.form-group-inline {
margin-bottom: 10px;
flex-wrap: wrap;
position: relative;

.block-form_tooltip {
position: absolute;
top: 20px;
right: -45px;
transform: translate(0, -50%);
z-index: 5;
}

& > .form-label {
width: 200px;
padding-top: 8px;
padding-bottom: 8px;
margin: 0;
text-align: right;
padding-right: 10px;
float: left;
color: black;

&.form-label-required {
&:before {
content: '*';
padding-right: 2px;
display: inline-block;
margin-left: -8px;
width: 8px;
}

&:after {
display: none;
}
}
}

& > .form-offset,
& > .form-control,
& > .react-datepicker-wrapper {
width: calc(100% - 200px);
float: left;

.form-toggle {
padding: 8px 0;
}
}

& > .form-error {
margin-left: 200px;
width: calc(100% - 200px);
float: left;
}

& > .form-title {
padding: 8px 0;
width: calc(100% - 200px);
float: left;
}

&.form-group-inline-xl {
& > .form-label {
width: 250px;
}

& > .form-offset,
& > .form-control {
width: calc(100% - 250px);
}

& > .form-error {
margin-left: 250px;
width: calc(100% - 250px);
}
}

&.form-group-inline-lg {
& > .form-label {
width: 145px;
}

& > .form-offset,
& > .form-control {
width: calc(100% - 145px);
}

& > .form-error {
margin-left: 145px;
width: calc(100% - 145px);
}
}

&.form-group-inline-md {
& > .form-label {
width: 125px;
}

& > .form-offset,
& > .form-control {
width: calc(100% - 125px);
}

& > .form-error {
margin-left: 125px;
width: calc(100% - 125px);
}
}

&.form-group-inline-sm {
& > .form-label {
width: 80px;
}

& > .form-offset,
& > .form-control {
width: calc(100% - 80px);
}

& > .form-error {
margin-left: 80px;
width: calc(100% - 80px);
}
}
}

&:last-child,
&.form-group-last {
margin-bottom: 0 !important;
Expand All @@ -601,7 +459,7 @@

.control-frame {
border: 1px solid #eef1f5;
border-radius: 5px;
border-radius: var(--border-radius);
padding: 10px 15px 10px;
margin: 5px 0 10px;
font: 400 14px var(--base-font);
Expand Down Expand Up @@ -899,6 +757,7 @@
.select-control {
width: var(--selector-width);
position: absolute;
z-index: 2;

.select-control-input {
.form-control:not([type='radio']):not([type='checkbox']) {
Expand Down Expand Up @@ -959,7 +818,7 @@
margin-right: 5px;
margin-left: -25px;
float: left;
border-radius: 3px;
border-radius: var(--border-radius);

.mdi {
color: #262626;
Expand Down Expand Up @@ -1125,7 +984,7 @@
color: #9ca6af;
background: #f6f9fc;
border: 1px dashed #d4d9dd;
border-radius: 3px;
border-radius: var(--border-radius);
word-wrap: break-word;
white-space: pre-wrap;
}
Expand All @@ -1136,24 +995,4 @@
font: 600 14px/20px var(--base-font);
color: #151b26;
}

@media screen and (max-width: 600px) {
.form-group {
&.form-group-inline {
.form-label {
width: auto !important;
padding: 3px 0 !important;

&.form-label-required {
padding-left: 5px !important;
}
}

.form-offset,
.form-control {
width: 100% !important;
}
}
}
}
}
Loading