Skip to content

Commit

Permalink
Merge pull request #8476 from cfpb/ans_ccdb_update
Browse files Browse the repository at this point in the history
Update to CCDB 2.12.0
  • Loading branch information
anselmbradford authored Jun 14, 2024
2 parents 2f2e726 + 25b2517 commit bcd2c6c
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 6 deletions.
17 changes: 16 additions & 1 deletion cfgov/unprocessed/apps/ccdb-search/css/main.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
@import url('../node_modules/@cfpb/ccdb5-ui/dist/ccdb5.css');
@import (reference) 'cfpb-core.less';

// TODO: !important's are added for styles that are overriding ccdb5-ui styles.
// TODO: CCDB requires a number of undesirable overrides here, since it imports
// the DS into its codebase independent of the import that happens for the
// rest of the site. In the future we should explore better encapsulation
// approaches for injecting the CCDB app into a page,
// such as making it a web component.

// !important's are added for styles that are overriding ccdb5-ui styles.
.wrapper {
max-width: 1200px !important;
}
Expand All @@ -14,6 +20,15 @@
}
}

// This is needed because the base DS styles set ul:last-child to have a
// bottom margin of zero, which then gets overridden by the mega menu.
// However, CCDB also imports the DS into it's cold, so it overrides the
// mega menu override and brings the ul:last-child back to having no bottom
// margin. This causes the mega menu to lose a gap between featured menu items.
.o-mega-menu__content-2-list--featured ul {
margin-bottom: unit(30px / @base-font-size-px, em);
}

.ccdb-search {
width: 100vw !important;
max-width: 100vw;
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion cfgov/unprocessed/apps/ccdb-search/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"url": "https://cfpb.github.io/"
},
"dependencies": {
"@cfpb/ccdb5-ui": "2.11.5"
"@cfpb/ccdb5-ui": "2.12.0"
},
"repository": {
"type": "git",
Expand Down
8 changes: 4 additions & 4 deletions cfgov/unprocessed/apps/ccdb-search/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# yarn lockfile v1


"@cfpb/ccdb5-ui@2.11.5":
version "2.11.5"
resolved "https://registry.yarnpkg.com/@cfpb/ccdb5-ui/-/ccdb5-ui-2.11.5.tgz#b05928ca47f864dac5b9f4024a8827eed5e1a074"
integrity sha512-G538IY0NhpBbvHo/XFfzNqeSBAjlUHiJnqdkGea+RK9FNaLMx1AVs8e3CM3i3isLZSTok40kmUBAxRKJwEzDDQ==
"@cfpb/ccdb5-ui@2.12.0":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@cfpb/ccdb5-ui/-/ccdb5-ui-2.12.0.tgz#9f36aad7d2e12f9702c9cf85465060a74e320502"
integrity sha512-dMg2njbZgaMgAipbMtkDLXcyXX0bMfvYd2qIUFjnsB8KevtfXDCc0VqeyOjXk05t30zqdXT+EDeGESR8nlWX+A==

0 comments on commit bcd2c6c

Please sign in to comment.