Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ jobs:
apt-get install -y nodejs
npm i -g yarn npm --force
yarn --frozen-lockfile
mv ./public/js/fengari-web.js ./fengari-web.js.bak
yarn build --no-watch
mv ./fengari-web.js.bak ./public/js/fengari-web.js

- name: 'Run the Cypress tests'
run: yarn cypress run --browser chromium
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"dependencies": {
"@egjs/hammerjs": "^2.0.17",
"@popperjs/core": "^2.11.8",
"axe-core": "^4.12.1",
"bootstrap": "^5.3.8",
"bootstrap-datepicker": "^1.9.0",
"component-emitter": "^1.3.0",
Expand Down Expand Up @@ -70,12 +69,14 @@
"@typescript-eslint/type-utils": "^8.61.1",
"@webpack-cli/serve": "^2.0.1",
"autoprefixer": "^10.5.0",
"axe-core": "^4.14.0",
"babel-loader": "^10.1.1",
"buffer": "^6.0.3",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^14.0.0",
"core-js": "^3.49.0",
"css-loader": "^7.1.4",
"css-minimizer-webpack-plugin": "^8.0.0",
"cypress": "^15.17.0",
"cypress-axe": "^1.7.0",
"eslint": "^10.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/attention/_attention.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@extend %icon-font;

content: "\E810";
margin-right: 0.5rem;
margin-right: ($spacer * 0.5);
transform: rotate(180deg);
}

Expand Down
14 changes: 7 additions & 7 deletions src/frontend/components/button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@extend %icon-font;

content: "\E800";
margin-right: 0.5rem;
margin-right: ($spacer * 0.5);
color: $white;
}

Expand All @@ -24,7 +24,7 @@
@extend %icon-font;

content: "\E810";
margin-left: 0.5rem;
margin-left: ($spacer * 0.5);
color: $white;
}

Expand Down Expand Up @@ -133,7 +133,7 @@

.btn-delete.btn-icon-close {
&::before {
margin-right: 0.75rem;
margin-right: ($spacer * 0.75);
}
}

Expand All @@ -150,7 +150,7 @@
@extend %icon-font;

content: "\e82b";
margin-right: 0.5rem;
margin-right: ($spacer * 0.5);
color: $white;
}
}
Expand Down Expand Up @@ -181,7 +181,7 @@
@extend %icon-font;

content: "\E80a";
margin-right: 0.25rem;
margin-right: ($spacer * 0.25);
color: $brand-secundary;
background: $transparent;
transition: all 0.2s ease;
Expand Down Expand Up @@ -441,8 +441,8 @@
@extend %icon-font;

content: "\E80a";
margin-left: 0.5rem;
padding: 0.25rem;
margin-left: ($spacer * 0.5);
padding: ($spacer * 0.25);
transition: 0.2s all ease;
border-radius: 0.25rem;
color: $brand-secundary;
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/components/card/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
flex-grow: 1;

.card__title {
@extend .text-primary;
color: rgba(var(--bs-primary), var(--bs-text-opacity));

.card__subtitle {
font-weight: normal;
margin-left: $padding-base-horizontal;
@extend .text-secondary;
color: rgba(var(--bs-secondary), var(--bs-text-opacity));
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/components/content-block/_content-block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
/* Reset above margin if within a modal dialogue */
.content-block .modal-dialog .alert {
margin-top: 0;
margin-bottom: 2rem;
margin-bottom: ($spacer * 2);
}

.content-block__title {
Expand All @@ -84,8 +84,8 @@
}

.content-block--white .content-block__main {
margin-top: 1.5rem;
padding: 1.5rem 2rem;
margin-top: ($spacer * 1.5);
padding: ($spacer * 1.5) ($spacer * 2);
background-color: $white;
box-shadow: 0 0 7px #0000000D;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: sticky;
z-index: 999;
bottom: 0;
margin: $padding-large-vertical 0 (-$padding-large-vertical) -1.25rem;
margin: $padding-large-vertical 0 (-$padding-large-vertical) ($spacer * -1.25);
}

.content-block__footer-container {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/dashboard/lib/react/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

.ld-body-container {
margin-bottom: 4rem;
margin-bottom: ($spacer * 4);
}

.ld-widget-container {
Expand Down
10 changes: 5 additions & 5 deletions src/frontend/components/data-table/_data-table-row.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.data-table .data-table-row--child {
position: relative;
padding-left: 2rem;
padding-left: ($spacer * 2);

&::after {
@extend %icon-font;
Expand All @@ -9,7 +9,7 @@
position: absolute;
top: 50%;
left: $padding-base-horizontal;
margin-right: 0.5rem;
margin-right: ($spacer * 0.5);
transform: translateY(-50%);
font-size: 0.9em;
}
Expand All @@ -29,7 +29,7 @@ table.dataTable {
top: 1.3rem;
right: $padding-small-horizontal;
left: auto;
margin: 0 0.5rem 0 0;
margin: 0 ($spacer * 0.5) 0 0;
transform: rotate(90deg);
border: 0;
background-color: $transparent;
Expand All @@ -56,10 +56,10 @@ table.dataTable {

&.dtr-column > tbody > tr > td.dtr-control.data-table-row--child,
&.dtr-column > tbody > tr > th.dtr-control.data-table-row--child {
padding-left: 4rem;
padding-left: ($spacer * 4);

&::after {
left: 2rem;
left: ($spacer * 2);
}
}

Expand Down
44 changes: 23 additions & 21 deletions src/frontend/components/data-table/_data-table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
z-index: 1;

th {
padding: 1rem;
padding: $spacer;

background-color: $white;
border-bottom: 1px solid $gray;
Expand All @@ -34,7 +34,7 @@

tbody {
td {
padding: 1rem;
padding: $spacer;
color: $gray-extra-dark;
vertical-align: middle;
}
Expand Down Expand Up @@ -115,7 +115,7 @@ table.dataTable thead .sorting_disabled {
}

.row--fiv-header {
margin-top: 1.9rem;
margin-top: ($spacer * 1.9);
}

.dataTables_toggle_full_width {
Expand Down Expand Up @@ -199,10 +199,10 @@ table.dataTable thead .sorting_disabled {
}

.data-table__search {
margin: 0 0.1rem 0 -1rem;
margin: 0 ($spacer * 0.1) 0 ($spacer * -1);

.dropdown-toggle {
margin-top: 0.1rem;
margin-top: ($spacer * 0.1);
transition: 0.2s opacity ease-in;
opacity: 0.8;

Expand Down Expand Up @@ -300,7 +300,7 @@ table.dataTable thead .sorting_disabled {

.custom-select {
margin: 0;
margin-left: 1rem;
margin-left: $spacer;
max-width: 5rem;
}

Expand Down Expand Up @@ -419,13 +419,14 @@ button.btn-add {

.dt-start,
.dt-end {
@extend .py-2;
@extend .align-content-center;
@extend .d-flex;
@extend .flex-row;
@extend .justify-content-between;
@extend .align-items-center;
@extend .m-0;
padding-left: ($spacer * 0.5);
padding-right: ($spacer * 0.5);
align-content: center;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin: 0;
}

.dt-layout-start:has(.dt-search) {
Expand All @@ -436,12 +437,12 @@ button.btn-add {
}

.dt-search {
@extend .pe-2;
padding-right: ($spacer * 0.5);
width: 100%;

input[type="search"] {
width: 100%;
@extend .m-0;
margin: 0;
}
}
}
Expand All @@ -458,7 +459,8 @@ button.btn-add {
}

.btn-search {
@extend .mx-2;
margin-left: ($spacer * 0.5);
margin-right: ($spacer * 0.5);
opacity: 0;
transition: 0.2s opacity ease-in;

Expand All @@ -482,8 +484,8 @@ button.btn-add {
}

.btn-sort {
margin-top: 0.1rem;
margin-left: 0.25rem;
margin-top: ($spacer * 0.1);
margin-left: ($spacer * 0.25);
opacity: 0;
transition: 0.2s opacity ease-in;

Expand Down Expand Up @@ -571,14 +573,14 @@ th {

input[type="search"] {
width: 100%;
@extend .m-0;
margin: 0;
}
}
}
}

.align-tables {
padding-top: 2.8rem;
padding-top: ($spacer * 2.8);
}

/* This is because bootstrap _loves_ to add a box-shadow to the table rows */
Expand All @@ -603,7 +605,7 @@ th {
table.dataTable {
&.table-search {
&>tbody>tr>td {
padding-left: 2rem;
padding-left: ($spacer * 2);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/data-table/_table-modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
right: 0;
bottom: 0;
left: 0;
padding: 1rem;
padding: $spacer;
background: white;

overflow: auto;
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

.dropdown__menu {
margin: 0.125rem 0;
margin: ($spacer * 0.125) 0;
padding: 0;
border: 1px solid $gray;
border-radius: $input-border-radius;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

.error-message::before {
@extend .pe-2;
padding-right: ($spacer * 0.5);
@extend %icon-font;
content: "\E822";
}
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/components/form-group/_fieldset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@include form-label;

width: auto;
margin-bottom: 0.25rem;
margin-bottom: ($spacer * 0.25);
font-size: 0.875rem; // 14px
}
}
Expand All @@ -23,11 +23,11 @@
}

.fieldset__legend--standalone {
margin-bottom: 1rem;
margin-bottom: $spacer;
}

.fieldset__legend + .form-group {
margin-top: 0.25rem;
margin-top: ($spacer * 0.25);
}

.fieldset--required legend::after {
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/components/form-group/_form-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}

.form-text--error {
margin-top: 0.5rem;
margin-top: ($spacer * 0.5);
color: $brand-danger;
}

Expand All @@ -38,7 +38,7 @@
background-color: $gray-light;
color: $gray-extra-dark;
border-bottom: 1px solid #E5E5E5;
padding: 0.5rem 1rem;
padding: ($spacer * 0.5) $spacer;
font-weight: normal;
text-transform: none;
}
Expand All @@ -49,5 +49,5 @@
}

.form-group {
margin-bottom: 2rem;
margin-bottom: ($spacer * 2);
}
Loading
Loading