Skip to content
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: 2 additions & 2 deletions site/components/CodeBlock.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import classnames from 'classnames';
import SyntaxHighlighter from 'react-syntax-highlighter';
import { docco } from 'react-syntax-highlighter/dist/esm/styles/hljs';
import { a11yLight } from 'react-syntax-highlighter/dist/esm/styles/hljs';

function CodeBlock({ children, language = 'html', full = false, wrap = false }) {
var fullClass = classnames({ 'is-code-full': full });
var codeClass = classnames({ code: true, 'code-wrap': wrap });
return (
<div className={fullClass}>
<div className={codeClass}>
<SyntaxHighlighter language={language} style={docco} wrapLongLines={full}>{children}</SyntaxHighlighter>
<SyntaxHighlighter language={language} style={a11yLight} wrapLongLines={full}>{children}</SyntaxHighlighter>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion site/components/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Link from '@docusaurus/Link';
function Menu() {
return (
<>
<a href="#menu" id="menuLink" className="menu-link">
<a href="#menu" id="menuLink" className="menu-link" aria-label="Menu" aria-controls="menu" aria-expanded="false">
<span></span>
</a>

Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/buttons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ function Buttons() {
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.button-success {
background: rgb(28, 184, 65); /* this is a green */
background: rgb(21, 135, 48); /* this is a green */
}
.button-error {
background: rgb(202, 60, 60); /* this is a maroon */
}
.button-warning {
background: rgb(223, 117, 20); /* this is an orange */
background: rgb(180, 94, 16); /* this is an orange */
}
.button-secondary {
background: rgb(66, 184, 221); /* this is a light blue */
background: rgb(28, 126, 157); /* this is a blue */
}
`}} />
<button className="button-success pure-button">Success Button</button>
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/forms/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ function Forms() {

<Example>
<form className="pure-form">
<input type="text" value="Readonly input here..." readOnly />
<input type="text" value="Readonly input here..." aria-label="Read-only example" readOnly />
</form>
</Example>

Expand All @@ -268,7 +268,7 @@ function Forms() {

<Example>
<form className="pure-form">
<input type="text" className="pure-input-rounded" />
<input type="text" className="pure-input-rounded" aria-label="Search" />
<button type="submit" className="pure-button">Search</button>
</form>
</Example>
Expand Down
40 changes: 23 additions & 17 deletions site/src/pages/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ a.button-secondary {
}

a.button-cta {
background: #1f8dd6;
background: #1a75b3;
color: #fff;
border: 1px solid #1f8dd6;
border: 1px solid #1a75b3;
}

a.button-secondary {
Expand Down Expand Up @@ -91,40 +91,46 @@ a.size-chart-item {
}

.size-chart-base {
background: #1f8dd6;
background: #1a75b3;
}
.size-chart-base .size-chart-size {
color: rgb(103, 194, 240);
color: #fff;
}

.size-chart-grids {
background: rgb(128, 88, 165);
}
.size-chart-grids .size-chart-size {
color: rgb(200, 131, 255);
color: #fff;
}

.size-chart-forms {
background: #5eb95e;
}
/* Dark text on the lighter colors keeps the labels readable. */
.size-chart-forms a.size-chart-item,
.size-chart-menus a.size-chart-item,
.size-chart-tables a.size-chart-item {
color: #222;
}

.size-chart-forms .size-chart-size {
color: rgb(161, 240, 137);
color: #222;
}

.size-chart-buttons {
background: #dd514c;
background: #d83933;
}

.size-chart-buttons .size-chart-size {
color: rgb(236, 164, 154);
color: #fff;
}

.size-chart-menus {
background: rgb(250, 210, 50);
}
.size-chart-menus .size-chart-size {
color: rgb(255, 240, 134);
color: #222;
}

.size-chart-tables {
Expand All @@ -134,7 +140,7 @@ a.size-chart-item {
margin-left: -0.5em;
}
.size-chart-tables .size-chart-size {
color: rgb(255, 190, 129);
color: #222;
}

.marketing {
Expand Down Expand Up @@ -176,12 +182,12 @@ a.size-chart-item {

.button-a {
background: #e1f2fa;
color: #5992aa;
color: #447184;
}

.button-b {
background: #fcebbd;
color: #af9540;
color: #7b682d;
}

.button-c,
Expand All @@ -202,25 +208,25 @@ a.size-chart-item {
}
.button-d {
background: #d3eda3;
color: #72962e;
color: #526c21;
}

.button-e {
background: #f5ab9e;
color: #8c3a2b;
color: #7e3427;
}
.button-f {
background: #ddaeff;
color: #8156a7;
color: #5f3f7b;
}

.button-g {
background: #f57b00;
color: #ffca95;
color: #222;
}

.button-h {
background: #008ed4;
background: #007bb7;
color: #fff;
}
.sample-button .button-h {
Expand Down
6 changes: 2 additions & 4 deletions site/src/pages/tools/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ function Tools() {
</p>

<ul>
<li><code>getFile(name)</code></li>
&ndash; Retrieve contents of a Pure module file.
<li><code>getFilePath(name)</code></li>
&ndash; Return full path to a Pure file.
<li><code>getFile(name)</code> &ndash; Retrieve contents of a Pure module file.</li>
<li><code>getFilePath(name)</code> &ndash; Return full path to a Pure file.</li>
</ul>

<SectionHeader heading="Installing Pure with Composer" />
Expand Down
4 changes: 2 additions & 2 deletions site/src/theme/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ function Layout(props) {
</Head>
<div id="layout">
<Menu />
<div id="main" className={(title || 'home').toLowerCase()}>
<main id="main" className={(title || 'home').toLowerCase()}>
{children}
<Footer siteConfig={siteConfig} />
</div>
</main>
</div>
</>
);
Expand Down
27 changes: 20 additions & 7 deletions site/static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ html, button, input, select, textarea,
body {
min-width: 320px;
background-color: #fff;
color: #777;
color: #666;
line-height: 1.6;
}

Expand All @@ -42,14 +42,22 @@ h4 {
}

a {
color: #3b8bba; /* block-background-text-normal */
color: #31739a; /* block-background-text-normal */
text-decoration: none;
}

a:visited {
color: #265778; /* block-normal-text-normal */
}

/* Underline links in running text so they don't rely on color alone. */
p a:not(.pure-button),
li a:not(.pure-button):not(.pure-menu-link),
td a:not(.pure-button),
dd a {
text-decoration: underline;
}

dt {
font-weight: bold;
}
Expand All @@ -58,14 +66,14 @@ dd {
}

aside {
background: #1f8dd6; /* same color as selected state on site menu */
background: #1a75b3; /* same color as selected state on site menu */
margin: 1em 0;
padding: 0.3em 1em;
border-radius: 3px;
color: #fff;
}
aside a, aside a:visited {
color: rgb(169, 226, 255);
color: #fff;
}


Expand Down Expand Up @@ -146,7 +154,7 @@ aside {
.content .content-subhead {
margin: 2em 0 1em 0;
font-weight: 300;
color: #888;
color: #666;
position: relative;
}

Expand Down Expand Up @@ -261,6 +269,11 @@ code {
padding: 0;
margin-bottom: 0;
}
/* Keep footer links at least 24px tall so they're easy to tap. */
.legal-links a {
display: inline-block;
min-height: 24px;
}
.legal-copyright {
margin-top: 0;
margin-bottom: 0;
Expand Down Expand Up @@ -411,13 +424,13 @@ code {
}

#menu .pure-menu-item .active {
background: #1f8dd6;
background: #1a75b3;
color: #fff;
}

#menu li.pure-menu-item .active:hover,
#menu li.pure-menu-item .active:focus {
background: #1f8dd6;
background: #1a75b3;
}


Expand Down
2 changes: 2 additions & 0 deletions site/static/js/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
toggleClass(elements.layout, active);
toggleClass(elements.menu, active);
toggleClass(elements.menuLink, active);
elements.menuLink.setAttribute('aria-expanded',
String(elements.menu.className.indexOf(active) !== -1));
}

function handleEvent(e) {
Expand Down
Loading