Skip to content

Commit 32dbf26

Browse files
finnlewismillnut
andauthored
Fix some es lint issues with npx eslint@8 --ext .js --resolve-plugins… (#215)
* Fix some es lint issues with npx eslint@8 --ext .js --resolve-plugins-relative-to=./web/core --fix web/modules/contrib/localgov_paragraphs/ * Fix es lint styleline errors with npx stylelint --ignore-path web/core/.stylelintignore --config web/core/.stylelintrc.json --fix web/modules/contrib/localgov_paragraphs/**/*.css * Fix css with stylelint and js with eslint. * Refactor localgov-accordion.js to address eslint errors. * Remove old compiled localgov-tabs.js and rename localgov-tabs.es6.js to localgov-tabs.js. * Refactor localgov-accordion.js to fix eslint errors. * Refactor localgov-accordion.js based on feedback from @ruperj :) * Use commit from offic_hours dev branch to fix failing phpunit test. * Pin office_hours to 27be616c to address php failures. * revert: office hours back to release tag --------- Co-authored-by: Lee Mills <8024370+millnut@users.noreply.github.com>
1 parent 7717bda commit 32dbf26

File tree

11 files changed

+249
-454
lines changed

11 files changed

+249
-454
lines changed

modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
.layout--fourcol-25-25-25-25 {
77
--lgd-page-section-gap: 0;
8+
89
display: grid;
910
grid-template-columns: 1fr;
1011
gap: var(--lgd-page-section-gap);

modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
.layout--threecol-33-34-33 {
77
--lgd-page-section-gap: 0;
8+
89
display: grid;
910
grid-template-columns: 1fr;
1011
gap: var(--lgd-page-section-gap);
@@ -16,7 +17,7 @@
1617
}
1718

1819
@media screen and (min-width: 40em) {
19-
.layout--threecol-33-34-33 {
20+
.layout--threecol-33-34-33 {
2021
/*
2122
If you need to add some gap between items here, you can set the
2223
--lgd-page-section-gap variable to whatever gap size you need.

modules/localgov_paragraphs_layout/layouts/twocol/twocol.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
.layout--twocol {
77
--lgd-page-section-gap: 0;
8+
89
display: grid;
910
grid-template-columns: 1fr;
1011
gap: var(--lgd-page-section-gap);

modules/localgov_subsites_paragraphs/css/localgov-accordion.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010

1111
.accordion-pane__title button[hidden] {
12-
display: none;
12+
display: none;
1313
}
1414

1515
.accordion--initialised .accordion-pane__content {

modules/localgov_subsites_paragraphs/css/localgov-box-links-listing.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
/* 'Grid' theme. */
1212
.box-links-listing--grid .box-links-listing__list-item {
13-
border: 1px solid #f2f2f2;
1413
margin: 0 -1px -1px 0;
1514
padding: 20px;
15+
border: 1px solid #f2f2f2;
1616
}
1717

1818
/* 'Boxes' theme. */

modules/localgov_subsites_paragraphs/css/localgov-media-with-text.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
.media-with-text--featured {
7-
background-color: #fafafa;
87
border: 1px solid #ccc;
8+
background-color: #fafafa;
99
}
1010

1111
.media-with-text--featured .media-with-text__body {
@@ -45,7 +45,7 @@
4545

4646
.media-with-text--media-left .media-with-text__body,
4747
.media-with-text--media-right .media-with-text__body {
48-
width: 100%
48+
width: 100%;
4949
}
5050

5151
.media-with-text--media-left .media-with-text__body {

modules/localgov_subsites_paragraphs/css/localgov-subsites-paragraphs.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
padding-right: 5px;
1313
}
1414
.paragraph--type--page-section .layout--threecol-33-34-33 .layout__region--second {
15-
padding-left: 5px;
1615
padding-right: 5px;
16+
padding-left: 5px;
1717
}
1818
.paragraph--type--page-section .layout--threecol-33-34-33 .layout__region--third {
1919
padding-left: 5px;
2020
}
2121

2222
/* Call out box */
2323
.call-out-box {
24-
background-position: center;
24+
padding: 10px;
2525
background-repeat: no-repeat;
26+
background-position: center;
2627
background-size: cover;
27-
padding: 10px;
2828
}
2929

3030
/* Fact box */
@@ -34,4 +34,3 @@
3434
.fact-box p {
3535
text-align: center;
3636
}
37-

modules/localgov_subsites_paragraphs/css/localgov-tabs.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
}
55

66
.tabs--initialised .tab-panel--active {
7-
border: 1px solid #ddd;
87
display: block;
8+
border: 1px solid #ddd;
99
}
1010

1111
.tabs--initialised .tabs__controls {
1212
display: flex;
13-
list-style: none;
1413
margin: 0;
1514
padding: 0;
15+
list-style: none;
1616
}
1717

1818
.tabs--initialised .tabs__controls li {
1919
margin: 0;
2020
}
2121

2222
.tabs--initialised .tabs__controls button {
23-
background: #eee;
24-
border: 1px solid #ddd;
2523
position: relative;
2624
top: 1px;
25+
border: 1px solid #ddd;
26+
background: #eee;
2727
}
2828

2929
.tabs--initialised .tabs__controls [aria-selected="true"] {
30-
background-color: #fff;
3130
border-bottom-color: #fff;
31+
background-color: #fff;
3232
}

0 commit comments

Comments
 (0)