Skip to content

Commit

Permalink
Merge pull request #22 from trimble-oss/dev/coliff/modus-layout-css-i…
Browse files Browse the repository at this point in the history
…mprovements

Modus Layout CSS improvements
  • Loading branch information
coliff authored Sep 3, 2024
2 parents c44e216 + 4e0eb88 commit bdb962a
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 25 deletions.
6 changes: 2 additions & 4 deletions dist/css/modus-bootstrap.css

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

2 changes: 1 addition & 1 deletion dist/css/modus-bootstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/modus-bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/modus-bootstrap.min.css.map

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions scss/_modus-layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@
border-bottom: 1px solid var(--bs-border-color-translucent);
}

/* stylelint-disable-next-line */
.sidebar-open > .modus-sidebar ul {
padding: 0;
}
.sidebar-open > .modus-sidebar {
ul {
padding: 0;

/* stylelint-disable-next-line */
.sidebar-open > .modus-sidebar ul li {
list-style: none;
li {
list-style: none;
}
}
}

/* stylelint-disable-next-line */
Expand Down Expand Up @@ -177,7 +177,7 @@
flex: 1 1 auto;
flex-direction: column;
max-height: 100%;
background-color: var(--bs-border-color-translucent);
background-color: var(--bs-secondary-bg-subtle);

&.panel-sm {
min-width: 256px;
Expand Down Expand Up @@ -206,6 +206,7 @@
flex: 0 0 48px;
align-items: center;
justify-content: center;
color: var(--bs-body-color);
background-color: var(--bs-body-bg);
border-bottom: 1px solid var(--bs-border-color-translucent);

Expand Down
5 changes: 3 additions & 2 deletions site/content/docs/_index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: redirect
sitemap_exclude: true
redirect: "/docs/v2/getting-started/introduction/"
---
sitemap:
- disable: true
---
3 changes: 2 additions & 1 deletion site/content/docs/v2/_index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: redirect
sitemap_exclude: true
sitemap:
disable: true
redirect: "/docs/v2/getting-started/introduction/"
---
2 changes: 2 additions & 0 deletions site/content/docs/v2/about/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ group: about
aliases:
- "/about/"
- "/docs/v2/about/"
sitemap:
- disable: true
---

## Get involved
Expand Down
5 changes: 3 additions & 2 deletions site/content/docs/v2/docsref.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ description: Examples of Bootstrap's documentation-specific components and style
aliases: "/docsref/"
toc: true
robots: noindex,follow
sitemap_exclude: true
sitemap:
disable: true
---

## Buttons
Expand Down Expand Up @@ -46,4 +47,4 @@ sitemap_exclude: true

{{< scss-docs name="variable-gradient" file="scss/_variables.scss" >}}

{{< js-docs name="live-toast" file="site/assets/js/snippets.js" >}}
{{< js-docs name="live-toast" file="site/assets/js/partials/snippets.js" >}}
File renamed without changes.
3 changes: 3 additions & 0 deletions site/content/docs/v2/examples/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ layout: single
title: Examples
description: Quickly get a project started with any of our examples ranging from using parts of the framework to custom components and layouts.
aliases: "/examples/"
private: true
sitemap:
- disable: true
---

{{< list-examples.inline >}}
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/v2/getting-started/accessibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ On browsers that support `prefers-reduced-motion`, and where the user has *not*

## Additional resources

- [Web Content Accessibility Guidelines (WCAG) 2.1](https://www.w3.org/TR/WCAG/)
- [Web Content Accessibility Guidelines (WCAG) 2.2](https://www.w3.org/TR/WCAG/)
- [The A11Y Project](https://www.a11yproject.com/)
- [MDN accessibility documentation](https://developer.mozilla.org/en-US/docs/Web/Accessibility)
- [Tenon.io Accessibility Checker](https://tenon.io/)
Expand Down
6 changes: 3 additions & 3 deletions site/content/docs/v2/utilities/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ $utilities: map-merge(

### Remove utilities

Remove any of the default utilities with the [`map-remove()` Sass function](https://sass-lang.com/documentation/modules/map#remove).
Remove any of the default utilities with the [`map-remove()` Sass function](https://sass-lang.com/documentation/modules/map/#remove).

```scss
@import "bootstrap/scss/functions";
Expand All @@ -537,7 +537,7 @@ $utilities: map-remove($utilities, "width", "float");
@import "bootstrap/scss/utilities/api";
```

You can also use the [`map-merge()` Sass function](https://sass-lang.com/documentation/modules/map#merge) and set the group key to `null` to remove the utility.
You can also use the [`map-merge()` Sass function](https://sass-lang.com/documentation/modules/map/#merge) and set the group key to `null` to remove the utility.

```scss
@import "bootstrap/scss/functions";
Expand All @@ -559,7 +559,7 @@ $utilities: map-merge(

### Add, remove, modify

You can add, remove, and modify many utilities all at once with the [`map-merge()` Sass function](https://sass-lang.com/documentation/modules/map#merge). Here's how you can combine the previous examples into one larger map.
You can add, remove, and modify many utilities all at once with the [`map-merge()` Sass function](https://sass-lang.com/documentation/modules/map/#merge). Here's how you can combine the previous examples into one larger map.

```scss
@import "bootstrap/scss/functions";
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
**Accessibility tip:** Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies like screen readers. Please ensure the meaning is obvious from the content itself (e.g., the visible text with a [*sufficient* color contrast](/docs/{{ .Site.Params.docs_version }}/getting-started/accessibility#color-contrast)) or is included through alternative means, such as additional text hidden with the `.visually-hidden` class.
**Accessibility tip:** Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies like screen readers. Please ensure the meaning is obvious from the content itself (e.g., the visible text with a [*sufficient* color contrast](/docs/{{ .Site.Params.docs_version }}/getting-started/accessibility/#color-contrast)) or is included through alternative means, such as additional text hidden with the `.visually-hidden` class.

0 comments on commit bdb962a

Please sign in to comment.