Skip to content
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

Jump to bottom

Update prettier, eslint-plugin-prettier, and stylelint-prettier #12085

Merged
merged 4 commits into from
Mar 26, 2024
Merged

Update prettier, eslint-plugin-prettier, and stylelint-prettier #12085

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8899833
update prettier, eslint-plugin-prettier, and stylelint-prettier
mmmavis Mar 21, 2024
5c1eb2e
adjust linting rules
mmmavis Mar 22, 2024
0362a9e
scss linting
mmmavis Mar 22, 2024
f7b227f
Merge branch 'main' into update-prettier-etc
mmmavis Mar 26, 2024
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
1 change: 1 addition & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"prettier/prettier": [
"error",
{
"trailingComma": "es5",
"endOfLine": "auto"
}
],
Expand Down
128 changes: 98 additions & 30 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
"chokidar-cli": "^3.0.0",
"eslint": "^8.57.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.1.3",
mmmavis marked this conversation as resolved.
Show resolved Hide resolved
"eslint-plugin-react": "^7.34.1",
"optipng-bin": "^9.0.0",
"prettier": "^2.8.8",
"prettier": "^3.2.5",
"stylelint": "^15.10.2",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^3.0.0",
"stylelint-prettier": "^4.1.0",
mmmavis marked this conversation as resolved.
Show resolved Hide resolved
"svgo": "^3.0.2",
"wait-on": "^7"
}
Expand Down
4 changes: 2 additions & 2 deletions source/js/buyers-guide/search/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ export class Utils {
return propertyNameA < propertyNameB
? -1
: propertyNameA > propertyNameB
? 1
: 0;
? 1
: 0;
}
}
});
Expand Down
32 changes: 25 additions & 7 deletions source/sass/components/primary-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,16 @@
opacity: 0;
transform: translateY(8px);
visibility: hidden;
transition: opacity 0.15s, transform 0.15s, visibility 0s linear 0.15s;
transition:
opacity 0.15s,
transform 0.15s,
visibility 0s linear 0.15s;
}

transition: opacity 0.15s, transform 0.15s, visibility 0s;
transition:
opacity 0.15s,
transform 0.15s,
visibility 0s;
}

.burger {
Expand Down Expand Up @@ -164,7 +170,10 @@
width: 23px;
}

transition: top 0.1s linear 0.1s, width 0.1s linear 0.1s, transform 0.1s;
transition:
top 0.1s linear 0.1s,
width 0.1s linear 0.1s,
transform 0.1s;
}

&.menu-open {
Expand All @@ -185,7 +194,10 @@
transform: rotate(45deg);
}

transition: top 0.1s, width 0.1s, transform 0.1s linear 0.1s;
transition:
top 0.1s,
width 0.1s,
transform 0.1s linear 0.1s;
}
}

Expand Down Expand Up @@ -236,13 +248,17 @@
top: 0;
left: 0;
width: 100%;
transition: opacity 0.2s, height 0s;
transition:
opacity 0.2s,
height 0s;

&.hidden {
opacity: 0;
height: 0;
overflow: hidden;
transition: opacity 0.2s, height 0s linear 0.2s;
transition:
opacity 0.2s,
height 0s linear 0.2s;

.nav-links {
a {
Expand Down Expand Up @@ -292,7 +308,9 @@
opacity: 0;
height: 0;
overflow-y: hidden;
transition: height 0.3s ease-in-out, opacity 0.2s ease-in-out;
transition:
height 0.3s ease-in-out,
opacity 0.2s ease-in-out;

@media (min-width: $bp-lg) {
opacity: 1;
Expand Down
4 changes: 3 additions & 1 deletion source/sass/components/sticky-cta.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
margin-bottom: -308px;
visibility: hidden;
pointer-events: auto;
transition: margin-bottom 0.3s ease-in-out, visibility 0s ease-in-out 0.3s;
transition:
margin-bottom 0.3s ease-in-out,
visibility 0s ease-in-out 0.3s;
}

@media (min-width: $bp-lg) {
Expand Down
11 changes: 8 additions & 3 deletions source/sass/formassembly-override.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ $input-font-size: 1.25rem !important;
padding: 0.5rem 1rem;
font-size: 18px;
border-radius: 0;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out,
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out,
-webkit-box-shadow 0.15s ease-in-out;
color: $white;
background-color: $blue;
Expand Down Expand Up @@ -185,7 +188,9 @@ $input-font-size: 1.25rem !important;
height: auto !important;

&::file-selector-button {
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out;
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out;
font-family: $font-family-sans-serif;
background: $light-blue;
width: auto;
Expand Down
Loading
Loading