minor update

This commit is contained in:
Tony Air 2019-12-29 12:04:00 +07:00
parent 346b63e198
commit 95378c6212
6 changed files with 124 additions and 119 deletions

188
dist/css/app.css vendored
View File

@ -14794,19 +14794,19 @@ img {
} }
.a:hover, .a:hover,
.a.hover, .a.active,
.a:focus, .a:focus,
a:hover, a:hover,
a.hover, a.active,
a:focus, a:focus,
[data-toggle]:hover, [data-toggle]:hover,
[data-toggle].hover, [data-toggle].active,
[data-toggle]:focus, [data-toggle]:focus,
button:hover, button:hover,
button.hover, button.active,
button:focus, button:focus,
.btn:hover, .btn:hover,
.btn.hover, .btn.active,
.btn:focus { .btn:focus {
opacity: 0.8; opacity: 0.8;
} }
@ -14819,14 +14819,14 @@ button:focus,
.a:hover.far, .a:hover.far,
.a:hover.fas, .a:hover.fas,
.a:hover.fab, .a:hover.fab,
.a.hover > .fa, .a.active > .fa,
.a.hover > .far, .a.active > .far,
.a.hover > .fas, .a.active > .fas,
.a.hover > .fab, .a.active > .fab,
.a.hover.fa, .a.active.fa,
.a.hover.far, .a.active.far,
.a.hover.fas, .a.active.fas,
.a.hover.fab, .a.active.fab,
.a:focus > .fa, .a:focus > .fa,
.a:focus > .far, .a:focus > .far,
.a:focus > .fas, .a:focus > .fas,
@ -14843,14 +14843,14 @@ a:hover.fa,
a:hover.far, a:hover.far,
a:hover.fas, a:hover.fas,
a:hover.fab, a:hover.fab,
a.hover > .fa, a.active > .fa,
a.hover > .far, a.active > .far,
a.hover > .fas, a.active > .fas,
a.hover > .fab, a.active > .fab,
a.hover.fa, a.active.fa,
a.hover.far, a.active.far,
a.hover.fas, a.active.fas,
a.hover.fab, a.active.fab,
a:focus > .fa, a:focus > .fa,
a:focus > .far, a:focus > .far,
a:focus > .fas, a:focus > .fas,
@ -14867,14 +14867,14 @@ a:focus.fab,
[data-toggle]:hover.far, [data-toggle]:hover.far,
[data-toggle]:hover.fas, [data-toggle]:hover.fas,
[data-toggle]:hover.fab, [data-toggle]:hover.fab,
[data-toggle].hover > .fa, [data-toggle].active > .fa,
[data-toggle].hover > .far, [data-toggle].active > .far,
[data-toggle].hover > .fas, [data-toggle].active > .fas,
[data-toggle].hover > .fab, [data-toggle].active > .fab,
[data-toggle].hover.fa, [data-toggle].active.fa,
[data-toggle].hover.far, [data-toggle].active.far,
[data-toggle].hover.fas, [data-toggle].active.fas,
[data-toggle].hover.fab, [data-toggle].active.fab,
[data-toggle]:focus > .fa, [data-toggle]:focus > .fa,
[data-toggle]:focus > .far, [data-toggle]:focus > .far,
[data-toggle]:focus > .fas, [data-toggle]:focus > .fas,
@ -14891,14 +14891,14 @@ button:hover.fa,
button:hover.far, button:hover.far,
button:hover.fas, button:hover.fas,
button:hover.fab, button:hover.fab,
button.hover > .fa, button.active > .fa,
button.hover > .far, button.active > .far,
button.hover > .fas, button.active > .fas,
button.hover > .fab, button.active > .fab,
button.hover.fa, button.active.fa,
button.hover.far, button.active.far,
button.hover.fas, button.active.fas,
button.hover.fab, button.active.fab,
button:focus > .fa, button:focus > .fa,
button:focus > .far, button:focus > .far,
button:focus > .fas, button:focus > .fas,
@ -14915,14 +14915,14 @@ button:focus.fab,
.btn:hover.far, .btn:hover.far,
.btn:hover.fas, .btn:hover.fas,
.btn:hover.fab, .btn:hover.fab,
.btn.hover > .fa, .btn.active > .fa,
.btn.hover > .far, .btn.active > .far,
.btn.hover > .fas, .btn.active > .fas,
.btn.hover > .fab, .btn.active > .fab,
.btn.hover.fa, .btn.active.fa,
.btn.hover.far, .btn.active.far,
.btn.hover.fas, .btn.active.fas,
.btn.hover.fab, .btn.active.fab,
.btn:focus > .fa, .btn:focus > .fa,
.btn:focus > .far, .btn:focus > .far,
.btn:focus > .fas, .btn:focus > .fas,
@ -14941,6 +14941,7 @@ a.disabled,
button.disabled, button.disabled,
.btn.disabled { .btn.disabled {
opacity: 0.5; opacity: 0.5;
cursor: default;
} }
.a.disabled:hover > .fa, .a.disabled:hover > .fa,
@ -14951,14 +14952,14 @@ button.disabled,
.a.disabled:hover.far, .a.disabled:hover.far,
.a.disabled:hover.fas, .a.disabled:hover.fas,
.a.disabled:hover.fab, .a.disabled:hover.fab,
.a.disabled.hover > .fa, .a.disabled.active > .fa,
.a.disabled.hover > .far, .a.disabled.active > .far,
.a.disabled.hover > .fas, .a.disabled.active > .fas,
.a.disabled.hover > .fab, .a.disabled.active > .fab,
.a.disabled.hover.fa, .a.disabled.active.fa,
.a.disabled.hover.far, .a.disabled.active.far,
.a.disabled.hover.fas, .a.disabled.active.fas,
.a.disabled.hover.fab, .a.disabled.active.fab,
.a.disabled:focus > .fa, .a.disabled:focus > .fa,
.a.disabled:focus > .far, .a.disabled:focus > .far,
.a.disabled:focus > .fas, .a.disabled:focus > .fas,
@ -14975,14 +14976,14 @@ a.disabled:hover.fa,
a.disabled:hover.far, a.disabled:hover.far,
a.disabled:hover.fas, a.disabled:hover.fas,
a.disabled:hover.fab, a.disabled:hover.fab,
a.disabled.hover > .fa, a.disabled.active > .fa,
a.disabled.hover > .far, a.disabled.active > .far,
a.disabled.hover > .fas, a.disabled.active > .fas,
a.disabled.hover > .fab, a.disabled.active > .fab,
a.disabled.hover.fa, a.disabled.active.fa,
a.disabled.hover.far, a.disabled.active.far,
a.disabled.hover.fas, a.disabled.active.fas,
a.disabled.hover.fab, a.disabled.active.fab,
a.disabled:focus > .fa, a.disabled:focus > .fa,
a.disabled:focus > .far, a.disabled:focus > .far,
a.disabled:focus > .fas, a.disabled:focus > .fas,
@ -14999,14 +15000,14 @@ a.disabled:focus.fab,
[data-toggle].disabled:hover.far, [data-toggle].disabled:hover.far,
[data-toggle].disabled:hover.fas, [data-toggle].disabled:hover.fas,
[data-toggle].disabled:hover.fab, [data-toggle].disabled:hover.fab,
[data-toggle].disabled.hover > .fa, [data-toggle].disabled.active > .fa,
[data-toggle].disabled.hover > .far, [data-toggle].disabled.active > .far,
[data-toggle].disabled.hover > .fas, [data-toggle].disabled.active > .fas,
[data-toggle].disabled.hover > .fab, [data-toggle].disabled.active > .fab,
[data-toggle].disabled.hover.fa, [data-toggle].disabled.active.fa,
[data-toggle].disabled.hover.far, [data-toggle].disabled.active.far,
[data-toggle].disabled.hover.fas, [data-toggle].disabled.active.fas,
[data-toggle].disabled.hover.fab, [data-toggle].disabled.active.fab,
[data-toggle].disabled:focus > .fa, [data-toggle].disabled:focus > .fa,
[data-toggle].disabled:focus > .far, [data-toggle].disabled:focus > .far,
[data-toggle].disabled:focus > .fas, [data-toggle].disabled:focus > .fas,
@ -15023,14 +15024,14 @@ button.disabled:hover.fa,
button.disabled:hover.far, button.disabled:hover.far,
button.disabled:hover.fas, button.disabled:hover.fas,
button.disabled:hover.fab, button.disabled:hover.fab,
button.disabled.hover > .fa, button.disabled.active > .fa,
button.disabled.hover > .far, button.disabled.active > .far,
button.disabled.hover > .fas, button.disabled.active > .fas,
button.disabled.hover > .fab, button.disabled.active > .fab,
button.disabled.hover.fa, button.disabled.active.fa,
button.disabled.hover.far, button.disabled.active.far,
button.disabled.hover.fas, button.disabled.active.fas,
button.disabled.hover.fab, button.disabled.active.fab,
button.disabled:focus > .fa, button.disabled:focus > .fa,
button.disabled:focus > .far, button.disabled:focus > .far,
button.disabled:focus > .fas, button.disabled:focus > .fas,
@ -15047,14 +15048,14 @@ button.disabled:focus.fab,
.btn.disabled:hover.far, .btn.disabled:hover.far,
.btn.disabled:hover.fas, .btn.disabled:hover.fas,
.btn.disabled:hover.fab, .btn.disabled:hover.fab,
.btn.disabled.hover > .fa, .btn.disabled.active > .fa,
.btn.disabled.hover > .far, .btn.disabled.active > .far,
.btn.disabled.hover > .fas, .btn.disabled.active > .fas,
.btn.disabled.hover > .fab, .btn.disabled.active > .fab,
.btn.disabled.hover.fa, .btn.disabled.active.fa,
.btn.disabled.hover.far, .btn.disabled.active.far,
.btn.disabled.hover.fas, .btn.disabled.active.fas,
.btn.disabled.hover.fab, .btn.disabled.active.fab,
.btn.disabled:focus > .fa, .btn.disabled:focus > .fa,
.btn.disabled:focus > .far, .btn.disabled:focus > .far,
.btn.disabled:focus > .fas, .btn.disabled:focus > .fas,
@ -15068,7 +15069,7 @@ button.disabled:focus.fab,
} }
[data-toggle='table']:hover, [data-toggle='table']:hover,
[data-toggle='table'].hover, [data-toggle='table'].active,
[data-toggle='table']:focus { [data-toggle='table']:focus {
opacity: 1; opacity: 1;
} }
@ -15162,7 +15163,7 @@ textarea,
} }
.btn:hover, .btn:hover,
.btn.hover, .btn.active,
.btn:focus { .btn:focus {
opacity: 1; opacity: 1;
} }
@ -15182,7 +15183,7 @@ textarea,
/* /*
.dropdown.show { .dropdown.show {
.dropdown { .dropdown {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
.dropdown-menu { .dropdown-menu {
display: block; display: block;
@ -15196,7 +15197,7 @@ textarea,
} }
.dropdown-hover ul li { .dropdown-hover ul li {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
> .dropdown-toggle::after { > .dropdown-toggle::after {
transform: rotate(-90deg); transform: rotate(-90deg);
@ -15221,7 +15222,7 @@ textarea,
} }
.dropdown-hover ul ul li { .dropdown-hover ul ul li {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
> ul { > ul {
display: block; display: block;
@ -15242,7 +15243,7 @@ textarea,
} }
.dropdown-hover ul ul ul li { .dropdown-hover ul ul ul li {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
ul { ul {
display: block; display: block;
@ -15300,6 +15301,7 @@ textarea,
.dropdown-menu.bg-dark .nav-link.disabled, .dropdown-menu.bg-dark .nav-link.disabled,
.dropdown-menu.bg-alt .nav-link.disabled, .dropdown-menu.bg-alt .nav-link.disabled,
.element.site__elements__accordion .card .dropdown-menu.card-header .nav-link.disabled { .element.site__elements__accordion .card .dropdown-menu.card-header .nav-link.disabled {
cursor: default;
color: rgba(255, 255, 255, 0.25); color: rgba(255, 255, 255, 0.25);
} }
@ -15383,11 +15385,11 @@ input.time[readonly] {
} }
.bootstrap-timepicker-widget .glyphicon-chevron-up:before { .bootstrap-timepicker-widget .glyphicon-chevron-up:before {
content: "\f077"; content: '\f077';
} }
.bootstrap-timepicker-widget .glyphicon-chevron-down:before { .bootstrap-timepicker-widget .glyphicon-chevron-down:before {
content: "\f078"; content: '\f078';
} }
.bootstrap-timepicker-widget input { .bootstrap-timepicker-widget input {

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "@a2nt/ss-bootstrap-ui-webpack-boilerplate", "name": "@a2nt/ss-bootstrap-ui-webpack-boilerplate",
"version": "1.4.8", "version": "1.5.0",
"author": "Tony Air <tony@twma.pro>", "author": "Tony Air <tony@twma.pro>",
"license": "MIT", "license": "MIT",
"description": "This UI Kit allows you to build Bootstrap 4 webapp with some extra UI features. It's easy to extend and easy to convert HTML templates to CMS templates.", "description": "This UI Kit allows you to build Bootstrap 4 webapp with some extra UI features. It's easy to extend and easy to convert HTML templates to CMS templates.",
@ -48,7 +48,7 @@
"jquery.appear": "^1.0.1", "jquery.appear": "^1.0.1",
"jquery.inputmask": "^3.3.4", "jquery.inputmask": "^3.3.4",
"laravel-mix": "^4.1.2", "laravel-mix": "^4.1.2",
"mapbox-gl": "^1.6.0", "mapbox-gl": "^1.6.1",
"offcanvas-bootstrap": "^2.5.2", "offcanvas-bootstrap": "^2.5.2",
"popper.js": "^1.15.0", "popper.js": "^1.15.0",
"pouchdb": "^6.4.3", "pouchdb": "^6.4.3",
@ -104,12 +104,10 @@
"style-loader": "^0.19.0", "style-loader": "^0.19.0",
"svg-url-loader": "^2.3.3", "svg-url-loader": "^2.3.3",
"terser-webpack-plugin": "^2.3.1", "terser-webpack-plugin": "^2.3.1",
"uglify-js": "git://github.com/mishoo/UglifyJS2.git#harmony-v2.8.22",
"uglifyjs-webpack-plugin": "^2.2.0",
"url-loader": "^0.6.2", "url-loader": "^0.6.2",
"webpack": "^4.41.3", "webpack": "^4.41.5",
"webpack-cli": "^3.3.10", "webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0", "webpack-dev-server": "^3.10.1",
"webpack-manifest-plugin": "^1.3.2", "webpack-manifest-plugin": "^1.3.2",
"webpack-merge": "^4.1.1" "webpack-merge": "^4.1.1"
}, },

View File

@ -26,11 +26,11 @@ input.time {
} }
.glyphicon-chevron-up:before { .glyphicon-chevron-up:before {
content: "\f077"; content: '\f077';
} }
.glyphicon-chevron-down:before { .glyphicon-chevron-down:before {
content: "\f078"; content: '\f078';
} }
input { input {
@ -71,14 +71,15 @@ input.time {
// Avoid using mixin so we can pass custom focus shadow properly // Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows { @if $enable-shadows {
box-shadow: $input-box-shadow, $input-focus-box-shadow; box-shadow: $input-box-shadow, $input-focus-box-shadow;
} } @else {
@else {
box-shadow: $input-focus-box-shadow; box-shadow: $input-focus-box-shadow;
} }
&.select2-selection--single {} &.select2-selection--single {
}
&.select2-selection--multiple {} &.select2-selection--multiple {
}
} }
} }
@ -89,7 +90,8 @@ input.time {
line-height: inherit; line-height: inherit;
} }
&.select2-selection--single {} &.select2-selection--single {
}
&.select2-selection--multiple { &.select2-selection--multiple {
padding-top: 0; padding-top: 0;

View File

@ -32,7 +32,7 @@ a,
button, button,
.btn { .btn {
&:hover, &:hover,
&.hover, &.active,
&:focus { &:focus {
opacity: 0.8; opacity: 0.8;
@ -50,9 +50,10 @@ button,
&.disabled { &.disabled {
opacity: 0.5; opacity: 0.5;
cursor: default;
&:hover, &:hover,
&.hover, &.active,
&:focus { &:focus {
> .fa, > .fa,
> .far, > .far,
@ -71,7 +72,7 @@ button,
// exclude bootstrap-table // exclude bootstrap-table
[data-toggle='table'] { [data-toggle='table'] {
&:hover, &:hover,
&.hover, &.active,
&:focus { &:focus {
opacity: 1; opacity: 1;
} }
@ -178,7 +179,7 @@ textarea,
// rewrite btn opacity on hover // rewrite btn opacity on hover
.btn { .btn {
&:hover, &:hover,
&.hover, &.active,
&:focus { &:focus {
opacity: 1; opacity: 1;
} }
@ -215,7 +216,7 @@ textarea,
/* /*
.dropdown.show { .dropdown.show {
.dropdown { .dropdown {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
.dropdown-menu { .dropdown-menu {
display: block; display: block;
@ -229,7 +230,7 @@ textarea,
} }
.dropdown-hover ul li { .dropdown-hover ul li {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
> .dropdown-toggle::after { > .dropdown-toggle::after {
transform: rotate(-90deg); transform: rotate(-90deg);
@ -254,7 +255,7 @@ textarea,
} }
.dropdown-hover ul ul li { .dropdown-hover ul ul li {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
> ul { > ul {
display: block; display: block;
@ -275,7 +276,7 @@ textarea,
} }
.dropdown-hover ul ul ul li { .dropdown-hover ul ul ul li {
&:hover,&.hover, &:hover,&.active,
&:focus { &:focus {
ul { ul {
display: block; display: block;
@ -324,6 +325,7 @@ textarea,
} }
&.disabled { &.disabled {
cursor: default;
color: $navbar-dark-disabled-color; color: $navbar-dark-disabled-color;
} }
} }

View File

@ -1,6 +1,7 @@
@mixin ss_hover() { @mixin hover-disabled() {
&:not(.disabled) { &:not(.disabled) {
&.hover, &.active,
&:active,
&:hover, &:hover,
&:focus { &:focus {
@content; @content;