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,16 +1,15 @@
// Cyborg 4.5.0
// Cyborg 4.5.3
// Bootswatch
// Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700&display=swap" !default;
$web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" !default;
@import url($web-font-path);
// Navbar ======================================================================
.navbar {
&.bg-primary {
border: 1px solid $gray-700;
}
@ -25,13 +24,12 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700&display=
}
&.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;
}
}
// Buttons =====================================================================
@ -48,122 +46,154 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700&display=
}
}
// Typography ==================================================================
// Tables ======================================================================
table {
color: #fff;
color: $white;
}
.table {
&-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;
}
}
@ -174,7 +204,7 @@ table {
// Forms =======================================================================
legend {
color: #fff;
color: $white;
}
.form-control {
@ -191,7 +221,7 @@ legend {
.nav-tabs,
.nav-pills {
.nav-link {
color: #fff;
color: $white;
&:hover {
background-color: $gray-700;
@ -211,7 +241,7 @@ legend {
.breadcrumb {
a {
color: #fff;
color: $white;
}
}
@ -229,7 +259,7 @@ legend {
a,
.alert-link {
color: #fff;
color: $white;
text-decoration: underline;
}
@ -251,21 +281,19 @@ legend {
}
.close {
opacity: 0.6;
opacity: .6;
&:hover {
opacity: 1;
}
}
// Progress bars ===============================================================
// Containers ==================================================================
.list-group-item {
&:hover {
background-color: $gray-700;
color: #fff;
color: $white;
}
&-action {
@ -277,13 +305,18 @@ legend {
}
&:hover .list-group-item-heading {
color: #fff;
color: $white;
}
}
.card,
.list-group-item {
h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit;
}
}

View file

@ -1,4 +1,4 @@
// Cyborg 4.5.0
// Cyborg 4.5.3
// Bootswatch
//
@ -9,7 +9,7 @@ $white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
$gray-400: #ADAFAE !default;
$gray-400: #adafae !default;
$gray-500: #888 !default;
$gray-600: #555 !default;
$gray-700: #282828 !default;
@ -17,16 +17,16 @@ $gray-800: #222 !default;
$gray-900: #212529 !default;
$black: #000 !default;
$blue: #2A9FD6 !default;
$blue: #2a9fd6 !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$pink: #e83e8c !default;
$red: #CC0000 !default;
$red: #c00 !default;
$orange: #fd7e14 !default;
$yellow: #FF8800 !default;
$green: #77B300 !default;
$yellow: #f80 !default;
$green: #77b300 !default;
$teal: #20c997 !default;
$cyan: #9933CC !default;
$cyan: #93c !default;
$primary: $blue !default;
$secondary: $gray-600 !default;
@ -47,28 +47,24 @@ $body-color: $gray-400 !default;
// Fonts
$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
$font-size-base: .875rem !default;
$h1-font-size: 4rem !default;
$h2-font-size: 3rem !default;
$h3-font-size: 2.5rem !default;
$h4-font-size: 2rem !default;
$h5-font-size: 1.5rem !default;
$headings-color: $white !default;
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif !default;
$font-size-base: .875rem !default;
$h1-font-size: 4rem !default;
$h2-font-size: 3rem !default;
$h3-font-size: 2.5rem !default;
$h4-font-size: 2rem !default;
$h5-font-size: 1.5rem !default;
$headings-color: $white !default;
// Tables
$table-color: $white !default;
$table-accent-bg: rgba($white,.05) !default;
$table-hover-bg: rgba($white,.075) !default;
$table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white, .075) !default;
$table-border-color: $gray-700 !default;
$table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default;
$table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default;
// Buttons
@ -76,14 +72,11 @@ $input-btn-padding-x: 1rem !default;
// Forms
$input-disabled-bg: $gray-400 !default;
$input-border-color: $white !default;
$input-disabled-bg: $gray-400 !default;
$input-border-color: $white !default;
$input-group-addon-color: $white !default;
$input-group-addon-bg: $gray-700 !default;
$input-group-addon-border-color: transparent !default;
$custom-file-color: $white !default;
$custom-file-border-color: $gray-700 !default;
@ -91,7 +84,6 @@ $custom-file-border-color: $gray-700 !default;
$dropdown-bg: $gray-700 !default;
$dropdown-divider-bg: $gray-800 !default;
$dropdown-link-color: $white !default;
$dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $primary !default;
@ -113,71 +105,64 @@ $navbar-dark-hover-color: $white !default;
$pagination-color: $white !default;
$pagination-bg: $gray-700 !default;
$pagination-border-color: transparent !default;
$pagination-hover-color: $white !default;
$pagination-hover-bg: $primary !default;
$pagination-hover-border-color: $pagination-border-color !default;
$pagination-disabled-bg: $pagination-bg !default;
$pagination-disabled-border-color: $pagination-border-color !default;
// Jumbotron
$jumbotron-bg: $gray-700 !default;
$jumbotron-bg: $gray-700 !default;
// Cards
$card-bg: $gray-700 !default;
$card-bg: $gray-700 !default;
// Tooltips
$tooltip-bg: $gray-700 !default;
$tooltip-opacity: 1 !default;
$tooltip-bg: $gray-700 !default;
$tooltip-opacity: 1 !default;
// Popovers
$popover-bg: $gray-700 !default;
$popover-bg: $gray-700 !default;
// Toasts
$toast-color: $white !default;
$toast-background-color: $gray-800 !default;
$toast-border-color: $gray-700 !default;
$toast-header-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default;
// Modals
$modal-content-bg: $gray-800 !default;
$modal-header-border-color: $gray-700 !default;
$modal-content-bg: $gray-800 !default;
$modal-header-border-color: $gray-700 !default;
// Progress bars
$progress-bg: $gray-700 !default;
$progress-bg: $gray-700 !default;
// List group
$list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $primary !default;
$list-group-disabled-bg: $gray-700 !default;
$list-group-action-active-bg: $primary !default;
$list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $primary !default;
$list-group-disabled-bg: $gray-700 !default;
$list-group-action-active-bg: $primary !default;
// Breadcrumbs
$breadcrumb-bg: $gray-700 !default;
$breadcrumb-bg: $gray-700 !default;
// Close
$close-color: $white !default;
$close-text-shadow: none !default;
$close-color: $white !default;
$close-text-shadow: none !default;
// Code