1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 08:10:47 +02:00

WIP, needs to be broken apart

- button ideas
- rewrite utility mixin
- cleanup some code
- remove hyphen from infix by default
This commit is contained in:
Mark Otto
2025-03-07 09:46:35 -08:00
parent 9f8967d470
commit 12fb082b3b
23 changed files with 1129 additions and 683 deletions

View File

@@ -96,32 +96,38 @@
color: var(--#{$prefix}heading-color);
}
h1 {
h1,
.h1 {
@extend %heading;
@include font-size($h1-font-size);
}
h2 {
h2,
.h2 {
@extend %heading;
@include font-size($h2-font-size);
}
h3 {
h3,
.h3 {
@extend %heading;
@include font-size($h3-font-size);
}
h4 {
h4,
.h4 {
@extend %heading;
@include font-size($h4-font-size);
}
h5 {
h5,
.h5 {
@extend %heading;
@include font-size($h5-font-size);
}
h6 {
h6,
.h6 {
@extend %heading;
@include font-size($h6-font-size);
}
@@ -214,14 +220,14 @@
//
// Add the correct font size in all browsers
small {
small, .small {
@include font-size($small-font-size);
}
// Mark
mark {
mark, .mark {
padding: $mark-padding;
color: var(--#{$prefix}highlight-color);
background-color: var(--#{$prefix}highlight-bg);
@@ -248,11 +254,11 @@
// Links
a {
color: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-opacity, 1));
color: var(--#{$prefix}link-color);
text-decoration: $link-decoration;
&:hover {
--#{$prefix}link-color-rgb: var(--#{$prefix}link-hover-color-rgb);
--#{$prefix}link-color: var(--#{$prefix}link-hover-color);
text-decoration: $link-hover-decoration;
}
}

View File

@@ -9,11 +9,12 @@
// scss-docs-start table-variant
@mixin table-variant($state, $background) {
.table-#{$state} {
$color: color-contrast(opaque($body-bg, $background));
$hover-bg: mix($color, $background, percentage($table-hover-bg-factor));
$striped-bg: mix($color, $background, percentage($table-striped-bg-factor));
$active-bg: mix($color, $background, percentage($table-active-bg-factor));
$table-border-color: mix($color, $background, percentage($table-border-factor));
// mdo-do
$color: $body-color;
$hover-bg: color-mix(in srgb, #{$color}, #{$background percentage($table-hover-bg-factor)});
$striped-bg: color-mix(in srgb, #{$color}, #{$background percentage($table-striped-bg-factor)});
$active-bg: color-mix(in srgb, #{$color}, #{$background percentage($table-active-bg-factor)});
$table-border-color: color-mix(in srgb, #{$color}, #{$background percentage($table-border-factor)});
--#{$prefix}table-color: #{$color};
--#{$prefix}table-bg: #{$background};

View File

@@ -52,13 +52,13 @@
//
// Emphasis
//
.small {
// @extend small;
}
// .small {
// @extend small;
// }
.mark {
// @extend mark;
}
// .mark {
// @extend mark;
// }
//
// Lists