Skip to content

Commit

Permalink
Merge branch 'main' into task-pagination
Browse files Browse the repository at this point in the history
* main:
  Do not upgrade eslint-plugin-react yet: jsx-eslint/eslint-plugin-react#3289
  Automated dependency upgrades
  line nested checkboxes with with labels
  fix nested accordion padding
  • Loading branch information
jgerigmeyer committed May 27, 2022
2 parents 8523c4d + 252beb9 commit db5a3f9
Show file tree
Hide file tree
Showing 4 changed files with 655 additions and 648 deletions.
34 changes: 17 additions & 17 deletions package.json
Expand Up @@ -57,7 +57,7 @@
"@sentry/browser": "^6.19.7",
"classnames": "^2.3.1",
"date-fns": "^2.28.0",
"i18next": "^21.8.3",
"i18next": "^21.8.4",
"i18next-browser-languagedetector": "^6.1.4",
"i18next-http-backend": "^1.4.0",
"js-cookie": "^3.0.1",
Expand All @@ -68,7 +68,7 @@
"react-dom": "^18.1.0",
"react-i18next": "^11.16.9",
"react-joyride": "^2.4.0",
"react-redux": "^8.0.1",
"react-redux": "^8.0.2",
"react-router-dom": "^5.3.1",
"redux": "^4.2.0",
"redux-devtools-extension": "^2.13.9",
Expand All @@ -80,17 +80,17 @@
"whatwg-fetch": "^3.6.2"
},
"devDependencies": {
"@babel/core": "^7.17.12",
"@babel/preset-env": "^7.17.12",
"@babel/core": "^7.18.0",
"@babel/preset-env": "^7.18.0",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@storybook/addon-actions": "^6.5.3",
"@storybook/addon-essentials": "^6.5.3",
"@storybook/addon-links": "^6.5.3",
"@storybook/addon-actions": "^6.5.5",
"@storybook/addon-essentials": "^6.5.5",
"@storybook/addon-links": "^6.5.5",
"@storybook/addon-postcss": "^2.0.0",
"@storybook/builder-webpack5": "^6.5.3",
"@storybook/manager-webpack5": "^6.5.3",
"@storybook/react": "^6.5.3",
"@storybook/builder-webpack5": "^6.5.5",
"@storybook/manager-webpack5": "^6.5.5",
"@storybook/react": "^6.5.5",
"@storybook/storybook-deployer": "^2.8.11",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
Expand All @@ -100,20 +100,20 @@
"@types/lodash": "^4.14.182",
"@types/react": "^18.0.9",
"@types/react-document-title": "^2.0.5",
"@types/react-dom": "^18.0.4",
"@types/react-dom": "^18.0.5",
"@types/react-router-dom": "^5.3.3",
"@types/redux-logger": "^3.0.9",
"@types/redux-mock-store": "^1.0.3",
"@typescript-eslint/eslint-plugin": "^5.25.0",
"@typescript-eslint/parser": "^5.25.0",
"@typescript-eslint/eslint-plugin": "^5.26.0",
"@typescript-eslint/parser": "^5.26.0",
"autoprefixer": "^10.4.7",
"babel-jest": "^28.1.0",
"babel-loader": "^8.2.5",
"core-js": "^3.22.5",
"core-js": "^3.22.7",
"coveralls": "^3.1.1",
"css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^4.0.0",
"eslint": "^8.15.0",
"eslint": "^8.16.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-import-resolver-webpack": "^0.13.2",
Expand All @@ -139,10 +139,10 @@
"postcss-loader": "^7.0.0",
"prettier": "^2.6.2",
"redux-mock-store": "^1.5.4",
"sass": "^1.51.0",
"sass": "^1.52.1",
"sass-loader": "^13.0.0",
"style-loader": "^3.3.1",
"stylelint": "^14.8.2",
"stylelint": "^14.8.4",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard-scss": "^3.0.0",
"stylelint-prettier": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Expand Up @@ -39,7 +39,7 @@ click==8.1.3
# via
# -c requirements/prod.txt
# black
coverage[toml]==6.3.3
coverage[toml]==6.4
# via
# coveralls
# pytest-cov
Expand Down Expand Up @@ -172,7 +172,7 @@ pytest-cov==3.0.0
# via -r requirements/dev.in
pytest-django==4.5.2
# via -r requirements/dev.in
pytest-factoryboy==2.3.0
pytest-factoryboy==2.3.1
# via -r requirements/dev.in
pytest-lazy-fixture==0.6.3
# via -r requirements/dev.in
Expand Down
34 changes: 13 additions & 21 deletions src/sass/patterns/_form-elements.scss
Expand Up @@ -19,18 +19,24 @@
}

.slds-accordion__section {
padding: $spacing-x-small $spacing-medium;
--slds-c-accordion-section-spacing-block-start: #{$spacing-x-small};
--slds-c-accordion-section-spacing-block-end: #{$spacing-x-small};
--slds-c-accordion-section-spacing-inline-start: #{$spacing-medium};
--slds-c-accordion-section-spacing-inline-end: #{$spacing-medium};
}

&.has-checkboxes {
.slds-accordion__summary {
@include icon-checkbox-layout;
.accordion-no-padding {
.slds-is-open {
.slds-accordion__section {
--slds-c-accordion-section-spacing-inline-start: #{$spacing-large};
--slds-c-accordion-section-spacing-inline-end: 0;
}
}
}

.slds-is-open {
> .slds-accordion__summary {
margin-bottom: $spacing-x-small;
&.has-checkboxes {
.slds-accordion__summary {
@include icon-checkbox-layout;
}
}

Expand All @@ -39,20 +45,6 @@
flex-grow: 1;
}
}

.accordion-no-padding {
> .slds-accordion__list-item {
> .slds-is-open {
padding: 0;

> .slds-accordion__summary {
padding-top: $spacing-x-small;
padding-left: $spacing-medium;
padding-right: $spacing-medium;
}
}
}
}
}

.metecho-nested-checkboxes {
Expand Down

0 comments on commit db5a3f9

Please sign in to comment.