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

Page navigation 2.2.3 #1016

Merged
merged 2 commits into from
Jun 4, 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
4 changes: 4 additions & 0 deletions components/page-navigation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Page navigation changelog

## 2.2.3

- Updated css to include aside selector.

## 2.2.2

- Removed redundant package-lock.json (due to workspaces config in monorepo). This fixes vulnerability in the npm `ip` package.
Expand Down
4 changes: 2 additions & 2 deletions components/page-navigation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Do not use this component to replace or duplicate site navigation.
## Demo and sample markup

```html preview
<sidebar>
<aside>
<cagov-page-navigation data-selector=".main" data-type="wordpress" data-label="On this page"></cagov-page-navigation>
</sidebar>
</aside>

<div class="main">
<h2>First heading</h2>
Expand Down
2 changes: 1 addition & 1 deletion components/page-navigation/dist/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var styles =
'/* PAGE NAVIGATION */\nsidebar cagov-page-navigation .label {\n font-weight: 700;\n font-size: 24px;\n line-height: 28.2px;\n padding: 0;\n margin: 0;\n padding-bottom: 16px;\n}\n\nsidebar cagov-page-navigation ul,\nsidebar cagov-page-navigation ol:not([class*=menu]):not([class*=nav]):not([class*=footer-links]),\nsidebar cagov-page-navigation ul:not([class*=menu]):not([class*=nav]):not([class*=footer-links]) {\n margin: 0;\n text-indent: 0;\n padding: 0;\n}\n\nsidebar cagov-page-navigation ul li {\n padding-top: 14px;\n padding-bottom: 18px;\n margin-left: 0;\n margin-top: 0px;\n margin-bottom: 0px;\n border-bottom: 1px solid var(--gray-300, #e1e0e3);\n line-height: 28.2px;\n list-style: none;\n}\nsidebar cagov-page-navigation ul li:first-child {\n border-top: 1px solid var(--gray-300, #e1e0e3);\n}\nsidebar cagov-page-navigation ul li a {\n text-decoration: none;\n}\nsidebar cagov-page-navigation ul li a:hover {\n text-decoration: underline;\n}\n\n@media only screen and (max-width: 992px) {\n cagov-page-navigation .label {\n display: none;\n }\n .sidebar-container {\n display: block;\n width: 100%;\n max-width: 100%;\n }\n cagov-page-navigation ul li a {\n font-size: 16px;\n line-height: 24px;\n }\n}\n\n/*# sourceMappingURL=index.css.map */\n';
'/* PAGE NAVIGATION */\naside cagov-page-navigation .label, sidebar cagov-page-navigation .label {\n font-weight: 700;\n font-size: 24px;\n line-height: 28.2px;\n padding: 0;\n margin: 0;\n padding-bottom: 16px;\n}\n\naside cagov-page-navigation ul, sidebar cagov-page-navigation ul,\naside cagov-page-navigation ol:not([class*=menu]):not([class*=nav]):not([class*=footer-links]),\naside cagov-page-navigation ul:not([class*=menu]):not([class*=nav]):not([class*=footer-links]),\nsidebar cagov-page-navigation ol:not([class*=menu]):not([class*=nav]):not([class*=footer-links]),\nsidebar cagov-page-navigation ul:not([class*=menu]):not([class*=nav]):not([class*=footer-links]) {\n margin: 0;\n text-indent: 0;\n padding: 0;\n}\n\naside cagov-page-navigation ul li, sidebar cagov-page-navigation ul li {\n padding-top: 14px;\n padding-bottom: 18px;\n margin-left: 0;\n margin-top: 0px;\n margin-bottom: 0px;\n border-bottom: 1px solid var(--gray-300, #e1e0e3);\n line-height: 28.2px;\n list-style: none;\n}\naside cagov-page-navigation ul li:first-child, sidebar cagov-page-navigation ul li:first-child {\n border-top: 1px solid var(--gray-300, #e1e0e3);\n}\naside cagov-page-navigation ul li a, sidebar cagov-page-navigation ul li a {\n text-decoration: none;\n}\naside cagov-page-navigation ul li a:hover, sidebar cagov-page-navigation ul li a:hover {\n text-decoration: underline;\n}\n\n@media only screen and (max-width: 992px) {\n cagov-page-navigation .label {\n display: none;\n }\n .aside-container, .sidebar-container {\n display: block;\n width: 100%;\n max-width: 100%;\n }\n cagov-page-navigation ul li a {\n font-size: 16px;\n line-height: 24px;\n }\n}\n\n/*# sourceMappingURL=index.css.map */\n';

/**
* Page Navigation web component
Expand Down
16 changes: 9 additions & 7 deletions components/page-navigation/index.css

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

2 changes: 1 addition & 1 deletion components/page-navigation/index.css.map

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

10 changes: 7 additions & 3 deletions components/page-navigation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cagov/ds-page-navigation",
"version": "2.2.2",
"version": "2.2.3",
"description": "",
"main": "dist/index.js",
"type": "module",
Expand All @@ -20,10 +20,14 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@open-wc/testing": "^3.0.1",
"@web/test-runner-puppeteer": "^0.10.2"
"@open-wc/testing": "^2.5.33",
"@web/test-runner-puppeteer": "^0.7.3"
},
"dependencies": {
"@cagov/11ty-build-system": "0.1.3",
"@web/dev-server": "0.0.6",
"@web/test-runner": "0.10.2",
"@web/test-runner-playwright": "0.6.6",
"rollup-plugin-import-css": "^3.0.2"
}
}
10 changes: 6 additions & 4 deletions components/page-navigation/src/index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* PAGE NAVIGATION */
sidebar cagov-page-navigation .label {
aside cagov-page-navigation .label, sidebar cagov-page-navigation .label {
font-weight: 700;
font-size: 24px;
line-height: 28.2px;
Expand All @@ -8,15 +8,17 @@ sidebar cagov-page-navigation .label {
padding-bottom: 16px;
}

sidebar cagov-page-navigation ul,
aside cagov-page-navigation ul, sidebar cagov-page-navigation ul,
aside cagov-page-navigation ol:not([class*="menu"]):not([class*="nav"]):not([class*="footer-links"]),
aside cagov-page-navigation ul:not([class*="menu"]):not([class*="nav"]):not([class*="footer-links"]),
sidebar cagov-page-navigation ol:not([class*="menu"]):not([class*="nav"]):not([class*="footer-links"]),
sidebar cagov-page-navigation ul:not([class*="menu"]):not([class*="nav"]):not([class*="footer-links"]) {
margin: 0;
text-indent: 0;
padding: 0;
}

sidebar cagov-page-navigation ul li {
aside cagov-page-navigation ul li, sidebar cagov-page-navigation ul li {
padding-top: 14px;
padding-bottom: 18px;
margin-left: 0;
Expand All @@ -42,7 +44,7 @@ sidebar cagov-page-navigation ul li {
display: none;
}

.sidebar-container {
.aside-container, .sidebar-container {
display: block;
width: 100%;
max-width: 100%;
Expand Down
Loading