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.

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

Update [email protected], @eslint/[email protected], [email protected], [email protected], [email protected], [email protected] #8627

Merged
merged 5 commits into from
Nov 5, 2024
Merged
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
3 changes: 1 addition & 2 deletions cfgov/hmda/jinja2/hmda/hmda-explorer-controls.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
<div class="content-l">
{{ _render_filter_fields(form) }}
<div class="content-l__col
content-l__col-1
m-btn-group">
content-l__col-1">
<input class="a-btn"
type="submit"
value="Search">
Expand Down
16 changes: 9 additions & 7 deletions cfgov/tccp/jinja2/tccp/includes/filter_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,15 @@

{{ render_form_fields(form) }}

<div class="content-l__col content-l__col-1 m-btn-group">
<button type="submit" class="a-btn" title="Apply filters">
Apply filters
</button>
<a class="a-btn a-btn--link a-btn--warning" href="{{ request.path }}">
Clear filters
</a>
<div class="content-l__col content-l__col-1">
<div class="m-btn-group">
<button type="submit" class="a-btn" title="Apply filters">
Apply filters
</button>
<a class="a-btn a-btn--link a-btn--warning" href="{{ request.path }}">
Clear filters
</a>
</div>
</div>
</div>
</form>
Expand Down
1 change: 0 additions & 1 deletion cfgov/v1/jinja2/v1/includes/blocks/email-signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ <h2 class="{{ 'm-slug-header__heading' if value.default_heading else 'h3' }} ">
</p>
{% endif %}

{# TODO: DRY this up so we don't repeat the m-btn-group and privacy link #}
{% if value.url is not none %}
<div class="o-email-signup__buttons">
<a class="a-btn"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,16 @@
<div class="content-l">
{{ _render_filter_fields(value, form) }}
<div class="content-l__col
content-l__col-1
m-btn-group">
<button class="a-btn" type="submit">
Apply filters
</button>
<a class="a-btn a-btn--link a-btn--warning"
href="{{ request.path }}">
Clear filters
</a>
content-l__col-1">
<div class="m-btn-group">
<button class="a-btn" type="submit">
Apply filters
</button>
<a class="a-btn a-btn--link a-btn--warning"
href="{{ request.path }}">
Clear filters
</a>
</div>
</div>
</div>
</form>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed npm-packages-offline-cache/@eslint-js-9.13.0.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/@eslint-js-9.14.0.tgz
Binary file not shown.
Binary file not shown.
Binary file removed npm-packages-offline-cache/axe-core-4.10.0.tgz
Binary file not shown.
Binary file removed npm-packages-offline-cache/cypress-13.14.2.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/cypress-13.15.1.tgz
Binary file not shown.
Binary file removed npm-packages-offline-cache/eslint-9.13.0.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/eslint-9.14.0.tgz
Binary file not shown.
Binary file removed npm-packages-offline-cache/form-data-2.3.3.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/form-data-4.0.1.tgz
Binary file not shown.
Binary file removed npm-packages-offline-cache/http-signature-1.3.6.tgz
Binary file not shown.
Binary file not shown.
Binary file removed npm-packages-offline-cache/qs-6.10.4.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/qs-6.13.0.tgz
Binary file not shown.
Binary file not shown.
Binary file added npm-packages-offline-cache/tldts-6.1.57.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/tldts-core-6.1.57.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/tough-cookie-5.0.0.tgz
Binary file not shown.
Binary file added npm-packages-offline-cache/tree-kill-1.2.2.tgz
Binary file not shown.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@cfpb/browserslist-config": "0.0.3",
"@cfpb/cfpb-analytics": "0.3.2",
"@cfpb/cfpb-design-system": "3.2.3",
"@cfpb/cfpb-design-system": "3.2.8",
"@csstools/postcss-sass": "5.1.1",
"@csstools/sass-import-resolve": "1.0.0",
"autoprefixer": "10.4.20",
Expand All @@ -35,12 +35,12 @@
},
"devDependencies": {
"@cypress/skip-test": "2.6.1",
"@eslint/js": "9.13.0",
"axe-core": "4.10.0",
"cypress": "13.14.2",
"@eslint/js": "9.14.0",
"axe-core": "4.10.2",
"cypress": "13.15.1",
"cypress-axe": "1.5.0",
"cypress-fail-fast": "7.1.1",
"eslint": "9.13.0",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"eslint-plugin-import": "2.31.0",
Expand All @@ -56,7 +56,7 @@
"postcss-replace": "2.0.1",
"postcss-scss": "4.0.9",
"prettier": "3.3.3",
"snyk": "1.1293.1",
"snyk": "1.1294.0",
"source-map": "0.7.4",
"stylelint": "16.10.0",
"stylelint-config-standard-scss": "13.1.0"
Expand Down
13 changes: 7 additions & 6 deletions test/unit_tests/js/organisms/FilterableListControls-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,13 @@ const HTML_SNIPPET = `
</div>

<div class="content-l__col
content-l__col-1
m-btn-group">
<input class="a-btn" type="submit" value="Apply filters">
<a class="a-btn a-btn--link a-btn--warning" href="/about-us/blog/">
Clear filters
</a>
content-l__col-1">
<div class="m-btn-group">
<input class="a-btn" type="submit" value="Apply filters">
<a class="a-btn a-btn--link a-btn--warning" href="/about-us/blog/">
Clear filters
</a>
</div>
</div>
</div>
</form>
Expand Down
Loading
Loading