Skip to content

Commit

Permalink
Revert "Fix Popover component; add skiplink (#8732)"
Browse files Browse the repository at this point in the history
This reverts commit b084419.
  • Loading branch information
mel-miller committed Oct 11, 2023
1 parent b084419 commit 8da767a
Show file tree
Hide file tree
Showing 37 changed files with 289 additions and 307 deletions.
2 changes: 1 addition & 1 deletion gatsby-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "./node_modules/@pantheon-systems/pds-toolkit-react/_dist/css/pds-compone

// Global styles
import "./src/styles/main.css"
import "./src/styles/pds-additions.css"
import "./src/styles/hacks.css"

// custom typefaces
import "prismjs/themes/prism-okaidia.css"
Expand Down
106 changes: 98 additions & 8 deletions package-lock.json

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

2 changes: 0 additions & 2 deletions source/data/landings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,6 @@
- title: "Guides"
subtitle: ""
path: "guides"
footer_border: true
guides:
- title: ""
type: "normal"
Expand Down Expand Up @@ -1167,7 +1166,6 @@
- title: "Account Management at Pantheon"
subtitle: "Learn how to set up your teams, use your dashboards, and how billing works. You should be able to comfortably develop an organization plan and administer your Pantheon platform after reading these guides."
path: "manage"
footer_border: true
guides:
- title: ""
type: "normal"
Expand Down
6 changes: 1 addition & 5 deletions src/components/card/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ const Card = ({ title, isOfficial, author, authorLink, link, children }) => {
</div>

<div className="plugin-card__link">
<a
href={link}
target="_blank"
className="pds-button pds-button--secondary"
>
<a href={link} target="_blank" className="pds-button">
Get plugin
<Icon
iconName="externalLink"
Expand Down
6 changes: 5 additions & 1 deletion src/components/headerBody/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ const HeaderBody = ({
{lastReviewed}
</time>
</p> */}
{!subtitle && <h1 className="docs-title">{title}</h1>}
{!subtitle && (
<h1 className="docs-title" id="docs-main">
{title}
</h1>
)}

{subtitle && <h1>{subtitle}</h1>}

Expand Down
20 changes: 11 additions & 9 deletions src/components/navButtons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,26 @@ const NavButtons = ({
justifyContent="between"
className="pds-spacing-mar-block-start-m pds-spacing-mar-block-end-xl"
>
<ul className="pagination pager-guides">
{prev && (
<li className="pagination__prev">
{prev && (
<ul className="pagination pager-guides">
<li>
<Link to={prev} rel="prev" className="pds-button">
<Icon iconName="angleLeft"></Icon>
{prevTitle}
</Link>
</li>
)}
{next && (
<li className="pagination__next">
<Link to={next} rel="next" className="pds-button">
</ul>
)}
{next && (
<ul className="pagination pager-guides">
<li>
<Link to={next} rel="prev" className="pds-button">
{nextTitle}
<Icon iconName="angleRight"></Icon>
</Link>
</li>
)}
</ul>
</ul>
)}
</FlexContainer>
)
}
Expand Down
7 changes: 0 additions & 7 deletions src/components/navButtons/style.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
ul.pagination {
list-style-type: none;
padding: 0;
display: flex;
justify-content: flex-end;
width: 100%;
}

ul.pagination:has(li.pagination__prev) {
justify-content: space-between;
}
70 changes: 30 additions & 40 deletions src/components/navbar/index.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,40 @@
import React from "react"
import NavbarItem from "../navbarItem"

import { ExpansionPanel } from "@pantheon-systems/pds-toolkit-react"

import "./style.css"

const Navbar = ({ title, items, activePage }) => {
const menu = (
<ul id="manual-guide-toc" className="manual-guide-toc__menu">
{items.map((item) => {
return (
<NavbarItem
key={`${item.id}-item-key`}
item={item}
activePage={activePage}
/>
)
})}
</ul>
)

return (
<>
{/* Mobile nav */}
<nav
className="manual-guide-toc guide-nav--mobile"
aria-labelledby="guide-nav"
<nav className="manual-guide-toc" aria-labelledby="guide-nav">
<button
type="button"
className="navbar-toggle"
data-toggle="collapse"
data-target="#guide-collapse"
data-original-title=""
title=""
>
<ExpansionPanel
items={[{ label: title, content: menu }]}
className="guide-nav__expansion-panel"
/>
</nav>

{/* Desktop/default nav */}
<nav
className="manual-guide-toc guide-nav--default"
aria-labelledby="guide-nav"
>
<h2 id="guide-nav" className="manual-guide-toc__heading">
{title}
</h2>

{items && menu}
</nav>
</>
<span className="sr-only">Toggle navigation</span>
<i className="fa fa-bars" />
</button>
<h2 id="guide-nav" className="manual-guide-toc__heading">
{title}
</h2>
<div className="collapse navbar-collapse" id="guide-collapse">
{items && (
<ul id="manual-guide-toc" className="manual-guide-toc__menu">
{items.map((item) => {
return (
<NavbarItem
key={`${item.id}-item-key`}
item={item}
activePage={activePage}
/>
)
})}
</ul>
)}
</div>
</nav>
)
}

Expand Down
Loading

0 comments on commit 8da767a

Please sign in to comment.