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

Jump to bottom

Fix tertiary badge text color #882

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Fix tertiary badge text color #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b009bd
Fix tertiary badge text color
coliff Jul 17, 2024
da7e288
update navbar search
coliff Jul 17, 2024
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
12 changes: 0 additions & 12 deletions assets/styles/_ie11.scss
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions assets/styles/_menu-right.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#TableOfContents {
display: none;
}

@media (min-width: 1200px) {
#TableOfContents {
display: block;
}
}

#TableOfContents ul,
#TableOfContents li {
list-style: none;
Expand Down
22 changes: 12 additions & 10 deletions assets/styles/_navbar-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
.search-container {
width: 40px;
left: -12px;
width: 40px;
}

.form-control-search {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='%236a6e79' viewBox='0 0 24 24'%3E%3Cpath d='m16.38 14.92-.66.05-.41-.41c2.44-2.81 2.28-7.1-.5-9.7S7.8 2.4 5.17 4.94a6.988 6.988 0 0 0-.08 9.98c2.61 2.61 6.77 2.72 9.52.34l.41.41-.05.65 3.89 3.89a.996.996 0 1 0 1.41-1.41l-3.88-3.88Zm-2.81-1.41a5.016 5.016 0 0 1-7.08 0c-1.95-1.95-1.95-5.13 0-7.08s5.13-1.95 7.08 0 1.95 5.13 0 7.08Z'/%3E%3C/svg%3E");
background-position: 5px center;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='22' height='22' fill='%236a6e79' viewBox='0 0 24 24'%3E%3Cpath d='m16.38 14.92-.66.05-.41-.41c2.44-2.81 2.28-7.1-.5-9.7S7.8 2.4 5.17 4.94a6.988 6.988 0 0 0-.08 9.98c2.61 2.61 6.77 2.72 9.52.34l.41.41-.05.65 3.89 3.89a.996.996 0 1 0 1.41-1.41l-3.88-3.88Zm-2.81-1.41a5.016 5.016 0 0 1-7.08 0c-1.95-1.95-1.95-5.13 0-7.08s5.13-1.95 7.08 0 1.95 5.13 0 7.08Z'/%3E%3C/svg%3E");
background-position: 8px center;
background-repeat: no-repeat;
border-left: 0;
border-right: 0;
left: auto;
max-height: 46px;
padding: 0;
right: 5px;
transition: all 0.2s;
width: 0 !important;
z-index: 1210;
transition: all 0.2s;
left: auto;
top: 10px;
right: 5px;
}

.form-control-search:focus {
width: 363px !important;
border-left: 1px;
border-right: 1px;
max-width: calc(100vw - 200px);
padding: 0 3px 3px 16px;
text-indent: 18px;
padding: 0 4px 4px 16px;
visibility: visible;
width: 363px !important;
}

.form-control-search:focus + .btn-search {
transition: all 1s;
background-color: transparent;
pointer-events: none !important;
transition: all 1s;
}

.form-control-search:focus + .btn-search img {
Expand Down
4 changes: 2 additions & 2 deletions content/components/web/badges/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Used when more emphasis is needed. **Default badges can look like [Buttons](/com
<div class="guide-sample">
<span class="badge bg-primary">Primary</span>
<span class="badge bg-secondary">Secondary</span>
<span class="badge bg-tertiary">Tertiary</span>
<span class="badge text-bg-tertiary">Tertiary</span>
<span class="badge bg-high-contrast">High Contrast</span>
<span class="badge bg-success">Success</span>
<span class="badge text-bg-warning">Warning</span>
Expand Down Expand Up @@ -73,7 +73,7 @@ Used to display up to 3 characters (usually a number in a counter). Counter badg
<div>
<span class="badge badge-pill bg-primary">1</span>
<span class="badge badge-pill bg-secondary">2</span>
<span class="badge badge-pill bg-tertiary">3</span>
<span class="badge badge-pill text-bg-tertiary">3</span>
<span class="badge badge-pill bg-high-contrast">4</span>
<span class="badge badge-pill bg-success">5</span>
<span class="badge badge-pill text-bg-warning">6</span>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/menu-right.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="sticky-top sticky-offset d-print-none">
{{ if and (gt .WordCount 100 ) (not .Params.hideToc) }}
<div class="h5 pt-2 on-this-page">
<div class="h5 pt-2 on-this-page d-none d-xl-block">
On this page
</div>
{{- .TableOfContents -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/navbar-search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<search class="search-container d-inline-block position-relative" role="search">
<input class="form-control form-control-search position-absolute" aria-label="Search" id="search-by" type="search"
<input class="form-control form-control-lg form-control-search position-absolute" aria-label="Search" id="search-by" type="search"
name="q" placeholder="Search..." autocomplete="off" title="" required>
<label class="btn btn-lg btn-icon-only border-transparent btn-search position-absolute px-1" for="search-by">
<i class="modus-icons notranslate text-white" aria-hidden="true">search</i>
Expand Down