Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-07-26 13:04:39 +04:00
Code Issues Projects Releases Wiki Activity

badge fixes, deps update

Browse Source
This commit is contained in:
codecalm
2020-04-20 23:56:31 +02:00
parent 05bbebf478
commit 31b728a779
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+5 -5
View File
@@ -2838,8 +2838,8 @@
"dev": true "dev": true
}, },
"bootstrap": { "bootstrap": {
"version": "github:twbs/bootstrap#4fc701f6aa8b01fb952733b8a4a0b55337760391", "version": "github:twbs/bootstrap#ed32ee2e78b4de244d54e1393ba0e4f6941a72bf",
"from": "github:twbs/bootstrap#4fc701f" "from": "github:twbs/bootstrap#ed32ee2"
}, },
"boxen": { "boxen": {
"version": "4.2.0", "version": "4.2.0",
@@ -15756,9 +15756,9 @@
"dev": true "dev": true
}, },
"yaml": { "yaml": {
"version": "1.9.1", "version": "1.9.2",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.1.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz",
"integrity": "sha512-xbWX1ayUVoW8DPM8qxOBowac4XxSTi0mFLbiokRq880ViYglN+F3nJ4Dc2GdypXpykrknKS39d8I3lzFoHv1kA==", "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/runtime": "^7.9.2" "@babel/runtime": "^7.9.2"
package.json
+2 -2
View File
@@ -109,7 +109,7 @@
"svgo": "^1.3.2", "svgo": "^1.3.2",
"tabler-icons": "^1.6.0", "tabler-icons": "^1.6.0",
"terser": "^4.6.11", "terser": "^4.6.11",
"yaml": "^1.9.1" "yaml": "^1.9.2"
}, },
"dependencies": { "dependencies": {
"@fullcalendar/core": "^4.4.0", "@fullcalendar/core": "^4.4.0",
@@ -119,7 +119,7 @@
"@fullcalendar/timegrid": "^4.4.0", "@fullcalendar/timegrid": "^4.4.0",
"apexcharts": "^3.18.1", "apexcharts": "^3.18.1",
"autosize": "^4.0.2", "autosize": "^4.0.2",
"bootstrap": "twbs/bootstrap#4fc701f", "bootstrap": "twbs/bootstrap#ed32ee2",
"countup.js": "^2.0.4", "countup.js": "^2.0.4",
"daterangepicker": "^3.0.5", "daterangepicker": "^3.0.5",
"flatpickr": "^4.6.3", "flatpickr": "^4.6.3",
scss/_variables.scss
+1
View File
@@ -266,6 +266,7 @@ $badge-padding-y: .125rem !default;
$badge-padding-x: .25rem !default; $badge-padding-x: .25rem !default;
$badge-font-size: $h6-font-size !default; $badge-font-size: $h6-font-size !default;
$badge-font-weight: $font-weight-bold !default; $badge-font-weight: $font-weight-bold !default;
$badge-line-height: 1 !default;
$badge-empty-size: .5rem !default; $badge-empty-size: .5rem !default;
//buttons //buttons
scss/mixins/_mixins.scss
+4 -1
View File
@@ -1,9 +1,12 @@
@mixin subheader($include-color: true) { @mixin subheader($include-color: true, $include-line-height: true) {
font-size: $h6-font-size; font-size: $h6-font-size;
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: .04em; letter-spacing: .04em;
@if $include-line-height {
line-height: $h6-line-height; line-height: $h6-line-height;
}
@if ($include-color) { @if ($include-color) {
color: $text-muted; color: $text-muted;
scss/ui/_badges.scss
-1
View File
@@ -1,5 +1,4 @@
.badge { .badge {
@include subheader(false);
display: inline-flex; display: inline-flex;
justify-content: center; justify-content: center;
background: $gray-500; background: $gray-500;