Skip to content

Commit

Permalink
use sidebar styles from ember-styleguide
Browse files Browse the repository at this point in the history
  • Loading branch information
mansona committed Feb 15, 2024
1 parent b91c98e commit f518277
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 184 deletions.
86 changes: 0 additions & 86 deletions addon/styles/addon.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ a.old-version-button:hover, a.old-version-button:active {
color: var(--color-button-secondary-text-hover);
}

main {
padding: 0 2em;
}

.es-header {
padding: 0 var(--spacing-4);
justify-content: start;
Expand All @@ -52,13 +48,6 @@ main {
max-width: 100%;
}

.sidebar-container {
margin: 0;
grid-template-columns: var(--sidebar-width) minmax(0, 1fr);
max-width: 100%;
padding: 0;
}

.info-banner-wrapper {
margin: var(--spacing-1);
padding: var(--spacing-1);
Expand All @@ -72,91 +61,16 @@ main {
}
}

.guides-article-wrapper {
display: grid;
gap: 3em;
grid-template-columns: minmax(20ch, 80ch) 16em;
padding-top: var(--spacing-4);
padding-bottom: var(--spacing-4);
justify-content: center;
}

.pagination-wrapper {
margin: var(--spacing-4) 0;
}

.on-this-page-wrapper {
margin-top: .6em;
}

@media (max-width: 80em) {
.guides-article-wrapper {
display: grid;
grid-template-columns: minmax(20ch, 80ch);
justify-content: center;
padding-bottom: var(--spacing-2);
}

.guides-article-toc {
display: none;
}

.pagination-wrapper {
margin: var(--spacing-2) 0;
}
}

/* TODO figure out how much of this media query needs to go into the styleguide */
@media (max-width: 844px) {
main .es-sidebar[aria-expanded="true"] {
padding: var(--spacing-2);
z-index: 1;
display: flex;
flex-direction: row-reverse;
margin: var(--spacing-2) 0 0 0;
background: var(--color-white);
}

main .es-sidebar-toggle {
z-index: 2;
}

main .es-sidebar-content {
flex-grow: 1;
margin-top: var(--spacing-2);
}

main .es-sidebar-close {
float: none;
height: 52px;
margin-left: var(--spacing-1);
}
}

@media screen and (min-width: 54em) {
.sidebar {
border-bottom: 0;
border-right: 1px solid #F8E7CF;
padding: 3em 1.618em 3em 0;
}

.sidebar:last-child {
margin-right: 0;
}

label[for="toc-toggle"] {
display: none;
}

.toc-container {
display: block;
}

.toc-container[style] {
display: block !important;
}
}

.article-title {
display: flex;
justify-content: space-between;
Expand Down
19 changes: 0 additions & 19 deletions addon/styles/on-this-page.css

This file was deleted.

67 changes: 0 additions & 67 deletions addon/styles/table-of-contents.css

This file was deleted.

4 changes: 2 additions & 2 deletions app/templates/components/guides-article.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{! template-lint-disable no-link-to-positional-params link-rel-noopener no-curly-component-invocation no-implicit-this }}
<div class='guides-article-wrapper'>
<div class='content-wrapper'>
<div class='guides-article-content'>
{{#if (not (eq this.version this.currentVersion))}}
<div class='old-version-warning'>
Expand Down Expand Up @@ -43,7 +43,7 @@

<ChapterLinks @pages={{this.pages}} />
</div>
<div class='guides-article-toc'>
<div class='on-this-page-wrapper'>
<OnThisPage @toc={{@model.toc}} />
</div>
</div>
2 changes: 1 addition & 1 deletion app/templates/version.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{!-- template-lint-disable no-action --}}
<div class="sidebar-container">
<div class="sidebar-container sidebar-container--full-width">
<EsSidebar>
<label for="version-select" class="visually-hidden">Guides version</label>
{{#if this.versions}}
Expand Down
17 changes: 9 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: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ember-href-to": "^5.0.0",
"ember-power-select": "^6.0.0",
"ember-showdown-shiki": "^1.0.3",
"ember-styleguide": "^8.3.0",
"ember-styleguide": "^9.1.1",
"ember-tether": "^2.0.1",
"ember-truth-helpers": "^3.0.0",
"sanitize-html": "^2.11.0"
Expand Down

0 comments on commit f518277

Please sign in to comment.