1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00

Bootstrap & Bootswatch Upgrade: 4.5 -> 4.5.3

This commit is contained in:
catborise 2020-11-06 16:16:40 +03:00
parent 12fa9e7cf1
commit e2e62a3ad4
67 changed files with 1507 additions and 1368 deletions

View file

@ -1,8 +1,8 @@
// Slate 4.5.0
// Slate 4.5.3
// Bootswatch
// Variables ===================================================================
// Mixins ======================================================================
@mixin btn-shadow($color){
@include gradient-y-three-colors(lighten($color, 6%), $color, 60%, darken($color, 4%));
@ -17,46 +17,46 @@
// Navbar ======================================================================
.navbar {
border: 1px solid rgba(0, 0, 0, 0.6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
border: 1px solid rgba(0, 0, 0, .6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
.container {
padding: 0;
}
.navbar-toggler {
border-color: rgba(0, 0, 0, 0.6);
border-color: rgba(0, 0, 0, .6);
}
&-fixed-top {
border-width: 0 0 1px 0;
border-width: 0 0 1px;
}
&-fixed-bottom {
border-width: 1px 0 0 0;
border-width: 1px 0 0;
}
.nav-link {
padding: 1rem;
border-left: 1px solid rgba(255, 255, 255, 0.1);
border-right: 1px solid rgba(0, 0, 0, 0.2);
border-left: 1px solid rgba(255, 255, 255, .1);
border-right: 1px solid rgba(0, 0, 0, .2);
&:hover,
&:focus {
@include btn-shadow-inverse($gray-800);
border-left: 1px solid rgba(0, 0, 0, 0.2);
border-left: 1px solid rgba(0, 0, 0, .2);
}
}
&-brand {
padding: 0.75rem 1rem calc(54px - 0.75rem - 30px);
padding: .75rem 1rem subtract(24px, .75rem);
margin-right: 0;
border-right: 1px solid rgba(0, 0, 0, 0.2);
border-right: 1px solid rgba(0, 0, 0, .2);
}
.nav-item.active .nav-link {
background-color: rgba(0, 0, 0, 0.3);
border-left: 1px solid rgba(0, 0, 0, 0.2);
background-color: rgba(0, 0, 0, .3);
border-left: 1px solid rgba(0, 0, 0, .2);
}
&-nav .nav-item + .nav-item {
@ -64,13 +64,13 @@
}
&.bg-light {
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .1);
.nav-link {
&:hover,
&:focus {
@include btn-shadow-inverse($gray-600);
border-left: 1px solid rgba(0, 0, 0, 0.2);
border-left: 1px solid rgba(0, 0, 0, .2);
}
}
}
@ -106,12 +106,12 @@
// Buttons =====================================================================
.btn {
border-color: rgba(0, 0, 0, 0.6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
border-color: rgba(0, 0, 0, .6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
&:not([disabled]):not(.disabled).active,
&.disabled {
border-color: rgba(0, 0, 0, 0.6);
border-color: rgba(0, 0, 0, .6);
box-shadow: none;
}
@ -120,7 +120,7 @@
&:not([disabled]):not(.disabled):active,
&:not([disabled]):not(.disabled):active:hover,
&:not([disabled]):not(.disabled).active:hover {
border-color: rgba(0, 0, 0, 0.6);
border-color: rgba(0, 0, 0, .6);
}
}
@ -195,7 +195,7 @@
.btn-outline {
&-primary {
color: #fff;
color: $white;
}
}
@ -206,137 +206,175 @@
.btn-group,
.btn-group-vertical {
.btn.active {
border-color: rgba(0, 0, 0, 0.6);
border-color: rgba(0, 0, 0, .6);
}
}
// Typography ==================================================================
h1, h2, h3, h4, h5, h6 {
text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
h1,
h2,
h3,
h4,
h5,
h6 {
text-shadow: -1px -1px 0 rgba(0, 0, 0, .3);
}
// Tables ======================================================================
.table {
&-primary,
&-secondary,
&-success,
&-info,
&-warning,
&-danger {
color: #fff;
color: $white;
}
&-primary {
&, > th, > td {
&,
> th,
> td {
background-color: $primary;
}
}
&-secondary {
&, > th, > td {
&,
> th,
> td {
background-color: $secondary;
}
}
&-light {
&, > th, > td {
&,
> th,
> td {
background-color: $light;
}
}
&-dark {
&, > th, > td {
&,
> th,
> td {
background-color: $dark;
}
}
&-success {
&, > th, > td {
&,
> th,
> td {
background-color: $success;
}
}
&-info {
&, > th, > td {
&,
> th,
> td {
background-color: $info;
}
}
&-danger {
&, > th, > td {
&,
> th,
> td {
background-color: $danger;
}
}
&-warning {
&, > th, > td {
&,
> th,
> td {
background-color: $warning;
}
}
&-active {
&, > th, > td {
&,
> th,
> td {
background-color: $table-active-bg;
}
}
&-hover {
.table-primary:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($primary, 5%);
}
}
.table-secondary:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($secondary, 5%);
}
}
.table-light:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($light, 5%);
}
}
.table-dark:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($dark, 5%);
}
}
.table-success:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($success, 5%);
}
}
.table-info:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($info, 5%);
}
}
.table-danger:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($danger, 5%);
}
}
.table-warning:hover {
&, > th, > td {
&,
> th,
> td {
background-color: darken($warning, 5%);
}
}
.table-active:hover {
&, > th, > td {
&,
> th,
> td {
background-color: $table-active-bg;
}
}
@ -347,22 +385,21 @@ h1, h2, h3, h4, h5, h6 {
// Forms =======================================================================
legend {
color: #fff;
color: $white;
}
.input-group-addon {
@include btn-shadow($secondary);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
color: $white;
}
// Navs ========================================================================
.nav-tabs {
.nav-link {
@include btn-shadow-inverse($gray-800);
border: 1px solid rgba(0, 0, 0, 0.6);
border: 1px solid rgba(0, 0, 0, .6);
&:not([disabled]):not(.disabled):hover,
&:not([disabled]):not(.disabled):focus,
@ -372,27 +409,26 @@ legend {
}
&.disabled {
border: 1px solid rgba(0, 0, 0, 0.6);
border: 1px solid rgba(0, 0, 0, .6);
}
}
.nav-link,
.nav-link:hover {
color: #fff;
color: $white;
}
}
.nav-pills {
.nav-link {
@include btn-shadow($gray-800);
border: 1px solid rgba(0, 0, 0, 0.6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
color: #fff;
border: 1px solid rgba(0, 0, 0, .6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
color: $white;
&:hover {
@include btn-shadow-inverse($gray-800);
border: 1px solid rgba(0, 0, 0, 0.6);
border: 1px solid rgba(0, 0, 0, .6);
}
}
@ -400,7 +436,7 @@ legend {
.nav-link:hover {
background-color: transparent;
@include btn-shadow-inverse($gray-800);
border: 1px solid rgba(0, 0, 0, 0.6);
border: 1px solid rgba(0, 0, 0, .6);
}
.nav-link.disabled,
@ -411,9 +447,8 @@ legend {
}
.pagination {
.page-link {
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
@include btn-shadow($gray-800);
&:hover {
@ -432,34 +467,26 @@ legend {
}
.breadcrumb {
border: 1px solid rgba(0, 0, 0, 0.6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
border: 1px solid rgba(0, 0, 0, .6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
background-color: transparent;
@include btn-shadow($gray-800);
a,
a:hover {
color: #fff;
color: $white;
}
}
// Indicators ==================================================================
.alert {
.close {
color: $close-color;
text-decoration: none;
}
}
.alert {
border: none;
color: $white;
a,
.alert-link {
color: #fff;
color: $white;
text-decoration: underline;
}
@ -471,15 +498,19 @@ legend {
&-light {
&,
& a:not(.btn),
& .alert-link {
a:not(.btn),
.alert-link {
color: $body-bg;
}
}
.close {
color: $close-color;
text-decoration: none;
}
}
.badge {
&-success,
&-warning,
&-info {
@ -487,16 +518,13 @@ legend {
}
}
// Progress bars ===============================================================
// Containers ==================================================================
.jumbotron {
border: 1px solid rgba(0, 0, 0, 0.6);
border: 1px solid rgba(0, 0, 0, .6);
}
.list-group {
&-item:hover {
background-color: darken($gray-900, 5%);
}

View file

@ -1,4 +1,4 @@
// Slate 4.5.0
// Slate 4.5.3
// Bootswatch
//
@ -11,10 +11,10 @@ $gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
$gray-400: #ced4da !default;
$gray-500: #999 !default;
$gray-600: #7A8288 !default;
$gray-700: #52575C !default;
$gray-800: #3A3F44 !default;
$gray-900: #272B30 !default;
$gray-600: #7a8288 !default;
$gray-700: #52575c !default;
$gray-800: #3a3f44 !default;
$gray-900: #272b30 !default;
$black: #000 !default;
$blue: #007bff !default;
@ -50,16 +50,15 @@ $link-color: $white !default;
// Fonts
$font-size-base: 0.9375rem !default;
$font-size-base: .9375rem !default;
$font-size-sm: $font-size-base * .88 !default;
// Tables
$table-color: $white !default;
$table-accent-bg: rgba($white,.05) !default;
$table-hover-bg: rgba($white,.075) !default;
$table-border-color: rgba($black,.6) !default;
$table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white, .075) !default;
$table-border-color: rgba($black, .6) !default;
$table-dark-border-color: $table-border-color !default;
$table-dark-color: $white !default;
@ -76,18 +75,16 @@ $input-disabled-bg: #ccc !default;
$dropdown-bg: $gray-800 !default;
$dropdown-border-color: rgba($black, .6) !default;
$dropdown-divider-bg: rgba($black,.15) !default;
$dropdown-divider-bg: rgba($black, .15) !default;
$dropdown-link-color: $body-color !default;
$dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $body-bg !default;
$dropdown-link-active-color: $dropdown-link-hover-color !default;
$dropdown-link-active-bg: $dropdown-link-hover-bg !default;
// Navs
$nav-tabs-border-color: rgba($black, 0.6) !default;
$nav-tabs-border-color: rgba($black, .6) !default;
$nav-tabs-link-hover-border-color: $nav-tabs-border-color !default;
$nav-tabs-link-active-color: $white !default;
$nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
@ -95,9 +92,7 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
// Navbar
$navbar-padding-y: 0 !default;
$navbar-dark-hover-color: $white !default;
$navbar-light-hover-color: $gray-800 !default;
$navbar-light-active-color: $gray-800 !default;
@ -106,17 +101,14 @@ $navbar-light-active-color: $gray-800 !default;
$pagination-color: $white !default;
$pagination-bg: transparent !default;
$pagination-border-color: rgba($black, 0.6) !default;
$pagination-border-color: rgba($black, .6) !default;
$pagination-hover-color: $white !default;
$pagination-hover-bg: transparent !default;
$pagination-hover-border-color: rgba($black, 0.6) !default;
$pagination-hover-border-color: rgba($black, .6) !default;
$pagination-active-bg: transparent !default;
$pagination-active-border-color: rgba($black, 0.6) !default;
$pagination-active-border-color: rgba($black, .6) !default;
$pagination-disabled-bg: transparent !default;
$pagination-disabled-border-color: rgba($black, 0.6) !default;
$pagination-disabled-border-color: rgba($black, .6) !default;
// Jumbotron
@ -125,7 +117,7 @@ $jumbotron-bg: darken($gray-900, 5%) !default;
// Cards
$card-border-color: rgba($black, 0.6) !default;
$card-border-color: rgba($black, .6) !default;
$card-cap-bg: lighten($gray-800, 10%) !default;
$card-bg: lighten($body-bg, 5%) !default;
@ -136,8 +128,7 @@ $popover-bg: lighten($body-bg, 5%) !default;
// Toasts
$toast-background-color: lighten($body-bg, 5%) !default;
$toast-border-color: rgba(0,0,0,.2) !default;
$toast-border-color: rgba(0, 0, 0, .2) !default;
$toast-header-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default;
@ -145,8 +136,7 @@ $toast-header-border-color: $toast-border-color !default;
// Modals
$modal-content-bg: lighten($body-bg, 5%) !default;
$modal-header-border-color: rgba(0,0,0,.2) !default;
$modal-header-border-color: rgba(0, 0, 0, .2) !default;
// Progress bars
@ -156,15 +146,12 @@ $progress-bar-color: $gray-600 !default;
// List group
$list-group-bg: lighten($body-bg, 5%) !default;
$list-group-border-color: rgba($black, 0.6) !default;
$list-group-border-color: rgba($black, .6) !default;
$list-group-hover-bg: lighten($body-bg, 10%) !default;
$list-group-active-color: $white !default;
$list-group-active-bg: $list-group-hover-bg !default;
$list-group-active-border-color: $list-group-border-color !default;
$list-group-disabled-color: $gray-700 !default;
$list-group-action-color: $white !default;
// Breadcrumbs