Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-07-25 20:44:38 +04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
codecalm
2021-12-14 00:26:47 +01:00
parent ca96d74513 8151b82987
commit a00d6020c8
27 changed files with 27563 additions and 16109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/_docs/badges.md
+11
View File
@@ -17,6 +17,17 @@ The default badges are square and come in the basic set of colors.
{% endcapture %}
{% include example.html code=code centered=true %}
## Headings
{% capture code %}
<h1>Example heading <span class="badge bg-secondary">New</span></h1>
<h2>Example heading <span class="badge bg-secondary">New</span></h2>
<h3>Example heading <span class="badge bg-secondary">New</span></h3>
<h4>Example heading <span class="badge bg-secondary">New</span></h4>
<h5>Example heading <span class="badge bg-secondary">New</span></h5>
<h6>Example heading <span class="badge bg-secondary">New</span></h6>
{% endcapture %}
{% include example.html code=code %}
## Pill badges
src/scss/_variables.scss
+4 -1
View File
@@ -57,6 +57,8 @@ $h5-line-height: divide(1rem, $h5-font-size) !default;
$h6-font-size: divide(10rem, 16) !default;
$h6-line-height: divide(1rem, $h6-font-size) !default;
$small-font-size: percentage(divide($h5-font-size, $font-size-base)) !default;
$display-font-sizes: (
1: 5rem,
2: 4.5rem,
@@ -205,7 +207,6 @@ $border-radius-lg: 8px !default;
$border-radius-pill: 100rem !default;
// Code
$small-font-size: percentage(divide($h5-font-size, $font-size-base)) !default;
$code-color: $primary !default;
$code-font-size: $small-font-size !default;
$code-line-height: 1.25rem !default;
@@ -327,6 +328,8 @@ $badge-font-size: $code-font-size !default;
$badge-line-height: $code-line-height !default;
$badge-font-weight: $font-weight-medium !default;
$badge-empty-size: .5rem !default;
$badge-padding-y: .25em !default;
$badge-padding-x: .5em !default;
//buttons
$input-btn-line-height: $line-height-base !default;
src/scss/ui/_badges.scss
+1 -4
View File
@@ -5,12 +5,9 @@
background: $gray-500;
overflow: hidden;
user-select: none;
padding: calc(.25rem - 1px) .25rem;
height: 1.25rem;
border: 1px solid transparent;
min-width: 1.25rem;
min-width: ($badge-padding-y * 2 ) + ($badge-font-size / 100% * 1em);
font-weight: $headings-font-weight;
font-size: $h6-font-size;
letter-spacing: .04em;
text-transform: uppercase;