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,12 +1,14 @@
// Lumen 4.5.0
// Lumen 4.5.3
// Bootswatch
// Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic&display=swap" !default;
$web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" !default;
@import url($web-font-path);
// Mixins ======================================================================
@mixin shadow($width: 4px){
border-style: solid;
border-width: 0 1px $width 1px;
@ -27,8 +29,8 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
.bg-light {
background-color: #fff !important;
border-color: darken(#fff, 5%);
background-color: $white !important;
border-color: darken($white, 5%);
}
// Buttons =====================================================================
@ -47,13 +49,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
border-bottom-width: 2px;
@include box-shadow(none);
}
}
[class*="btn-outline"] {
border-top-width: 1px;
}
.btn {
&-primary {
border-color: darken($primary, 5%);
}
@ -87,6 +83,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
}
[class*="btn-outline"] {
border-top-width: 1px;
}
.btn-group-vertical {
.btn + .btn {
&:hover {
@ -114,13 +114,12 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
// Tables ======================================================================
.table {
&-primary,
&-success,
&-info,
&-warning,
&-danger {
color: #fff;
color: $white;
}
&-hover tbody {
@ -130,116 +129,151 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
.table-warning:hover,
.table-danger:hover,
.table-dark:hover {
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;
}
}
@ -250,7 +284,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
// Forms =======================================================================
.form-control {
box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
box-shadow: inset 0 2px 0 rgba(0, 0, 0, .075);
}
.input-group-sm {
@ -273,7 +307,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
.nav-tabs {
.nav-link {
color: $body-color;
@ -283,13 +316,13 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
&.disabled:focus {
margin-top: 6px;
border-color: $nav-tabs-border-color;
transition: all 0.2s ease-in-out;
transition: padding-bottom .2s ease-in-out, margin-top .2s ease-in-out, border-bottom .2s ease-in-out;
}
&:not(.disabled):hover,
&:not(.disabled):focus,
&.active {
padding-bottom: calc(0.5em + 6px);
padding-bottom: add(.5rem, 6px);
border-bottom-color: transparent;
margin-top: 0;
}
@ -313,7 +346,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
.pagination {
> li > a,
> li > span {
position: relative;
@ -321,7 +353,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
@include shadow();
color: $pagination-color;
font-size: 12px;
font-weight: bold;
font-weight: 700;
text-transform: uppercase;
&:hover,
@ -339,7 +371,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
> .disabled > a,
> .disabled > span {
&:hover {
top: 0;
@include shadow();
@ -353,12 +384,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
.pager {
> li > a,
> li > span,
> .disabled > a,
> .disabled > span {
&,
&:hover,
&:active {
@ -372,7 +401,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
.close {
text-decoration: none;
opacity: 0.4;
opacity: .4;
&:hover,
&:focus {
@ -425,16 +454,16 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
.alert-link {
font-weight: normal;
color: #fff;
font-weight: 400;
color: $white;
text-decoration: underline;
}
&-secondary,
&-light {
&,
& a,
& .alert-link {
a,
.alert-link {
color: $body-color;
}
}
@ -447,12 +476,9 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
}
}
// Progress bars ===============================================================
// Containers ==================================================================
a.list-group-item {
&-success {
&.active {
background-color: $success;
@ -489,12 +515,11 @@ a.list-group-item {
.jumbotron {
border: 1px solid $gray-200;
box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 0 rgba(0, 0, 0, .05);
}
.modal,
.toast {
.close {
color: $black;

View file

@ -1,4 +1,4 @@
// Lumen 4.5.0
// Lumen 4.5.3
// Bootswatch
//
@ -17,16 +17,16 @@ $gray-800: #333 !default;
$gray-900: #222 !default;
$black: #000 !default;
$blue: #158CBA !default;
$blue: #158cba !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$pink: #e83e8c !default;
$red: #FF4136 !default;
$red: #ff4136 !default;
$orange: #fd7e14 !default;
$yellow: #FF851B !default;
$green: #28B62C !default;
$yellow: #ff851b !default;
$green: #28b62c !default;
$teal: #20c997 !default;
$cyan: #75CAEB !default;
$cyan: #75caeb !default;
$primary: $blue !default;
$secondary: $gray-200 !default;
@ -41,21 +41,19 @@ $yiq-contrasted-threshold: 200 !default;
// Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$font-size-base: 0.875rem !default;
$font-size-base: .875rem !default;
// Buttons
$btn-font-size: 0.75rem !default;
$btn-font-size-sm: 0.625rem !default;
$btn-font-weight: bold !default;
$btn-font-size: .75rem !default;
$btn-font-size-sm: .625rem !default;
$btn-font-weight: 700 !default;
// Dropdowns
$dropdown-link-color: rgba(0,0,0,.5) !default;
$dropdown-link-color: rgba(0, 0, 0, .5) !default;
// Navs
@ -68,12 +66,9 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
$pagination-color: $gray-700 !default;
$pagination-bg: $gray-200 !default;
$pagination-hover-color: $pagination-color !default;
$pagination-hover-bg: $pagination-bg !default;
$pagination-active-border-color: darken($primary, 5%) !default;
$pagination-disabled-color: $gray-600 !default;
$pagination-disabled-bg: $pagination-bg !default;
@ -83,7 +78,7 @@ $jumbotron-bg: #fafafa !default;
// Modals
$modal-content-border-color: rgba($black,.1) !default;
$modal-content-border-color: rgba($black, .1) !default;
// Close