Skip to content

Commit

Permalink
fix: update style sheets, a11y
Browse files Browse the repository at this point in the history
  • Loading branch information
glitchgirl committed Feb 20, 2024
1 parent 74c2dfe commit b143475
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ call_lefthook()
pnpm lefthook "$@"
elif command -v npx >/dev/null 2>&1
then
npx @evilmartians/lefthook "$@"
npx lefthook "$@"
elif swift package plugin lefthook >/dev/null 2>&1
then
swift package --disable-sandbox plugin lefthook "$@"
Expand Down
2 changes: 1 addition & 1 deletion .husky/prepare-commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ call_lefthook()
pnpm lefthook "$@"
elif command -v npx >/dev/null 2>&1
then
npx @evilmartians/lefthook "$@"
npx lefthook "$@"
elif swift package plugin lefthook >/dev/null 2>&1
then
swift package --disable-sandbox plugin lefthook "$@"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { html } from 'lit';
import { Meta, Canvas, Story } from '@storybook/addon-docs';

import { OutlineCoreBreadcrumb } from '../../../../../packages/components/outline-core-breadcrumb/src/outline-core-breadcrumb';
import { OutlineCoreBreadcrumb } from '../src/outline-core-breadcrumb';

<Meta
title="Navigation/ Core Breadcrumb"
Expand All @@ -18,7 +18,7 @@ import { OutlineCoreBreadcrumb } from '../../../../../packages/components/outlin


<outline-core-breadcrumb>
<nav>
<nav aria-label="Breadcrumb">
<ul>
<li>
<a href="#">Home</a>
Expand All @@ -29,7 +29,7 @@ import { OutlineCoreBreadcrumb } from '../../../../../packages/components/outlin
<li>
<a href="#">Our History</a>
</li>
<li>
<li aria-current="page">
The current page title
</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/** Jake, I removed your notes I promise I read them. - Morgan **/

ol,
ul {
list-style: none;
Expand Down Expand Up @@ -59,9 +57,6 @@ a {
border-radius: var(--border-radius-button-default);
outline-offset: var(--spacing-px);

@screen lg {
outline: solid 3px blue;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/** Jake, I removed your notes I promise I read them. - Morgan **/

ol,
ul {
list-style: none;
Expand Down Expand Up @@ -59,9 +57,6 @@ a {
border-radius: var(--border-radius-button-default);
outline-offset: var(--spacing-px);

@screen lg {
outline: solid 3px blue;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { html, TemplateResult, CSSResultGroup, css } from 'lit';
import { customElement } from 'lit/decorators.js';
import { AdoptedStyleSheets } from '@phase2/outline-adopted-stylesheets-controller';
import { AdoptedStylesheets } from '@phase2/outline-adopted-stylesheets-controller';
// Our base component, which all others extend.
import { OutlineElement, SlotsController } from '@phase2/outline-core';
import { OutlineElement } from '@phase2/outline-core';
import componentStyles from './outline-core-breadcrumb.css.lit';
import globalStyles from './outline-core-breadcrumb.lightdom.css.lit';
import globalStyles from './outline-core-breadcrumb.global.css?inline';
import encapsulatedStyles from './outline-core-breadcrumb.encapsulated.css?inline';

Check warning on line 8 in packages/components/outline-core-breadcrumb/src/outline-core-breadcrumb.ts

View workflow job for this annotation

GitHub Actions / Install & Lint Codebase

'encapsulatedStyles' is defined but never used
import { ResizeController } from './resize-controller';

/** The element name, reused throughout the codebase */
Expand All @@ -28,15 +29,13 @@ const componentName = 'outline-core-breadcrumb';
@customElement(componentName)
export class OutlineCoreBreadcrumb extends OutlineElement {
static styles: CSSResultGroup = [componentStyles, componentStyles, css``];
AdoptedStyleSheets: AdoptedStyleSheets;

connectedCallback() {
super.connectedCallback();
this.AdoptedStyleSheets = new AdoptedStyleSheets(globalStyles);
this.addController(this.AdoptedStyleSheets);
}

slots = new SlotsController(this);
GlobalStylesheets: AdoptedStylesheets | undefined = new AdoptedStylesheets(
this,
globalStyles
);
EncapsulatedStylesheets: AdoptedStylesheets | undefined;
// THIS NEEDS TO BE HERE FOR STORYBOOK TO WORK
debug = false;
resizeController = new ResizeController(this, {
breakpoints: [768, 1440],
});
Expand Down
55 changes: 3 additions & 52 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4111,7 +4111,7 @@ cache-content-type@^1.0.0:
mime-types "^2.1.18"
ylru "^1.2.0"

call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.6, call-bind@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
Expand All @@ -4122,7 +4122,7 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bin
get-intrinsic "^1.2.4"
set-function-length "^1.2.1"

call-bind@^1.0.4, call-bind@^1.0.5:
call-bind@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
Expand Down Expand Up @@ -6026,15 +6026,6 @@ form-data@^4.0.0:
combined-stream "^1.0.8"
mime-types "^2.1.12"

form-data@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.8"
mime-types "^2.1.12"

format@^0.2.0:
version "0.2.2"
resolved "https://registry.npmjs.org/format/-/format-0.2.2.tgz"
Expand Down Expand Up @@ -7571,11 +7562,6 @@ lilconfig@^2.0.5:
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==

lilconfig@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc"
integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==

lines-and-columns@^1.1.6:
version "1.2.4"
resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
Expand Down Expand Up @@ -7754,21 +7740,6 @@ lodash.startcase@^4.4.0:
resolved "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz"
integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==

lodash.template@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
dependencies:
lodash._reinterpolate "^3.0.0"
lodash.templatesettings "^4.0.0"

lodash.templatesettings@^4.0.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
dependencies:
lodash._reinterpolate "^3.0.0"

lodash.truncate@^4.4.2:
version "4.4.2"
resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
Expand Down Expand Up @@ -8208,11 +8179,6 @@ nanoid@^3.1.25, nanoid@^3.3.1, nanoid@^3.3.7:
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==

nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==

nanomatch@^1.2.9:
version "1.2.13"
resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"
Expand Down Expand Up @@ -8480,11 +8446,6 @@ ohash@^1.1.3:
resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.3.tgz#f12c3c50bfe7271ce3fd1097d42568122ccdcf07"
integrity sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==

ohash@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.3.tgz#f12c3c50bfe7271ce3fd1097d42568122ccdcf07"
integrity sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==

on-finished@2.4.1, on-finished@^2.3.0:
version "2.4.1"
resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
Expand Down Expand Up @@ -9899,7 +9860,7 @@ set-blocking@^2.0.0:
resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==

set-function-length@^1.2.1:
set-function-length@^1.1.1, set-function-length@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425"
integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==
Expand Down Expand Up @@ -10883,11 +10844,6 @@ typescript@^3.8.3:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

ufo@^1.3.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.4.0.tgz#39845b31be81b4f319ab1d99fd20c56cac528d32"
integrity sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==

ufo@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.2.tgz#c7d719d0628a1c80c006d2240e0d169f6e3c0496"
Expand All @@ -10913,11 +10869,6 @@ undici-types@~5.26.4:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

undici-types@~5.26.4:
version "5.26.5"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
Expand Down

0 comments on commit b143475

Please sign in to comment.