1
0
mirror of https://github.com/tabler/tabler.git synced 2025-12-24 02:38:15 +04:00

Merge remote-tracking branch 'origin/dev-v1' into dev-v1

# Conflicts:
#	pages/_includes/cards/blog-single.html
This commit is contained in:
mrszympek
2019-05-07 19:55:46 +02:00
36 changed files with 322 additions and 384 deletions

View File

@@ -26,7 +26,7 @@ $gray-700: #495057 !default;
$gray-800: #343a40 !default;
$gray-900: #212529 !default;
$blue: #467fcf !default;
$blue: #2E7CD9 !default;
$azure: #45aaf2 !default;
$indigo: #6574cd !default;
$purple: #a55eea !default;
@@ -110,9 +110,9 @@ $line-height-base: (24 / 15) !default;
$border-radius: 3px !default;
$h1-font-size: 1.875rem !default;
$h2-font-size: 1.625rem !default;
$h3-font-size: 1.25rem !default;
$h1-font-size: 2rem !default;
$h2-font-size: 1.5rem !default;
$h3-font-size: 1.125rem !default;
$h4-font-size: $font-size-base !default;
$h5-font-size: .8125rem !default;
$h6-font-size: .75rem !default;
@@ -154,6 +154,10 @@ $container-max-widths: (
xl: 1200px
) !default;
//close
$close-font-weight: 400 !default;
$close-font-size: 1.5rem !default;
//badges
$badge-font-weight: 600 !default;

View File

@@ -29,7 +29,6 @@
@import "ui/buttons";
@import "ui/cards";
@import "ui/avatars";
@import "ui/tags";
@import "ui/inputs";
@import "ui/inputs.custom";
@import "ui/media";

View File

@@ -66,7 +66,7 @@
.avatar-list-stacked {
.avatar {
margin-right: -.5em;
margin-right: -.5em !important;
box-shadow: 0 0 0 2px #fff;
}
}

View File

@@ -89,8 +89,9 @@
.card-title {
display: block;
font-size: $h4-font-size;
font-size: $h3-font-size;
font-weight: 500;
margin: 0 0 1.5rem;
line-height: 1;
color: inherit;

View File

@@ -1,99 +0,0 @@
.tag {
display: inline-flex;
padding: .25em .75em;
font-size: px2rem(12px);
font-weight: 400;
line-height: 1.5;
color: $text-muted;
cursor: default;
user-select: none;
background-color: $body-bg;
border-radius: 3px;
@at-root a#{&} {
text-decoration: none;
cursor: pointer;
transition: .3s color, .3s background;
&:hover {
color: inherit;
background-color: rgba($text-muted, .2);
}
}
}
.tag-addon {
display: inline-block;
min-width: 1.5rem;
padding: 0 .5rem;
margin: 0 -.5rem 0 .5rem;
color: inherit;
text-align: center;
text-decoration: none;
background: rgba(#000, .06);
&:last-child {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
i {
margin: 0 -.25rem;
vertical-align: middle;
}
@at-root a#{&} {
text-decoration: none;
cursor: pointer;
transition: .3s color, .3s background;
&:hover {
color: inherit;
background: rgba(#000, .16);
}
}
}
.tag-avatar {
width: 1.5rem;
height: 1.5rem;
margin: 0 .5rem 0 -.5rem;
border-radius: 3px 0 0 3px;
}
@each $vendor, $color in $colors {
.tag-#{$vendor} {
color: #fff;
background-color: $color;
}
}
@each $vendor, $color in $theme-colors {
.tag-#{$vendor} {
color: #fff;
background-color: $color;
}
}
.tag-rounded {
border-radius: 50px;
.tag-avatar {
border-radius: 50px;
}
}
.tag-list {
margin-bottom: -.5rem;
font-size: 0;
> .tag {
margin-bottom: .5rem;
&:not(:last-child) {
margin-right: .5rem;
}
}
}