diff --git a/src/app/pages/maps/components/leafletMaps/leafletMaps.scss b/src/app/pages/maps/components/leafletMaps/leafletMaps.scss index adaa6a3a..e002eceb 100644 --- a/src/app/pages/maps/components/leafletMaps/leafletMaps.scss +++ b/src/app/pages/maps/components/leafletMaps/leafletMaps.scss @@ -1,6 +1,7 @@ @import '../../../../theme/sass/conf/conf'; -#leaflet-map { +.leaflet-maps { + width: 100%; height: calc(100vh - 283px); } diff --git a/src/app/theme/components/pageTop/pageTop.scss b/src/app/theme/components/pageTop/pageTop.scss index 8098b2d3..96d17aec 100644 --- a/src/app/theme/components/pageTop/pageTop.scss +++ b/src/app/theme/components/pageTop/pageTop.scss @@ -14,6 +14,10 @@ &.scrolled { background-color: rgba(black, 0.85) } + + .dropdown-toggle::after { + display: none; + } } a.al-logo { diff --git a/src/app/theme/sass/_buttons.scss b/src/app/theme/sass/_buttons.scss index cf0350d6..874fa8e3 100644 --- a/src/app/theme/sass/_buttons.scss +++ b/src/app/theme/sass/_buttons.scss @@ -7,6 +7,8 @@ $hover: 24; .btn { border-radius: 5px; transition: all 0.1s ease; + padding: 0.344rem 1rem; + font-size: 0.9rem; } .btn:hover { @@ -255,6 +257,26 @@ button.progress-button { font-size: 16px; } +.btn-group-xs>.btn, .btn-xs { + padding: 1px 5px; + font-size: 12px; + line-height: 1.5; +} + +.btn-group-sm>.btn, .btn-sm { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} + +.btn-group-lg>.btn, .btn-lg { + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} + .dropdown button.btn.btn-default.dropdown-toggle { color: $default-text; border: 1px solid $border; diff --git a/src/app/theme/sass/_form.scss b/src/app/theme/sass/_form.scss index 0ff4447c..47a9f350 100644 --- a/src/app/theme/sass/_form.scss +++ b/src/app/theme/sass/_form.scss @@ -348,22 +348,42 @@ label.custom-input-danger { color: $label-text; } } +.form-control-feedback { + position: absolute; + top: 0; + right: 0; + z-index: 2; + display: block; + width: 34px; + height: 34px; + line-height: 34px; + text-align: center; + pointer-events: none; +} .has-success { @include validationState($success-bg, $success); + position: relative; } .has-warning { @include validationState($warning-bg, $warning); + position: relative; } .has-error { @include validationState($danger-bg, $danger); + position: relative; } -.has-feedback label ~ .form-control-feedback { - top: 21px; - font-size: 18px; +.has-feedback { + .form-control { + padding-right: 42.5px; + } + label ~ .form-control-feedback { + top: 21px; + font-size: 18px; + } } .bootstrap-select {