Skip to content

Commit

Permalink
fix sass warnings and lint issues (#84)
Browse files Browse the repository at this point in the history
* fix sass warnings and lint issues

* fix package reference

* update changelog

---------

Co-authored-by: Harouna Traoré <[email protected]>
  • Loading branch information
haroun and haroun authored Sep 11, 2024
1 parent 002d26c commit 0d4f435
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 42 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20]
node-version: [18, 20, 22]
mongodb-version: ['4.4', '5.0', '6.0']

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.8.0
uses: supercharge/mongodb-github-action@1.11.0
with:
mongodb-version: ${{ matrix.mongodb-version }}

Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## UNRELEASED

### Fixes

* Fixes SASS warnings.

## Changes

* Update devDependencies.

## 2.4.0 (2024-09-05)

### Adds
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
"lodash": "^4.17.21",
"tar-stream": "^3.1.6"
}
}
}
40 changes: 23 additions & 17 deletions ui/apos/components/AposDuplicateImportModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -298,33 +298,39 @@ export default {
.apos-import-duplicate__heading {
@include type-title;
line-height: var(--a-line-tall);
margin: 0;
text-transform: capitalize;
& {
line-height: var(--a-line-tall);
margin: 0;
text-transform: capitalize;
}
}
.apos-import-duplicate__description {
@include type-base;
width: calc(100% - 20px);
margin-top: 15px;
margin-bottom: 20px;
padding: 10px;
color: var(--a-warning-dark);
font-size: var(--a-type-large);
text-align: left;
line-height: var(--a-line-tallest);
background-color: var(--a-warning-fade);
& {
width: calc(100% - 20px);
margin-top: 15px;
margin-bottom: 20px;
padding: 10px;
color: var(--a-warning-dark);
font-size: var(--a-type-large);
text-align: left;
line-height: var(--a-line-tallest);
background-color: var(--a-warning-fade);
}
}
.apos-import-duplicate__section {
@include type-base;
display: flex;
flex-direction: column;
align-items: baseline;
max-height: 210px;
overflow-y: auto;
& {
display: flex;
flex-direction: column;
align-items: baseline;
max-height: 210px;
overflow-y: auto;
}
}
.apos-import-duplicate__section thead {
Expand Down
36 changes: 22 additions & 14 deletions ui/apos/components/AposExportModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -341,27 +341,33 @@ export default {
.apos-export__heading {
@include type-title;
line-height: var(--a-line-tall);
margin: 0;
text-transform: capitalize;
& {
line-height: var(--a-line-tall);
margin: 0;
text-transform: capitalize;
}
}
.apos-export__description {
@include type-base;
margin-top: 5px;
font-size: var(--a-type-large);
text-align: left;
line-height: var(--a-line-tallest);
& {
margin-top: 5px;
font-size: var(--a-type-large);
text-align: left;
line-height: var(--a-line-tallest);
}
}
.apos-export__section {
@include type-base;
display: flex;
flex-direction: column;
align-items: baseline;
min-width: 100%;
& {
display: flex;
flex-direction: column;
align-items: baseline;
min-width: 100%;
}
}
.apos-export__section-container {
Expand All @@ -371,9 +377,11 @@ export default {
.apos-export__settings {
@include type-base;
margin-top: 20px;
color: var(--a-base-3);
font-weight: 600;
& {
margin-top: 20px;
color: var(--a-base-3);
font-weight: 600;
}
}
.apos-export__settings-row {
Expand Down
18 changes: 12 additions & 6 deletions ui/apos/components/AposImportModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -184,22 +184,28 @@ export default {
&__heading {
@include type-title;
line-height: var(--a-line-tall);
margin: 0;
& {
line-height: var(--a-line-tall);
margin: 0;
}
}
&__warning {
@include type-small;
max-width: 348px;
padding: 10px;
& {
max-width: 348px;
padding: 10px;
}
}
&__description {
@include type-base;
max-width: 370px;
line-height: var(--a-line-tallest);
& {
max-width: 370px;
line-height: var(--a-line-tallest);
}
}
&__file {
Expand Down

0 comments on commit 0d4f435

Please sign in to comment.