diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 71066d6ec..f64b44ab9 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -6,7 +6,7 @@ }, { "path": "./dist/css/adminlte.min.css", - "maxSize": "72.5 kB" + "maxSize": "74 kB" }, { "path": "./dist/css/alt/adminlte.components.css", diff --git a/build/scss/_buttons.scss b/build/scss/_buttons.scss index 0b5c6dab8..c5a57e9a8 100644 --- a/build/scss/_buttons.scss +++ b/build/scss/_buttons.scss @@ -76,11 +76,16 @@ > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { display: block; font-size: 20px; } + > .svg-inline--fa { + margin: 0 auto; + } + &:hover { background-color: $button-default-background-color; border-color: darken($button-default-border-color, 20%); diff --git a/build/scss/_cards.scss b/build/scss/_cards.scss index f2bd9021d..3f609662e 100644 --- a/build/scss/_cards.scss +++ b/build/scss/_cards.scss @@ -418,6 +418,7 @@ html.maximized-card { > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { cursor: pointer; margin-right: 5px; diff --git a/build/scss/_carousel.scss b/build/scss/_carousel.scss index 34428cdda..539e1b54d 100644 --- a/build/scss/_carousel.scss +++ b/build/scss/_carousel.scss @@ -2,10 +2,12 @@ // Component: Carousel // -.carousel-control { - &.left, - &.right { - background-image: none; +.carousel-control-custom-icon { + .carousel-control-prev & { + margin-left: -20px; + } + .carousel-control-next & { + margin-right: 20px; } > .fa, @@ -14,6 +16,7 @@ > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { display: inline-block; font-size: 40px; diff --git a/build/scss/_forms.scss b/build/scss/_forms.scss index 3bac36f8e..0695fc29e 100644 --- a/build/scss/_forms.scss +++ b/build/scss/_forms.scss @@ -42,6 +42,7 @@ &.fab, &.fal, &.fad, + &.svg-inline--fa, &.ion { line-height: $input-height; } @@ -55,6 +56,7 @@ &.fab, &.fal, &.fad, + &.svg-inline--fa, &.ion { line-height: $input-height-lg; } @@ -68,6 +70,7 @@ &.fab, &.fal, &.fad, + &.svg-inline--fa, &.ion { line-height: $input-height-lg; } @@ -82,6 +85,7 @@ &.fab, &.fal, &.fad, + &.svg-inline--fa, &.ion { line-height: $input-height-sm; } @@ -95,6 +99,7 @@ &.fab, &.fal, &.fad, + &.svg-inline--fa, &.ion { line-height: $input-height-sm; } diff --git a/build/scss/_main-header.scss b/build/scss/_main-header.scss index 7747778f1..4b709f034 100644 --- a/build/scss/_main-header.scss +++ b/build/scss/_main-header.scss @@ -23,6 +23,7 @@ > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { font-size: $font-size-sm; } diff --git a/build/scss/_main-sidebar.scss b/build/scss/_main-sidebar.scss index ba59a99a0..d3a04cff5 100644 --- a/build/scss/_main-sidebar.scss +++ b/build/scss/_main-sidebar.scss @@ -126,6 +126,7 @@ &.fab, &.fal, &.fad, + &.svg-inline--fa, &.ion { font-size: 1.1rem; } diff --git a/build/scss/_miscellaneous.scss b/build/scss/_miscellaneous.scss index 8a40a777e..7e0223e44 100644 --- a/build/scss/_miscellaneous.scss +++ b/build/scss/_miscellaneous.scss @@ -270,6 +270,7 @@ > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { color: $gray-800; } @@ -283,6 +284,7 @@ > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { color: $gray-400; } diff --git a/build/scss/_small-box.scss b/build/scss/_small-box.scss index 1c48d13f9..2feb88e4b 100644 --- a/build/scss/_small-box.scss +++ b/build/scss/_small-box.scss @@ -115,6 +115,13 @@ } } + svg { + font-size: 70px; + position: absolute; + right: 15px; + top: 15px; + transition: transform $transition-speed linear; + } } // Small box hover state @@ -122,15 +129,20 @@ text-decoration: none; // Animate icons on small box hover - .icon > i { - &, - &.fa, - &.fas, - &.far, - &.fab, - &.fal, - &.fad, - &.ion { + .icon { + > i { + &, + &.fa, + &.fas, + &.far, + &.fab, + &.fal, + &.fad, + &.ion { + transform: scale(1.1); + } + } + > svg { transform: scale(1.1); } } diff --git a/build/scss/_timeline.scss b/build/scss/_timeline.scss index c8bd53c99..96c04d320 100644 --- a/build/scss/_timeline.scss +++ b/build/scss/_timeline.scss @@ -90,10 +90,11 @@ > .fab, > .fal, > .fad, + > .svg-inline--fa, > .ion { background-color: $gray-500; border-radius: 50%; - font-size: 15px; + font-size: 16px; height: 30px; left: 18px; line-height: 30px; @@ -102,6 +103,9 @@ top: 0; width: 30px; } + > .svg-inline--fa { + padding: 7px; + } } // Time label > .time-label { diff --git a/build/scss/plugins/_fullcalendar.scss b/build/scss/plugins/_fullcalendar.scss index f612f1151..62a270baf 100644 --- a/build/scss/plugins/_fullcalendar.scss +++ b/build/scss/plugins/_fullcalendar.scss @@ -103,6 +103,7 @@ .fab, .fal, .fad, + .svg-inline--fa, .ion { transition: transform linear .3s; diff --git a/pages/UI/general.html b/pages/UI/general.html index 36d97c91c..c434a730e 100644 --- a/pages/UI/general.html +++ b/pages/UI/general.html @@ -1447,11 +1447,15 @@ - + Previous - + Next