Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dark mode: Tags #2283

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Dark mode: Tags #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions scss/_tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

.tag {
// scss-docs-start tag-css-vars
--#{$prefix}tag-color: #{$tag-color};
--#{$prefix}tag-bg: #{$tag-bg};
--#{$prefix}tag-gap: #{$tag-gap};
--#{$prefix}tag-padding-x: #{$tag-padding-x};
--#{$prefix}tag-padding-y: #{$tag-padding-y};
Expand All @@ -28,8 +30,8 @@
@include font-size(var(--#{$prefix}tag-font-size));
font-weight: var(--#{$prefix}tag-font-weight);
line-height: add(var(--#{$prefix}tag-font-size), .125rem);
color: var(--#{$prefix}body-color);
background-color: transparent;
color: var(--#{$prefix}tag-color);
background-color: var(--#{$prefix}tag-bg);
border: var(--#{$prefix}tag-border-width) solid var(--#{$prefix}tag-border-color);
@include border-radius(var(--#{$prefix}tag-border-radius), var(--#{$prefix}tag-border-radius));

Expand Down
11 changes: 7 additions & 4 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,6 +2329,9 @@ $footer-gap-xl: $spacer * 1.7 !default;
// Tags

// scss-docs-start tag-variables
$tag-color: var(--#{$prefix}body-color) !default;
$tag-bg: var(--#{$prefix}body-bg) !default;

$tag-gap: map-get($spacers, 1) !default;
$tag-font-shift: $spacer * .1 !default;
$tag-font-weight: $font-weight-bold !default;
Expand All @@ -2343,10 +2346,10 @@ $tag-close-margin-end: -$spacer * .3 !default;
$tag-close-margin-start: $spacer * .2 !default;
$tag-font-size: $font-size-base !default;

$tag-active-color: $white !default;
$tag-disabled-color: $gray-500 !default;
$tag-border-color: $gray-500 !default;
$tag-active-decoration-color: $black !default;
$tag-active-color: var(--#{$prefix}highlight-color) !default;
$tag-disabled-color: var(--#{$prefix}disabled-color) !default;
$tag-border-color: var(--#{$prefix}border-color-translucent) !default;
$tag-active-decoration-color: var(--#{$prefix}highlight-bg) !default;
// scss-docs-end tag-variables

// scss-docs-start tag-sm-variables
Expand Down
219 changes: 218 additions & 1 deletion site/content/docs/5.3/dark-mode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ Additional variables for dark-mode (temporary)
<h4 class="mt-3">Dark theme on container</h4>

<div class="border border-tertiary p-3 bg-body" data-bs-theme="dark">
<nav class="local-nav" aria-label="Basic local navigation" data-bs-theme="dark">
<nav class="local-nav" aria-label="Basic local navigation">
<button class="local-nav-button collapsed d-lg-none" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLocalNav2" aria-expanded="false" aria-controls="collapseLocalNav2">
<span class="container-xxl">Shop</span>
</button>
Expand Down Expand Up @@ -751,6 +751,223 @@ Additional variables for dark-mode (temporary)
</div>
</div>

### Tags

<h4 class="mt-3">No theme</h4>

<div class="border border-tertiary p-3">
<ul class="list-unstyled d-flex gap-2 flex-wrap m-0">
<li>
<input type="checkbox" class="btn-check" id="btncheck-mobile1" autocomplete="off">
<label class="tag" for="btncheck-mobile1"><span class="visually-hidden">Filter by</span>Mobile</label>
</li>
<li>
<input type="checkbox" class="btn-check" id="btncheck-tv1" autocomplete="off" checked>
<label class="tag" for="btncheck-tv1">
<svg width="1.5rem" height="1.5rem" viewBox="0 0 1000 1000" aria-hidden="true" focusable="false">
<path fill="currentColor" d="M75,200V720H225v80H775V720H925V200H75ZM500,755a30,30,0,1,1,30-30A30,30,0,0,1,500,755Zm365-95H135V260H865V660Z"></path>
</svg>
<span class="visually-hidden">Filter by</span>TV
</label>
</li>
<li><a class="tag" href="#">1. Introduction</a></li>
<li>
<span class="tag" id="labelTag11">
Dismissible tag
<button class="close" aria-labelledby="labelTag11"><span class="visually-hidden">Close</span></button>
</span>
</li>
<li><span class="tag tag-sm" id="labelTag21">
<svg width="1rem" height="1rem" fill="currentColor" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Dismissible tag
<button class="close" aria-labelledby="labelTag21"><span class="visually-hidden">Close</span></button>
</span></li>
<li>
<p><span class="tag disabled" id="labelTag51" aria-disabled="true">
<svg fill="currentColor" width="1.5rem" height="1.5rem" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Input
<button class="close" aria-labelledby="labelTag51" disabled><span class="visually-hidden">Close</span></button>
</span></p>
</li>
</ul>
</div>

<h4 class="mt-3">Dark theme on container</h4>

<div class="border border-tertiary p-3 bg-body" data-bs-theme="dark">
<ul class="list-unstyled d-flex gap-2 flex-wrap m-0">
<li>
<input type="checkbox" class="btn-check" id="btncheck-mobile2" autocomplete="off">
<label class="tag" for="btncheck-mobile2"><span class="visually-hidden">Filter by</span>Mobile</label>
</li>
<li>
<input type="checkbox" class="btn-check" id="btncheck-tv2" autocomplete="off" checked>
<label class="tag" for="btncheck-tv2">
<svg width="1.5rem" height="1.5rem" viewBox="0 0 1000 1000" aria-hidden="true" focusable="false">
<path fill="currentColor" d="M75,200V720H225v80H775V720H925V200H75ZM500,755a30,30,0,1,1,30-30A30,30,0,0,1,500,755Zm365-95H135V260H865V660Z"></path>
</svg>
<span class="visually-hidden">Filter by</span>TV
</label>
</li>
<li><a class="tag" href="#">1. Introduction</a></li>
<li>
<span class="tag" id="labelTag12">
Dismissible tag
<button class="close" aria-labelledby="labelTag12"><span class="visually-hidden">Close</span></button>
</span>
</li>
<li><span class="tag tag-sm" id="labelTag22">
<svg width="1rem" height="1rem" fill="currentColor" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Dismissible tag
<button class="close" aria-labelledby="labelTag22"><span class="visually-hidden">Close</span></button>
</span></li>
<li>
<p><span class="tag disabled" id="labelTag52" aria-disabled="true">
<svg fill="currentColor" width="1.5rem" height="1.5rem" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Input
<button class="close" aria-labelledby="labelTag52" disabled><span class="visually-hidden">Close</span></button>
</span></p>
</li>
</ul>
</div>

<h4 class="mt-3">Light theme on container</h4>

<div class="border border-tertiary p-3 bg-body" data-bs-theme="light">
<ul class="list-unstyled d-flex gap-2 flex-wrap m-0">
<li>
<input type="checkbox" class="btn-check" id="btncheck-mobile3" autocomplete="off">
<label class="tag" for="btncheck-mobile3"><span class="visually-hidden">Filter by</span>Mobile</label>
</li>
<li>
<input type="checkbox" class="btn-check" id="btncheck-tv3" autocomplete="off" checked>
<label class="tag" for="btncheck-tv3">
<svg width="1.5rem" height="1.5rem" viewBox="0 0 1000 1000" aria-hidden="true" focusable="false">
<path fill="currentColor" d="M75,200V720H225v80H775V720H925V200H75ZM500,755a30,30,0,1,1,30-30A30,30,0,0,1,500,755Zm365-95H135V260H865V660Z"></path>
</svg>
<span class="visually-hidden">Filter by</span>TV
</label>
</li>
<li><a class="tag" href="#">1. Introduction</a></li>
<li>
<span class="tag" id="labelTag13">
Dismissible tag
<button class="close" aria-labelledby="labelTag13"><span class="visually-hidden">Close</span></button>
</span>
</li>
<li><span class="tag tag-sm" id="labelTag23">
<svg width="1rem" height="1rem" fill="currentColor" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Dismissible tag
<button class="close" aria-labelledby="labelTag23"><span class="visually-hidden">Close</span></button>
</span></li>
<li>
<p><span class="tag disabled" id="labelTag53" aria-disabled="true">
<svg fill="currentColor" width="1.5rem" height="1.5rem" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Input
<button class="close" aria-labelledby="labelTag53" disabled><span class="visually-hidden">Close</span></button>
</span></p>
</li>
</ul>
</div>

<h4 class="mt-3">Dark theme on component</h4>

<div class="border border-tertiary p-3" style="background-color: #282d55">
<ul class="list-unstyled d-flex gap-2 flex-wrap m-0">
<li>
<input type="checkbox" class="btn-check" id="btncheck-mobile4" autocomplete="off">
<label class="tag" for="btncheck-mobile4" data-bs-theme="dark"><span class="visually-hidden">Filter by</span>Mobile</label>
</li>
<li>
<input type="checkbox" class="btn-check" id="btncheck-tv4" autocomplete="off" checked>
<label class="tag" for="btncheck-tv4" data-bs-theme="dark">
<svg width="1.5rem" height="1.5rem" viewBox="0 0 1000 1000" aria-hidden="true" focusable="false">
<path fill="currentColor" d="M75,200V720H225v80H775V720H925V200H75ZM500,755a30,30,0,1,1,30-30A30,30,0,0,1,500,755Zm365-95H135V260H865V660Z"></path>
</svg>
<span class="visually-hidden">Filter by</span>TV
</label>
</li>
<li><a class="tag" href="#" data-bs-theme="dark">1. Introduction</a></li>
<li>
<span class="tag" id="labelTag14" data-bs-theme="dark">
Dismissible tag
<button class="close" aria-labelledby="labelTag14"><span class="visually-hidden">Close</span></button>
</span>
</li>
<li><span class="tag tag-sm" id="labelTag24" data-bs-theme="dark">
<svg width="1rem" height="1rem" fill="currentColor" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Dismissible tag
<button class="close" aria-labelledby="labelTag24"><span class="visually-hidden">Close</span></button>
</span></li>
<li>
<p><span class="tag disabled" id="labelTag54" aria-disabled="true" data-bs-theme="dark">
<svg fill="currentColor" width="1.5rem" height="1.5rem" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Input
<button class="close" aria-labelledby="labelTag54" disabled><span class="visually-hidden">Close</span></button>
</span></p>
</li>
</ul>
</div>

<h4 class="mt-3">Light theme on component</h4>

<div class="border border-tertiary p-3" style="background-color: #b5e8f7">
<ul class="list-unstyled d-flex gap-2 flex-wrap m-0">
<li>
<input type="checkbox" class="btn-check" id="btncheck-mobile5" autocomplete="off">
<label class="tag" for="btncheck-mobile5" data-bs-theme="light"><span class="visually-hidden">Filter by</span>Mobile</label>
</li>
<li>
<input type="checkbox" class="btn-check" id="btncheck-tv5" autocomplete="off" checked>
<label class="tag" for="btncheck-tv5" data-bs-theme="light">
<svg width="1.5rem" height="1.5rem" viewBox="0 0 1000 1000" aria-hidden="true" focusable="false">
<path fill="currentColor" d="M75,200V720H225v80H775V720H925V200H75ZM500,755a30,30,0,1,1,30-30A30,30,0,0,1,500,755Zm365-95H135V260H865V660Z"></path>
</svg>
<span class="visually-hidden">Filter by</span>TV
</label>
</li>
<li><a class="tag" href="#" data-bs-theme="light">1. Introduction</a></li>
<li>
<span class="tag" id="labelTag15" data-bs-theme="light">
Dismissible tag
<button class="close" aria-labelledby="labelTag15"><span class="visually-hidden">Close</span></button>
</span>
</li>
<li><span class="tag tag-sm" id="labelTag25" data-bs-theme="light">
<svg width="1rem" height="1rem" fill="currentColor" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Dismissible tag
<button class="close" aria-labelledby="labelTag25"><span class="visually-hidden">Close</span></button>
</span></li>
<li>
<p><span class="tag disabled" id="labelTag55" aria-disabled="true" data-bs-theme="light">
<svg fill="currentColor" width="1.5rem" height="1.5rem" aria-hidden="true" focusable="false">
<use xlink:href="/docs/{{< param docs_version >}}/assets/img/boosted-sprite.svg#buy"/>
</svg>
Input
<button class="close" aria-labelledby="labelTag55" disabled><span class="visually-hidden">Close</span></button>
</span></p>
</li>
</ul>
</div>

## Forms

### Color
Expand Down