Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-07-29 14:34:37 +04:00
Code Issues Projects Releases Wiki Activity

ribbon fixes, grid fixes

Browse Source
This commit is contained in:
chomik
2019-06-01 21:10:03 +02:00
parent 2b2b53d8b4
commit ad95b45842
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/_includes/cards/ribbon.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="card"> <div class="card">
<div class="card-body p-5"> <div class="card-body p-5">
<div class="h-16"></div> <div class="h-10"></div>
</div> </div>
<div class="ribbon{% if include.top %} ribbon-top{% endif %}{% if include.left %} ribbon-left{% endif %}{% if include.bottom %} ribbon-bottom{% endif %}{% if include.bookmark %} ribbon-bookmark{% endif %}{% if include.color %} bg-{{ include.color }}{% endif %}">{% if include.text %}{{ include.text }}{% else %}{% include ui/icon.html icon="star" %}{% endif %}</div> <div class="ribbon{% if include.top %} ribbon-top{% endif %}{% if include.left %} ribbon-left{% endif %}{% if include.bottom %} ribbon-bottom{% endif %}{% if include.bookmark %} ribbon-bookmark{% endif %}{% if include.color %} bg-{{ include.color }}{% endif %}">{% if include.text %}{{ include.text }}{% else %}{% include ui/icon.html icon="star" %}{% endif %}</div>
pages/_includes/ui/icon.html
+1 -2
View File
@@ -1,2 +1 @@
{% assign provider = include.provider | default: "fe" %} {% assign provider = include.provider | default: "fe" %}<i class="icon {{ provider }} {{ provider }}-{{ include.icon }}{% if include.class %} {{ include.class }}{% endif %}{% if include.color %} text-{{ include.color }}{% endif %}"></i>
<i class="icon {{ provider }} {{ provider }}-{{ include.icon }}{% if include.class %} {{ include.class }}{% endif %}{% if include.color %} text-{{ include.color }}{% endif %}"></i>
scss/layout/_grid.scss
+12
View File
@@ -2,6 +2,18 @@
@include make-container-breakpoints(); @include make-container-breakpoints();
} }
.row-deck {
> .col,
> [class*='col-'] {
display: flex;
align-items: stretch;
.card {
flex: 1 1 auto;
}
}
}
@each $name, $value in (0: 0, xs: .25rem, sm: .5rem, lg: 1rem, xl: 1.5rem) { @each $name, $value in (0: 0, xs: .25rem, sm: .5rem, lg: 1rem, xl: 1.5rem) {
.row-#{$name} { .row-#{$name} {
margin-right: (-$value); margin-right: (-$value);
scss/ui/_ribbons.scss
+5 -3
View File
@@ -5,12 +5,14 @@
top: .75rem; top: .75rem;
right: -($ribbon-margin); right: -($ribbon-margin);
z-index: 1; z-index: 1;
padding: .375rem 1rem; padding: .25rem 1rem;
font-weight: 600; font-weight: 600;
color: #fff; color: #fff;
text-align: center; text-align: center;
background: $primary; background: $primary;
border-color: $primary; border-color: $primary;
font-size: 1rem;
line-height: 1.5;
&::before { &::before {
position: absolute; position: absolute;
@@ -101,7 +103,7 @@
width: 0; width: 0;
height: 0; height: 0;
content: ""; content: "";
border: 1.125rem solid; border: 1rem solid;
border-color: inherit; border-color: inherit;
border-right-width: 0; border-right-width: 0;
border-left-color: transparent; border-left-color: transparent;
@@ -132,7 +134,7 @@
right: 0; right: 0;
left: 0; left: 0;
border-color: inherit; border-color: inherit;
border-width: 1.125rem; border-width: 1rem;
border-top-width: 0; border-top-width: 0;
border-bottom-color: transparent; border-bottom-color: transparent;
border-bottom-width: .75rem; border-bottom-width: .75rem;