1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-25 23:55:24 +00:00

Merge pull request #386 from catborise/master

upgrades
This commit is contained in:
catborise 2020-11-06 16:18:42 +03:00 committed by GitHub
commit 1b3e7594c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 1533 additions and 1412 deletions

View file

@ -196,9 +196,9 @@ server {
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;
proxy_set_header Host $host:$server_port; proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $remote_addr; proxy_set_header X-Forwarded-Proto $remote_addr;
proxy_connect_timeout 600; proxy_connect_timeout 1800;
proxy_read_timeout 600; proxy_read_timeout 1800;
proxy_send_timeout 600; proxy_send_timeout 1800;
client_max_body_size 1024M; client_max_body_size 1024M;
} }
} }

View file

@ -16,9 +16,9 @@ server {
proxy_set_header Host $host:$server_port; proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $remote_addr; proxy_set_header X-Forwarded-Proto $remote_addr;
proxy_set_header X-Forwarded-Ssl off; proxy_set_header X-Forwarded-Ssl off;
proxy_connect_timeout 600; proxy_connect_timeout 1800;
proxy_read_timeout 600; proxy_read_timeout 1800;
proxy_send_timeout 600; proxy_send_timeout 1800;
client_max_body_size 1024M; client_max_body_size 1024M;
} }

View file

@ -1,21 +1,15 @@
beautifulsoup4==4.9.3 Django==2.2.17
Django==2.2.16 django-bootstrap4==2.3.1
django-bootstrap4==2.2.0 django-icons==2.2.0
django-icons==2.1.1
django-login-required-middleware==0.5.0 django-login-required-middleware==0.5.0
django-otp==1.0.1 django-otp==1.0.2
django-qr-code==1.3.1 django-qr-code==1.3.1
gunicorn==20.0.4 gunicorn==20.0.4
importlib-metadata==1.7.0 importlib-metadata==2.0.0
libsass==0.20.1 libsass==0.20.1
libvirt-python==6.7.0 libvirt-python==6.9.0
lxml==4.5.2 lxml==4.6.1
numpy==1.19.2
pytz==2020.1
qrcode==6.1 qrcode==6.1
rwlock==0.0.7 rwlock==0.0.7
six==1.15.0
soupsieve==2.0.1
sqlparse==0.4.1
websockify==0.9.0 websockify==0.9.0
zipp==3.3.0 zipp==3.4.0

View file

@ -1,7 +1,7 @@
-r ../conf/requirements.txt -r ../conf/requirements.txt
coverage==5.3 coverage==5.3
django-debug-toolbar==2.2 django-debug-toolbar==3.1.1
pycodestyle==2.6.0 pycodestyle==2.6.0
pyflakes==2.2.0 pyflakes==2.2.0
pylint==2.5.3 pylint==2.6.0
yapf==0.30.0 yapf==0.30.0

View file

@ -34,6 +34,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
z-index: 2;
padding: $alert-padding-y $alert-padding-x; padding: $alert-padding-y $alert-padding-x;
color: inherit; color: inherit;
} }

View file

@ -33,6 +33,13 @@
@include border-bottom-radius($card-inner-border-radius); @include border-bottom-radius($card-inner-border-radius);
} }
} }
// Due to specificity of the above selector (`.card > .list-group`), we must
// use a child selector here to prevent double borders.
> .card-header + .list-group,
> .list-group + .card-footer {
border-top: 0;
}
} }
.card-body { .card-body {
@ -83,12 +90,6 @@
&:first-child { &:first-child {
@include border-radius($card-inner-border-radius $card-inner-border-radius 0 0); @include border-radius($card-inner-border-radius $card-inner-border-radius 0 0);
} }
+ .list-group {
.list-group-item:first-child {
border-top: 0;
}
}
} }
.card-footer { .card-footer {
@ -127,6 +128,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
padding: $card-img-overlay-padding; padding: $card-img-overlay-padding;
@include border-radius($card-inner-border-radius);
} }
.card-img, .card-img,
@ -204,12 +206,12 @@
.card-img-top, .card-img-top,
.card-header { .card-header {
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.card-img-bottom, .card-img-bottom,
.card-footer { .card-footer {
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
} }
@ -219,12 +221,12 @@
.card-img-top, .card-img-top,
.card-header { .card-header {
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-top-left-radius: 0; border-top-left-radius: 0;
} }
.card-img-bottom, .card-img-bottom,
.card-footer { .card-footer {
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
} }
@ -262,6 +264,8 @@
// //
.accordion { .accordion {
overflow-anchor: none;
> .card { > .card {
overflow: hidden; overflow: hidden;

View file

@ -9,9 +9,11 @@
.custom-control { .custom-control {
position: relative; position: relative;
z-index: 1;
display: block; display: block;
min-height: $font-size-base * $line-height-base; min-height: $font-size-base * $line-height-base;
padding-left: $custom-control-gutter + $custom-control-indicator-size; padding-left: $custom-control-gutter + $custom-control-indicator-size;
color-adjust: exact; // Keep themed appearance for print
} }
.custom-control-inline { .custom-control-inline {
@ -37,7 +39,7 @@
&:focus ~ .custom-control-label::before { &:focus ~ .custom-control-label::before {
// the mixin is not used here to make sure there is feedback // the mixin is not used here to make sure there is feedback
@if $enable-shadows { @if $enable-shadows {
box-shadow: $input-box-shadow, $input-focus-box-shadow; box-shadow: $input-box-shadow, $custom-control-indicator-focus-box-shadow;
} @else { } @else {
box-shadow: $custom-control-indicator-focus-box-shadow; box-shadow: $custom-control-indicator-focus-box-shadow;
} }
@ -135,10 +137,10 @@
.custom-control-input:disabled { .custom-control-input:disabled {
&:checked ~ .custom-control-label::before { &:checked ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg; @include gradient-bg($custom-control-indicator-checked-disabled-bg);
} }
&:indeterminate ~ .custom-control-label::before { &:indeterminate ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg; @include gradient-bg($custom-control-indicator-checked-disabled-bg);
} }
} }
} }
@ -149,7 +151,7 @@
.custom-radio { .custom-radio {
.custom-control-label::before { .custom-control-label::before {
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-radius: $custom-radio-indicator-border-radius; border-radius: $custom-radio-indicator-border-radius;
} }
@ -161,7 +163,7 @@
.custom-control-input:disabled { .custom-control-input:disabled {
&:checked ~ .custom-control-label::before { &:checked ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg; @include gradient-bg($custom-control-indicator-checked-disabled-bg);
} }
} }
} }
@ -179,7 +181,7 @@
left: -($custom-switch-width + $custom-control-gutter); left: -($custom-switch-width + $custom-control-gutter);
width: $custom-switch-width; width: $custom-switch-width;
pointer-events: all; pointer-events: all;
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-radius: $custom-switch-indicator-border-radius; border-radius: $custom-switch-indicator-border-radius;
} }
@ -189,7 +191,7 @@
width: $custom-switch-indicator-size; width: $custom-switch-indicator-size;
height: $custom-switch-indicator-size; height: $custom-switch-indicator-size;
background-color: $custom-control-indicator-border-color; background-color: $custom-control-indicator-border-color;
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-radius: $custom-switch-indicator-border-radius; border-radius: $custom-switch-indicator-border-radius;
@include transition(transform .15s ease-in-out, $custom-forms-transition); @include transition(transform .15s ease-in-out, $custom-forms-transition);
} }
@ -204,7 +206,7 @@
.custom-control-input:disabled { .custom-control-input:disabled {
&:checked ~ .custom-control-label::before { &:checked ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg; @include gradient-bg($custom-control-indicator-checked-disabled-bg);
} }
} }
} }

View file

@ -22,7 +22,7 @@
display: none; // none by default, but block on "open" of the menu display: none; // none by default, but block on "open" of the menu
float: left; float: left;
min-width: $dropdown-min-width; min-width: $dropdown-min-width;
padding: $dropdown-padding-y 0; padding: $dropdown-padding-y $dropdown-padding-x;
margin: $dropdown-spacer 0 0; // override default ul margin: $dropdown-spacer 0 0; // override default ul
@include font-size($dropdown-font-size); @include font-size($dropdown-font-size);
color: $dropdown-color; color: $dropdown-color;

View file

@ -51,6 +51,9 @@
} }
// See https://codepen.io/kevinweber/pen/dXWoRw // See https://codepen.io/kevinweber/pen/dXWoRw
//
// Requires the use of quotes around data URIs.
@function escape-svg($string) { @function escape-svg($string) {
@if str-index($string, "data:image/svg+xml") { @if str-index($string, "data:image/svg+xml") {
@each $char, $encoded in $escaped-characters { @each $char, $encoded in $escaped-characters {

View file

@ -4,11 +4,7 @@
@if $enable-grid-classes { @if $enable-grid-classes {
// Single container class with breakpoint max-widths // Single container class with breakpoint max-widths
.container { .container,
@include make-container();
@include make-container-max-widths();
}
// 100% wide container at all breakpoints // 100% wide container at all breakpoints
.container-fluid { .container-fluid {
@include make-container(); @include make-container();

View file

@ -111,7 +111,7 @@
margin-top: 0; margin-top: 0;
} }
& + .list-group-item { + .list-group-item {
border-top-width: $list-group-border-width; border-top-width: $list-group-border-width;
border-left-width: 0; border-left-width: 0;

View file

@ -182,7 +182,6 @@
// Place margin between footer elements // Place margin between footer elements
// This solution is far from ideal because of the universal selector usage, // This solution is far from ideal because of the universal selector usage,
// but is needed to fix https://github.com/twbs/bootstrap/issues/24800 // but is needed to fix https://github.com/twbs/bootstrap/issues/24800
// stylelint-disable-next-line selector-max-universal
> * { > * {
margin: $modal-footer-margin-between / 2; margin: $modal-footer-margin-between / 2;
} }

View file

@ -92,6 +92,7 @@
// //
.nav-fill { .nav-fill {
> .nav-link,
.nav-item { .nav-item {
flex: 1 1 auto; flex: 1 1 auto;
text-align: center; text-align: center;
@ -99,6 +100,7 @@
} }
.nav-justified { .nav-justified {
> .nav-link,
.nav-item { .nav-item {
flex-basis: 0; flex-basis: 0;
flex-grow: 1; flex-grow: 1;

View file

@ -199,7 +199,7 @@ a {
// causes specificity issues in many other styles that are too complex to fix. // causes specificity issues in many other styles that are too complex to fix.
// See https://github.com/twbs/bootstrap/issues/19402 // See https://github.com/twbs/bootstrap/issues/19402
a:not([href]) { a:not([href]):not([class]) {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
@ -278,10 +278,14 @@ caption {
caption-side: bottom; caption-side: bottom;
} }
// 1. Removes font-weight bold by inheriting
// 2. Matches default `<td>` alignment by inheriting `text-align`.
// 3. Fix alignment for Safari
th { th {
// Matches default `<td>` alignment by inheriting from the `<body>`, or the font-weight: $table-th-font-weight; // 1
// closest parent with a set `text-align`. text-align: inherit; // 2
text-align: inherit; text-align: -webkit-match-parent; // 3
} }
@ -299,7 +303,7 @@ label {
// //
// Details at https://github.com/twbs/bootstrap/issues/24093 // Details at https://github.com/twbs/bootstrap/issues/24093
button { button {
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-radius: 0; border-radius: 0;
} }

View file

@ -13,7 +13,7 @@
vertical-align: text-bottom; vertical-align: text-bottom;
border: $spinner-border-width solid currentColor; border: $spinner-border-width solid currentColor;
border-right-color: transparent; border-right-color: transparent;
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-radius: 50%; border-radius: 50%;
animation: spinner-border .75s linear infinite; animation: spinner-border .75s linear infinite;
} }
@ -44,7 +44,7 @@
height: $spinner-height; height: $spinner-height;
vertical-align: text-bottom; vertical-align: text-bottom;
background-color: currentColor; background-color: currentColor;
// stylelint-disable-next-line property-blacklist // stylelint-disable-next-line property-disallowed-list
border-radius: 50%; border-radius: 50%;
opacity: 0; opacity: 0;
animation: spinner-grow .75s linear infinite; animation: spinner-grow .75s linear infinite;

View file

@ -1,13 +1,14 @@
.toast { .toast {
// Prevents from shrinking in IE11, when in a flex container
// See https://github.com/twbs/bootstrap/issues/28341
flex-basis: $toast-max-width;
max-width: $toast-max-width; max-width: $toast-max-width;
overflow: hidden; // cheap rounded corners on nested items
@include font-size($toast-font-size); @include font-size($toast-font-size);
color: $toast-color; color: $toast-color;
background-color: $toast-background-color; background-color: $toast-background-color;
background-clip: padding-box; background-clip: padding-box;
border: $toast-border-width solid $toast-border-color; border: $toast-border-width solid $toast-border-color;
box-shadow: $toast-box-shadow; box-shadow: $toast-box-shadow;
backdrop-filter: blur(10px);
opacity: 0; opacity: 0;
@include border-radius($toast-border-radius); @include border-radius($toast-border-radius);
@ -37,6 +38,7 @@
background-color: $toast-header-background-color; background-color: $toast-header-background-color;
background-clip: padding-box; background-clip: padding-box;
border-bottom: $toast-border-width solid $toast-header-border-color; border-bottom: $toast-border-width solid $toast-header-border-color;
@include border-top-radius(subtract($toast-border-radius, $toast-border-width));
} }
.toast-body { .toast-body {

View file

@ -18,7 +18,6 @@ $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$grays: () !default; $grays: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$grays: map-merge( $grays: map-merge(
( (
"100": $gray-100, "100": $gray-100,
@ -46,7 +45,6 @@ $teal: #20c997 !default;
$cyan: #17a2b8 !default; $cyan: #17a2b8 !default;
$colors: () !default; $colors: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$colors: map-merge( $colors: map-merge(
( (
"blue": $blue, "blue": $blue,
@ -76,7 +74,6 @@ $light: $gray-100 !default;
$dark: $gray-800 !default; $dark: $gray-800 !default;
$theme-colors: () !default; $theme-colors: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$theme-colors: map-merge( $theme-colors: map-merge(
( (
"primary": $primary, "primary": $primary,
@ -103,11 +100,11 @@ $yiq-text-light: $white !default;
// Characters which are escaped by the escape-svg function // Characters which are escaped by the escape-svg function
$escaped-characters: ( $escaped-characters: (
("<","%3c"), ("<", "%3c"),
(">","%3e"), (">", "%3e"),
("#","%23"), ("#", "%23"),
("(","%28"), ("(", "%28"),
(")","%29"), (")", "%29"),
) !default; ) !default;
@ -138,7 +135,6 @@ $enable-deprecation-messages: true !default;
$spacer: 1rem !default; $spacer: 1rem !default;
$spacers: () !default; $spacers: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$spacers: map-merge( $spacers: map-merge(
( (
0: 0, 0: 0,
@ -153,7 +149,6 @@ $spacers: map-merge(
// This variable affects the `.h-*` and `.w-*` classes. // This variable affects the `.h-*` and `.w-*` classes.
$sizes: () !default; $sizes: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$sizes: map-merge( $sizes: map-merge(
( (
25: 25%, 25: 25%,
@ -264,7 +259,6 @@ $transition-fade: opacity .15s linear !default;
$transition-collapse: height .35s ease !default; $transition-collapse: height .35s ease !default;
$embed-responsive-aspect-ratios: () !default; $embed-responsive-aspect-ratios: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$embed-responsive-aspect-ratios: join( $embed-responsive-aspect-ratios: join(
( (
(21 9), (21 9),
@ -369,6 +363,7 @@ $table-border-color: $border-color !default;
$table-head-bg: $gray-200 !default; $table-head-bg: $gray-200 !default;
$table-head-color: $gray-700 !default; $table-head-color: $gray-700 !default;
$table-th-font-weight: null !default;
$table-dark-color: $white !default; $table-dark-color: $white !default;
$table-dark-bg: $gray-800 !default; $table-dark-bg: $gray-800 !default;
@ -546,7 +541,7 @@ $custom-control-label-disabled-color: $gray-600 !default;
$custom-control-indicator-checked-color: $component-active-color !default; $custom-control-indicator-checked-color: $component-active-color !default;
$custom-control-indicator-checked-bg: $component-active-bg !default; $custom-control-indicator-checked-bg: $component-active-bg !default;
$custom-control-indicator-checked-disabled-bg: rgba(theme-color("primary"), .5) !default; $custom-control-indicator-checked-disabled-bg: rgba(theme-color("primary"), .5) !default;
$custom-control-indicator-checked-box-shadow: none !default; $custom-control-indicator-checked-box-shadow: null !default;
$custom-control-indicator-checked-border-color: $custom-control-indicator-checked-bg !default; $custom-control-indicator-checked-border-color: $custom-control-indicator-checked-bg !default;
$custom-control-indicator-focus-box-shadow: $input-focus-box-shadow !default; $custom-control-indicator-focus-box-shadow: $input-focus-box-shadow !default;
@ -554,7 +549,7 @@ $custom-control-indicator-focus-border-color: $input-focus-border-color !defau
$custom-control-indicator-active-color: $component-active-color !default; $custom-control-indicator-active-color: $component-active-color !default;
$custom-control-indicator-active-bg: lighten($component-active-bg, 35%) !default; $custom-control-indicator-active-bg: lighten($component-active-bg, 35%) !default;
$custom-control-indicator-active-box-shadow: none !default; $custom-control-indicator-active-box-shadow: null !default;
$custom-control-indicator-active-border-color: $custom-control-indicator-active-bg !default; $custom-control-indicator-active-border-color: $custom-control-indicator-active-bg !default;
$custom-checkbox-indicator-border-radius: $border-radius !default; $custom-checkbox-indicator-border-radius: $border-radius !default;
@ -563,7 +558,7 @@ $custom-checkbox-indicator-icon-checked: url("data:image/svg+xml,<svg xml
$custom-checkbox-indicator-indeterminate-bg: $component-active-bg !default; $custom-checkbox-indicator-indeterminate-bg: $component-active-bg !default;
$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default; $custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
$custom-checkbox-indicator-icon-indeterminate: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'><path stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/></svg>") !default; $custom-checkbox-indicator-icon-indeterminate: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'><path stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/></svg>") !default;
$custom-checkbox-indicator-indeterminate-box-shadow: none !default; $custom-checkbox-indicator-indeterminate-box-shadow: null !default;
$custom-checkbox-indicator-indeterminate-border-color: $custom-checkbox-indicator-indeterminate-bg !default; $custom-checkbox-indicator-indeterminate-border-color: $custom-checkbox-indicator-indeterminate-bg !default;
$custom-radio-indicator-border-radius: 50% !default; $custom-radio-indicator-border-radius: 50% !default;
@ -668,7 +663,6 @@ $form-feedback-icon-invalid-color: $form-feedback-invalid-color !default;
$form-feedback-icon-invalid: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default; $form-feedback-icon-invalid: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default;
$form-validation-states: () !default; $form-validation-states: () !default;
// stylelint-disable-next-line scss/dollar-variable-default
$form-validation-states: map-merge( $form-validation-states: map-merge(
( (
"valid": ( "valid": (
@ -762,6 +756,7 @@ $navbar-dark-brand-hover-color: $navbar-dark-active-color !default;
// Dropdown menu container and contents. // Dropdown menu container and contents.
$dropdown-min-width: 10rem !default; $dropdown-min-width: 10rem !default;
$dropdown-padding-x: 0 !default;
$dropdown-padding-y: .5rem !default; $dropdown-padding-y: .5rem !default;
$dropdown-spacer: .125rem !default; $dropdown-spacer: .125rem !default;
$dropdown-font-size: $font-size-base !default; $dropdown-font-size: $font-size-base !default;

View file

@ -1,8 +1,8 @@
/*! /*!
* Bootstrap Grid v4.5.0 (https://getbootstrap.com/) * Bootstrap Grid v4.5.3 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc. * Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/ */
html { html {

View file

@ -1,8 +1,8 @@
/*! /*!
* Bootstrap Reboot v4.5.0 (https://getbootstrap.com/) * Bootstrap Reboot v4.5.3 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc. * Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/ */

View file

@ -1,8 +1,8 @@
/*! /*!
* Bootstrap v4.5.0 (https://getbootstrap.com/) * Bootstrap v4.5.3 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc. * Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/ */
@import "functions"; @import "functions";

View file

@ -1,4 +1,4 @@
// stylelint-disable property-blacklist // stylelint-disable property-disallowed-list
// Single side border-radius // Single side border-radius
// Helper function to replace negative values with 0 // Helper function to replace negative values with 0

View file

@ -53,6 +53,7 @@
.#{$state}-tooltip { .#{$state}-tooltip {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0;
z-index: 5; z-index: 5;
display: none; display: none;
max-width: 100%; // Contain to parent when possible max-width: 100%; // Contain to parent when possible

View file

@ -34,7 +34,6 @@
.col#{$infix} { .col#{$infix} {
flex-basis: 0; flex-basis: 0;
flex-grow: 1; flex-grow: 1;
min-width: 0; // See https://github.com/twbs/bootstrap/issues/25410
max-width: 100%; max-width: 100%;
} }

View file

@ -10,6 +10,12 @@
margin-left: auto; margin-left: auto;
} }
@mixin make-row($gutter: $grid-gutter-width) {
display: flex;
flex-wrap: wrap;
margin-right: -$gutter / 2;
margin-left: -$gutter / 2;
}
// For each breakpoint, define the maximum width of the container in a media query // For each breakpoint, define the maximum width of the container in a media query
@mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) { @mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) {
@ -18,13 +24,7 @@
max-width: $container-max-width; max-width: $container-max-width;
} }
} }
} @include deprecate("The `make-container-max-widths` mixin", "v4.5.2", "v5");
@mixin make-row($gutter: $grid-gutter-width) {
display: flex;
flex-wrap: wrap;
margin-right: -$gutter / 2;
margin-left: -$gutter / 2;
} }
@mixin make-col-ready($gutter: $grid-gutter-width) { @mixin make-col-ready($gutter: $grid-gutter-width) {
@ -62,7 +62,7 @@
// numberof columns. Supports wrapping to new lines, but does not do a Masonry // numberof columns. Supports wrapping to new lines, but does not do a Masonry
// style grid. // style grid.
@mixin row-cols($count) { @mixin row-cols($count) {
& > * { > * {
flex: 0 0 100% / $count; flex: 0 0 100% / $count;
max-width: 100% / $count; max-width: 100% / $count;
} }

View file

@ -1,6 +1,6 @@
// Only display content to screen readers // Only display content to screen readers
// //
// See: https://a11yproject.com/posts/how-to-hide-content/ // See: https://www.a11yproject.com/posts/2013-01-11-how-to-hide-content/
// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/ // See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/
@mixin sr-only() { @mixin sr-only() {

View file

@ -1,4 +1,4 @@
// stylelint-disable property-blacklist // stylelint-disable property-disallowed-list
@mixin transition($transition...) { @mixin transition($transition...) {
@if length($transition) == 0 { @if length($transition) == 0 {
$transition: $transition-base; $transition: $transition-base;

View file

@ -1,4 +1,4 @@
// stylelint-disable property-blacklist, declaration-no-important // stylelint-disable property-disallowed-list, declaration-no-important
// //
// Border // Border

View file

@ -63,7 +63,8 @@
.text-decoration-none { text-decoration: none !important; } .text-decoration-none { text-decoration: none !important; }
.text-break { .text-break {
word-wrap: break-word !important; word-break: break-word !important; // Deprecated, but avoids issues with flex containers
word-wrap: break-word !important; // Used instead of `overflow-wrap` for IE & Edge Legacy
} }
// Reset // Reset

View file

@ -1,13 +1,17 @@
// Cerulean 4.5.0 // Cerulean 4.5.3
// Bootswatch // Bootswatch
// Variables ===================================================================
$text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default;
// Mixins ======================================================================
@mixin btn-shadow($color){ @mixin btn-shadow($color){
@include gradient-y-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%)); @include gradient-y-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%));
} }
$text-shadow: 0 1px 0 rgba(0, 0, 0, 0.05) !default;
// Navbar ====================================================================== // Navbar ======================================================================
.bg-primary { .bg-primary {
@ -24,13 +28,13 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, 0.05) !default;
.navbar-brand, .navbar-brand,
.nav-link { .nav-link {
text-shadow: $text-shadow text-shadow: $text-shadow;
} }
// Buttons ===================================================================== // Buttons =====================================================================
.btn { .btn {
text-shadow: $text-shadow text-shadow: $text-shadow;
} }
.btn-primary { .btn-primary {
@ -79,15 +83,16 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, 0.05) !default;
.bg-warning, .bg-warning,
.bg-danger, .bg-danger,
.bg-dark { .bg-dark {
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: $white; color: $white;
} }
} }
// Tables ======================================================================
// Forms =======================================================================
// Navs ======================================================================== // Navs ========================================================================
.dropdown-menu { .dropdown-menu {
@ -95,9 +100,3 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, 0.05) !default;
color: $gray-600; color: $gray-600;
} }
} }
// Indicators ==================================================================
// Progress bars ===============================================================
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Cerulean 4.5.0 // Cerulean 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,16 +17,16 @@ $gray-800: #343a40 !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #033C73 !default; $blue: #033c73 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #C71C22 !default; $red: #c71c22 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #DD5600 !default; $yellow: #dd5600 !default;
$green: #73A839 !default; $green: #73a839 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #2FA4E7 !default; $cyan: #2fa4e7 !default;
$primary: $cyan !default; $primary: $cyan !default;
$secondary: $gray-200 !default; $secondary: $gray-200 !default;
@ -53,5 +53,5 @@ $dropdown-link-hover-bg: $primary !default;
// Navbar // Navbar
$navbar-dark-color: rgba($white,.8) !default; $navbar-dark-color: rgba($white, .8) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;

View file

@ -1,30 +1,18 @@
// Cosmo 4.5.0 // Cosmo 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ======================================================================
// Buttons =====================================================================
// Typography ================================================================== // Typography ==================================================================
body { body {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
// Tables ======================================================================
// Forms =======================================================================
// Navs ========================================================================
// Indicators ==================================================================
// Progress bars =============================================================== // Progress bars ===============================================================
.progress { .progress {
@ -35,5 +23,3 @@ body {
line-height: 8px; line-height: 8px;
} }
} }
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Cosmo 4.5.0 // Cosmo 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,16 +17,16 @@ $gray-800: #373a3c !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #2780E3 !default; $blue: #2780e3 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #613d7c !default; $purple: #613d7c !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #FF0039 !default; $red: #ff0039 !default;
$orange: #f0ad4e !default; $orange: #f0ad4e !default;
$yellow: #FF7518 !default; $yellow: #ff7518 !default;
$green: #3FB618 !default; $green: #3fb618 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #9954BB !default; $cyan: #9954bb !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-800 !default; $secondary: $gray-800 !default;
@ -47,17 +47,16 @@ $body-color: $gray-800 !default;
// Fonts // Fonts
$font-family-sans-serif: "Segoe UI", "Source Sans Pro", Calibri, Candara, Arial, sans-serif !default; // 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.9375rem !default; $font-size-base: .9375rem !default;
$font-size-sm: $font-size-base * .88 !default;
$headings-font-weight: 300 !default; $headings-font-weight: 300 !default;
// Navbar // Navbar
$navbar-dark-hover-color: rgba($white,1) !default; $navbar-dark-hover-color: rgba($white, 1) !default;
$navbar-light-hover-color: rgba($black, .9) !default;
$navbar-light-hover-color: rgba($black,.9) !default;
// Alerts // Alerts
@ -65,4 +64,4 @@ $alert-border-width: 0 !default;
// Progress bars // Progress bars
$progress-height: 0.5rem !default; $progress-height: .5rem !default;

View file

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

View file

@ -1,4 +1,4 @@
// Cyborg 4.5.0 // Cyborg 4.5.3
// Bootswatch // Bootswatch
// //
@ -9,7 +9,7 @@ $white: #fff !default;
$gray-100: #f8f9fa !default; $gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default; $gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default; $gray-300: #dee2e6 !default;
$gray-400: #ADAFAE !default; $gray-400: #adafae !default;
$gray-500: #888 !default; $gray-500: #888 !default;
$gray-600: #555 !default; $gray-600: #555 !default;
$gray-700: #282828 !default; $gray-700: #282828 !default;
@ -17,16 +17,16 @@ $gray-800: #222 !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #2A9FD6 !default; $blue: #2a9fd6 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #CC0000 !default; $red: #c00 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #FF8800 !default; $yellow: #f80 !default;
$green: #77B300 !default; $green: #77b300 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #9933CC !default; $cyan: #93c !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-600 !default; $secondary: $gray-600 !default;
@ -47,26 +47,22 @@ $body-color: $gray-400 !default;
// Fonts // Fonts
$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !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; $font-size-base: .875rem !default;
$h1-font-size: 4rem !default; $h1-font-size: 4rem !default;
$h2-font-size: 3rem !default; $h2-font-size: 3rem !default;
$h3-font-size: 2.5rem !default; $h3-font-size: 2.5rem !default;
$h4-font-size: 2rem !default; $h4-font-size: 2rem !default;
$h5-font-size: 1.5rem !default; $h5-font-size: 1.5rem !default;
$headings-color: $white !default; $headings-color: $white !default;
// Tables // Tables
$table-color: $white !default; $table-color: $white !default;
$table-accent-bg: rgba($white,.05) !default; $table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white,.075) !default; $table-hover-bg: rgba($white, .075) !default;
$table-border-color: $gray-700 !default; $table-border-color: $gray-700 !default;
$table-dark-bg: $gray-500 !default; $table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default; $table-dark-border-color: darken($gray-500, 7.5%) !default;
@ -77,13 +73,10 @@ $input-btn-padding-x: 1rem !default;
// Forms // Forms
$input-disabled-bg: $gray-400 !default; $input-disabled-bg: $gray-400 !default;
$input-border-color: $white !default; $input-border-color: $white !default;
$input-group-addon-color: $white !default; $input-group-addon-color: $white !default;
$input-group-addon-bg: $gray-700 !default; $input-group-addon-bg: $gray-700 !default;
$input-group-addon-border-color: transparent !default; $input-group-addon-border-color: transparent !default;
$custom-file-color: $white !default; $custom-file-color: $white !default;
$custom-file-border-color: $gray-700 !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-bg: $gray-700 !default;
$dropdown-divider-bg: $gray-800 !default; $dropdown-divider-bg: $gray-800 !default;
$dropdown-link-color: $white !default; $dropdown-link-color: $white !default;
$dropdown-link-hover-color: $white !default; $dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $primary !default; $dropdown-link-hover-bg: $primary !default;
@ -113,11 +105,9 @@ $navbar-dark-hover-color: $white !default;
$pagination-color: $white !default; $pagination-color: $white !default;
$pagination-bg: $gray-700 !default; $pagination-bg: $gray-700 !default;
$pagination-border-color: transparent !default; $pagination-border-color: transparent !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: $primary !default; $pagination-hover-bg: $primary !default;
$pagination-hover-border-color: $pagination-border-color !default; $pagination-hover-border-color: $pagination-border-color !default;
$pagination-disabled-bg: $pagination-bg !default; $pagination-disabled-bg: $pagination-bg !default;
$pagination-disabled-border-color: $pagination-border-color !default; $pagination-disabled-border-color: $pagination-border-color !default;
@ -144,7 +134,6 @@ $popover-bg: $gray-700 !default;
$toast-color: $white !default; $toast-color: $white !default;
$toast-background-color: $gray-800 !default; $toast-background-color: $gray-800 !default;
$toast-border-color: $gray-700 !default; $toast-border-color: $gray-700 !default;
$toast-header-color: $body-color !default; $toast-header-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default; $toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default; $toast-header-border-color: $toast-border-color !default;
@ -152,7 +141,6 @@ $toast-header-border-color: $toast-border-color !default;
// Modals // Modals
$modal-content-bg: $gray-800 !default; $modal-content-bg: $gray-800 !default;
$modal-header-border-color: $gray-700 !default; $modal-header-border-color: $gray-700 !default;
// Progress bars // Progress bars
@ -163,11 +151,8 @@ $progress-bg: $gray-700 !default;
$list-group-bg: $gray-800 !default; $list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default; $list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $primary !default; $list-group-hover-bg: $primary !default;
$list-group-disabled-bg: $gray-700 !default; $list-group-disabled-bg: $gray-700 !default;
$list-group-action-active-bg: $primary !default; $list-group-action-active-bg: $primary !default;
// Breadcrumbs // Breadcrumbs

View file

@ -1,16 +1,12 @@
// Darkly 4.5.0 // Darkly 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ======================================================================
// Buttons =====================================================================
// Typography ================================================================== // Typography ==================================================================
.blockquote { .blockquote {
@ -22,113 +18,147 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
// Tables ====================================================================== // Tables ======================================================================
.table { .table {
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -139,14 +169,13 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
// Forms ======================================================================= // Forms =======================================================================
.input-group-addon { .input-group-addon {
color: #fff; color: $white;
} }
// Navs ======================================================================== // Navs ========================================================================
.nav-tabs, .nav-tabs,
.nav-pills { .nav-pills {
.nav-link, .nav-link,
.nav-link.active, .nav-link.active,
.nav-link.active:focus, .nav-link.active:focus,
@ -154,12 +183,12 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
.nav-item.open .nav-link, .nav-item.open .nav-link,
.nav-item.open .nav-link:focus, .nav-item.open .nav-link:focus,
.nav-item.open .nav-link:hover { .nav-item.open .nav-link:hover {
color: #fff; color: $white;
} }
} }
.breadcrumb a { .breadcrumb a {
color: #fff; color: $white;
} }
.pagination { .pagination {
@ -171,7 +200,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
// Indicators ================================================================== // Indicators ==================================================================
.close { .close {
opacity: 0.4; opacity: .4;
&:hover, &:hover,
&:focus { &:focus {
@ -185,7 +214,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
a, a,
.alert-link { .alert-link {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
@ -200,21 +229,18 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
} }
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.list-group-item-action { .list-group-item-action {
color: #fff; color: $white;
&:hover, &:hover,
&:focus { &:focus {
background-color: $gray-700; background-color: $gray-700;
color: #fff; color: $white;
} }
.list-group-item-heading { .list-group-item-heading {
color: #fff; color: $white;
} }
} }

View file

@ -1,4 +1,4 @@
// Darkly 4.5.0 // Darkly 4.5.3
// Bootswatch // Bootswatch
// //
@ -21,12 +21,12 @@ $blue: #375a7f !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #E74C3C !default; $red: #e74c3c !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #F39C12 !default; $yellow: #f39c12 !default;
$green: #00bc8c !default; $green: #00bc8c !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #3498DB !default; $cyan: #3498db !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-700 !default; $secondary: $gray-700 !default;
@ -50,29 +50,25 @@ $link-color: $success !default;
// Fonts // Fonts
$font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; // stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Lato, -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.9375rem !default; $font-size-base: .9375rem !default;
$font-size-sm: $font-size-base * .88 !default;
$h1-font-size: 3rem !default; $h1-font-size: 3rem !default;
$h2-font-size: 2.5rem !default; $h2-font-size: 2.5rem !default;
$h3-font-size: 2rem !default; $h3-font-size: 2rem !default;
$text-muted: $gray-600 !default; $text-muted: $gray-600 !default;
// Tables // Tables
$table-accent-bg: $gray-800 !default; $table-accent-bg: $gray-800 !default;
$table-border-color: $gray-700 !default; $table-border-color: $gray-700 !default;
// Forms // Forms
$input-border-color: $body-bg !default; $input-border-color: $body-bg !default;
$input-group-addon-color: $gray-500 !default; $input-group-addon-color: $gray-500 !default;
$input-group-addon-bg: $gray-700 !default; $input-group-addon-bg: $gray-700 !default;
$custom-file-color: $gray-500 !default; $custom-file-color: $gray-500 !default;
$custom-file-border-color: $body-bg !default; $custom-file-border-color: $body-bg !default;
@ -81,7 +77,6 @@ $custom-file-border-color: $body-bg !default;
$dropdown-bg: $gray-900 !default; $dropdown-bg: $gray-900 !default;
$dropdown-border-color: $gray-700 !default; $dropdown-border-color: $gray-700 !default;
$dropdown-divider-bg: $gray-700 !default; $dropdown-divider-bg: $gray-700 !default;
$dropdown-link-color: $white !default; $dropdown-link-color: $white !default;
$dropdown-link-hover-color: $white !default; $dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $primary !default; $dropdown-link-hover-bg: $primary !default;
@ -90,7 +85,6 @@ $dropdown-link-hover-bg: $primary !default;
$nav-link-padding-x: 1.5rem !default; $nav-link-padding-x: 1.5rem !default;
$nav-link-disabled-color: $gray-500 !default; $nav-link-disabled-color: $gray-500 !default;
$nav-tabs-border-color: $gray-700 !default; $nav-tabs-border-color: $gray-700 !default;
$nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color transparent !default; $nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color transparent !default;
$nav-tabs-link-active-color: $white !default; $nav-tabs-link-active-color: $white !default;
@ -99,10 +93,8 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color $nav-tabs-border-colo
// Navbar // Navbar
$navbar-padding-y: .7rem !default; $navbar-padding-y: .7rem !default;
$navbar-dark-color: rgba($white, .6) !default;
$navbar-dark-color: rgba($white,.6) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
$navbar-light-color: rgba($gray-900, .7) !default; $navbar-light-color: rgba($gray-900, .7) !default;
$navbar-light-hover-color: $gray-900 !default; $navbar-light-hover-color: $gray-900 !default;
$navbar-light-active-color: $gray-900 !default; $navbar-light-active-color: $gray-900 !default;
@ -114,14 +106,11 @@ $pagination-color: $white !default;
$pagination-bg: $success !default; $pagination-bg: $success !default;
$pagination-border-width: 0 !default; $pagination-border-width: 0 !default;
$pagination-border-color: transparent !default; $pagination-border-color: transparent !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: lighten($success, 10%) !default; $pagination-hover-bg: lighten($success, 10%) !default;
$pagination-hover-border-color: transparent !default; $pagination-hover-border-color: transparent !default;
$pagination-active-bg: $pagination-hover-bg !default; $pagination-active-bg: $pagination-hover-bg !default;
$pagination-active-border-color: transparent !default; $pagination-active-border-color: transparent !default;
$pagination-disabled-color: $white !default; $pagination-disabled-color: $white !default;
$pagination-disabled-bg: darken($success, 15%) !default; $pagination-disabled-bg: darken($success, 15%) !default;
$pagination-disabled-border-color: transparent !default; $pagination-disabled-border-color: transparent !default;
@ -138,20 +127,17 @@ $card-bg: $gray-800 !default;
// Popovers // Popovers
$popover-bg: $gray-800 !default; $popover-bg: $gray-800 !default;
$popover-header-bg: $gray-700 !default; $popover-header-bg: $gray-700 !default;
// Toasts // Toasts
$toast-background-color: $gray-700 !default; $toast-background-color: $gray-700 !default;
$toast-header-background-color: $gray-800 !default; $toast-header-background-color: $gray-800 !default;
// Modals // Modals
$modal-content-bg: $gray-800 !default; $modal-content-bg: $gray-800 !default;
$modal-content-border-color: $gray-700 !default; $modal-content-border-color: $gray-700 !default;
$modal-header-border-color: $gray-700 !default; $modal-header-border-color: $gray-700 !default;
// Progress bars // Progress bars
@ -162,7 +148,6 @@ $progress-bg: $gray-700 !default;
$list-group-bg: $gray-800 !default; $list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default; $list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $gray-700 !default; $list-group-hover-bg: $gray-700 !default;
// Breadcrumbs // Breadcrumbs

View file

@ -1,10 +1,10 @@
// Flatly 4.5.0 // Flatly 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ======================================================================= // Navbar =======================================================================
@ -32,131 +32,163 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
&-secondary:hover, &-secondary:hover,
&-warning, &-warning,
&-warning:hover { &-warning:hover {
color: #fff; color: $white;
} }
} }
// Typography ==================================================================
// Tables ====================================================================== // Tables ======================================================================
.table { .table {
&-primary, &-primary,
&-secondary, &-secondary,
&-success, &-success,
&-info, &-info,
&-warning, &-warning,
&-danger { &-danger {
color: #fff; color: $white;
} }
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -164,8 +196,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
} }
} }
// Forms =======================================================================
// Navs ======================================================================== // Navs ========================================================================
.nav-tabs { .nav-tabs {
@ -189,7 +219,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
.close { .close {
text-decoration: none; text-decoration: none;
opacity: 0.4; opacity: .4;
&:hover, &:hover,
&:focus { &:focus {
@ -200,7 +230,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
.badge { .badge {
&-secondary, &-secondary,
&-warning { &-warning {
color: #fff; color: $white;
} }
} }
@ -210,7 +240,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
a, a,
.alert-link { .alert-link {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
@ -226,20 +256,17 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic&
&-light { &-light {
&, &,
& a, a,
& .alert-link { .alert-link {
color: $body-color; color: $body-color;
} }
} }
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.modal, .modal,
.toast { .toast {
.close { .close {
color: $black; color: $black;

View file

@ -1,4 +1,4 @@
// Flatly 4.5.0 // Flatly 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,16 +17,16 @@ $gray-800: #343a40 !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #2C3E50 !default; $blue: #2c3e50 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #E74C3C !default; $red: #e74c3c !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #F39C12 !default; $yellow: #f39c12 !default;
$green: #18BC9C !default; $green: #18bc9c !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #3498DB !default; $cyan: #3498db !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-600 !default; $secondary: $gray-600 !default;
@ -45,10 +45,10 @@ $link-color: $success !default;
// Fonts // Fonts
$font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; // stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Lato, -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.9375rem !default; $font-size-base: .9375rem !default;
$font-size-sm: $font-size-base * .88 !default;
$h1-font-size: 3rem !default; $h1-font-size: 3rem !default;
$h2-font-size: 2.5rem !default; $h2-font-size: 2.5rem !default;
$h3-font-size: 2rem !default; $h3-font-size: 2rem !default;
@ -65,16 +65,14 @@ $dropdown-link-hover-bg: $primary !default;
// Navs // Navs
$nav-link-padding-y: 0.5rem !default !default; $nav-link-padding-y: .5rem !default !default;
$nav-link-padding-x: 1.5rem !default; $nav-link-padding-x: 1.5rem !default;
$nav-link-disabled-color: $gray-600 !default !default; $nav-link-disabled-color: $gray-600 !default !default;
$nav-tabs-border-color: $gray-200 !default; $nav-tabs-border-color: $gray-200 !default;
// Navbar // Navbar
$navbar-padding-y: .7rem !default; $navbar-padding-y: .7rem !default;
$navbar-dark-color: $white !default; $navbar-dark-color: $white !default;
$navbar-dark-hover-color: $success !default; $navbar-dark-hover-color: $success !default;
@ -84,14 +82,11 @@ $pagination-color: $white !default;
$pagination-bg: $success !default; $pagination-bg: $success !default;
$pagination-border-width: 0 !default; $pagination-border-width: 0 !default;
$pagination-border-color: transparent !default; $pagination-border-color: transparent !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: darken($success, 15%) !default; $pagination-hover-bg: darken($success, 15%) !default;
$pagination-hover-border-color: transparent !default; $pagination-hover-border-color: transparent !default;
$pagination-active-bg: $pagination-hover-bg !default; $pagination-active-bg: $pagination-hover-bg !default;
$pagination-active-border-color: transparent !default; $pagination-active-border-color: transparent !default;
$pagination-disabled-color: $gray-200 !default; $pagination-disabled-color: $gray-200 !default;
$pagination-disabled-bg: lighten($success, 15%) !default; $pagination-disabled-bg: lighten($success, 15%) !default;
$pagination-disabled-border-color: transparent !default; $pagination-disabled-border-color: transparent !default;
@ -99,7 +94,6 @@ $pagination-disabled-border-color: transparent !default;
// List group // List group
$list-group-hover-bg: $gray-200 !default; $list-group-hover-bg: $gray-200 !default;
$list-group-disabled-bg: $gray-200 !default; $list-group-disabled-bg: $gray-200 !default;
// Close // Close

View file

@ -1,16 +1,16 @@
// Journal 4.5.0 // Journal 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=News+Cycle:wght@400;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ====================================================================== // Navbar ======================================================================
.bg-dark { .bg-dark {
background-color: #000 !important; background-color: $black !important;
} }
.bg-light { .bg-light {
@ -19,11 +19,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700&disp
border: 1px solid $gray-200; border: 1px solid $gray-200;
&.navbar-fixed-top { &.navbar-fixed-top {
border-width: 0 0 1px 0; border-width: 0 0 1px;
} }
&.navbar-fixed-bottom { &.navbar-fixed-bottom {
border-width: 1px 0 0 0; border-width: 1px 0 0;
} }
} }
@ -34,7 +34,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700&disp
} }
.navbar-brand { .navbar-brand {
padding-top: 0.5rem; padding-top: .5rem;
font-size: inherit; font-size: inherit;
font-weight: $headings-font-weight; font-weight: $headings-font-weight;
text-transform: uppercase; text-transform: uppercase;
@ -52,12 +52,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700&disp
} }
} }
// Typography ==================================================================
// Tables ======================================================================
// Forms =======================================================================
// Navs ======================================================================== // Navs ========================================================================
.pagination { .pagination {
@ -65,9 +59,3 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700&disp
text-decoration: none; text-decoration: none;
} }
} }
// Indicators ==================================================================
// Progress bars ===============================================================
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Journal 4.5.0 // Journal 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,14 +17,14 @@ $gray-800: #333 !default;
$gray-900: #222 !default; $gray-900: #222 !default;
$black: #000 !default; $black: #000 !default;
$blue: #EB6864 !default; $blue: #eb6864 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #F57A00 !default; $red: #f57a00 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #F5E625 !default; $yellow: #f5e625 !default;
$green: #22B24C !default; $green: #22b24c !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #369 !default; $cyan: #369 !default;
@ -49,7 +49,7 @@ $input-btn-padding-x: 1rem !default;
// Navbar // Navbar
$navbar-light-color: rgba($black,.7) !default; $navbar-light-color: rgba($black, .7) !default;
$navbar-light-hover-color: $black !default; $navbar-light-hover-color: $black !default;
$navbar-light-active-color: $black !default; $navbar-light-active-color: $black !default;

View file

@ -1,11 +1,6 @@
// Litera 4.5.0 // Litera 4.5.3
// Bootswatch // Bootswatch
// Variables ===================================================================
$font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif !default;
// Navbar ====================================================================== // Navbar ======================================================================
.navbar { .navbar {
@ -16,15 +11,15 @@ $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif !defa
} }
&.bg-light { &.bg-light {
background-color: #fff !important; background-color: $white !important;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, .1);
&.navbar-fixed-top { &.navbar-fixed-top {
border-width: 0 0 1px 0; border-width: 0 0 1px;
} }
&.navbar-fixed-bottom { &.navbar-fixed-bottom {
border-width: 1px 0 0 0; border-width: 1px 0 0;
} }
} }
} }
@ -39,7 +34,7 @@ $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif !defa
} }
&-sm { &-sm {
border-radius: 0.844em; border-radius: .844em;
} }
} }
@ -74,118 +69,152 @@ table,
&-info, &-info,
&-warning, &-warning,
&-danger { &-danger {
color: #fff; color: $white;
} }
} }
.table { .table {
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -193,8 +222,6 @@ table,
} }
} }
// Forms =======================================================================
// Navs ======================================================================== // Navs ========================================================================
.nav, .nav,
@ -213,20 +240,22 @@ table,
color: $white; color: $white;
font-size: $font-size-sm; font-size: $font-size-sm;
&, p { &,
p {
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
} }
a, .alert-link { a,
color: #fff; .alert-link {
font-weight: normal; color: $white;
font-weight: 400;
text-decoration: underline; text-decoration: underline;
} }
@each $color, $value in $theme-colors { @each $color, $value in $theme-colors {
&-#{$color} { &-#{$color} {
@if $enable-gradients { @if $enable-gradients {
background: $value linear-gradient(0deg, mix($body-bg, $value, 15%), $value) repeat-x; background: $value linear-gradient($value, mix($body-bg, $value, 15%)) repeat-x;
} @else { } @else {
background-color: $value; background-color: $value;
} }
@ -235,8 +264,8 @@ table,
&-light { &-light {
&, &,
& a, a,
& .alert-link { .alert-link {
color: $body-color; color: $body-color;
} }
} }
@ -246,8 +275,6 @@ table,
vertical-align: bottom; vertical-align: bottom;
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.list-group { .list-group {

View file

@ -1,4 +1,4 @@
// Litera 4.5.0 // Litera 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,14 +17,14 @@ $gray-800: #343a40 !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #4582EC !default; $blue: #4582ec !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #d9534f !default; $red: #d9534f !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #f0ad4e !default; $yellow: #f0ad4e !default;
$green: #02B875 !default; $green: #02b875 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #17a2b8 !default; $cyan: #17a2b8 !default;
@ -45,37 +45,37 @@ $body-color: $gray-800 !default;
// Fonts // Fonts
// stylelint-disable value-keyword-case
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif !default;
// stylelint-enable
$font-size-base: 1.063rem !default; $font-size-base: 1.063rem !default;
$headings-font-weight: 700 !default; $headings-font-weight: 700 !default;
// Tables // Tables
$table-border-color: rgba(0,0,0,0.1) !default; $table-border-color: rgba(0, 0, 0, .1) !default;
// Buttons // Buttons
$input-btn-padding-y: 0.5rem !default; $input-btn-padding-y: .5rem !default;
$input-btn-padding-x: 1.1rem !default; $input-btn-padding-x: 1.1rem !default;
$btn-font-family: $font-family-sans-serif !default; $btn-font-family: $font-family-sans-serif !default;
$btn-font-size: 0.875rem !default; $btn-font-size: .875rem !default;
$btn-font-size-sm: .688rem !default;
$btn-font-size-sm: 0.688rem !default;
// Forms // Forms
$input-border-color: rgba(0,0,0,.1) !default; $input-border-color: rgba(0, 0, 0, .1) !default;
$input-group-addon-bg: $gray-200 !default !default; $input-group-addon-bg: $gray-200 !default !default;
// Navbar // Navbar
$navbar-dark-color: rgba($white,.6) !default; $navbar-padding-y: .7rem !default;
$navbar-dark-hover-color: $white !default;
$navbar-dark-color: rgba($white, .6) !default;
$navbar-dark-hover-color: $white !default;
$navbar-light-hover-color: $body-color !default; $navbar-light-hover-color: $body-color !default;
$navbar-light-active-color: $body-color !default; $navbar-light-active-color: $body-color !default;
@ -85,9 +85,9 @@ $tooltip-font-size: 11px !default;
// Badges // Badges
$badge-font-weight: normal !default; $badge-font-weight: 400 !default;
$badge-padding-y: 0.3em !default; $badge-padding-y: .3em !default;
$badge-padding-x: 0.6em !default; $badge-padding-x: .6em !default;
// Alerts // Alerts

View file

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

View file

@ -1,4 +1,4 @@
// Lumen 4.5.0 // Lumen 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,16 +17,16 @@ $gray-800: #333 !default;
$gray-900: #222 !default; $gray-900: #222 !default;
$black: #000 !default; $black: #000 !default;
$blue: #158CBA !default; $blue: #158cba !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #FF4136 !default; $red: #ff4136 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #FF851B !default; $yellow: #ff851b !default;
$green: #28B62C !default; $green: #28b62c !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #75CAEB !default; $cyan: #75caeb !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-200 !default; $secondary: $gray-200 !default;
@ -41,21 +41,19 @@ $yiq-contrasted-threshold: 200 !default;
// Fonts // 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-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: .875rem !default;
$font-size-base: 0.875rem !default;
// Buttons // Buttons
$btn-font-size: 0.75rem !default; $btn-font-size: .75rem !default;
$btn-font-size-sm: .625rem !default;
$btn-font-size-sm: 0.625rem !default; $btn-font-weight: 700 !default;
$btn-font-weight: bold !default;
// Dropdowns // Dropdowns
$dropdown-link-color: rgba(0,0,0,.5) !default; $dropdown-link-color: rgba(0, 0, 0, .5) !default;
// Navs // Navs
@ -68,12 +66,9 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
$pagination-color: $gray-700 !default; $pagination-color: $gray-700 !default;
$pagination-bg: $gray-200 !default; $pagination-bg: $gray-200 !default;
$pagination-hover-color: $pagination-color !default; $pagination-hover-color: $pagination-color !default;
$pagination-hover-bg: $pagination-bg !default; $pagination-hover-bg: $pagination-bg !default;
$pagination-active-border-color: darken($primary, 5%) !default; $pagination-active-border-color: darken($primary, 5%) !default;
$pagination-disabled-color: $gray-600 !default; $pagination-disabled-color: $gray-600 !default;
$pagination-disabled-bg: $pagination-bg !default; $pagination-disabled-bg: $pagination-bg !default;
@ -83,7 +78,7 @@ $jumbotron-bg: #fafafa !default;
// Modals // Modals
$modal-content-border-color: rgba($black,.1) !default; $modal-content-border-color: rgba($black, .1) !default;
// Close // Close

View file

@ -1,10 +1,10 @@
// Lux 4.5.0 // Lux 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ====================================================================== // Navbar ======================================================================
@ -31,14 +31,14 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600&dis
} }
.bg-light { .bg-light {
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, .1);
&.navbar-fixed-top { &.navbar-fixed-top {
border-width: 0 0 1px 0; border-width: 0 0 1px;
} }
&.navbar-bottom-top { &.navbar-bottom-top {
border-width: 1px 0 0 0; border-width: 1px 0 0;
} }
} }
@ -79,7 +79,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600&dis
} }
&:not([disabled]):not(.disabled):focus { &:not([disabled]):not(.disabled):focus {
box-shadow: 0 0 0 0.2rem rgba($gray-400, 0.5); box-shadow: 0 0 0 .2rem rgba($gray-400, .5);
} }
} }
@ -98,7 +98,12 @@ body {
letter-spacing: 1px; letter-spacing: 1px;
} }
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 3px; letter-spacing: 3px;
} }
@ -115,28 +120,28 @@ th {
} }
.table { .table {
th, td { th,
td {
padding: 1.5rem; padding: 1.5rem;
} }
&-sm { &-sm {
th, td { th,
padding: 0.75rem; td {
padding: .75rem;
} }
} }
} }
// Forms ======================================================================= // Forms =======================================================================
.custom-switch { .custom-switch {
.custom-control-label { .custom-control-label {
&::after { &::after {
top: calc(0.15625rem + 2px); top: add(.15625rem, 2px);
left: calc(-2.25rem + 2px); left: add(-2.25rem, 2px);
width: calc(1rem - 4px); width: subtract(1rem, 4px);
height: calc(1rem - 4px); height: subtract(1rem, 4px);
} }
} }
} }
@ -151,26 +156,33 @@ th {
// Indicators ================================================================== // Indicators ==================================================================
.badge { .badge {
padding-top: 0.28rem; padding-top: .28rem;
&-pill { &-pill {
border-radius: 10rem; border-radius: 10rem;
} }
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.list-group-item { .list-group-item {
h1, h2, h3, h4, h5, h6, h1,
.h1, .h2, .h3, .h4, .h5, .h6 { h2,
h3,
h4,
h5,
h6,
.h1,
.h2,
.h3,
.h4,
.h5,
.h6 {
color: inherit; color: inherit;
} }
} }
.card { .card {
&-title, &-title,
&-header { &-header {
color: inherit; color: inherit;

View file

@ -1,4 +1,4 @@
// Lux 4.5.0 // Lux 4.5.3
// Bootswatch // Bootswatch
// //
@ -24,9 +24,9 @@ $pink: #e83e8c !default;
$red: #d9534f !default; $red: #d9534f !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #f0ad4e !default; $yellow: #f0ad4e !default;
$green: #4BBF73 !default; $green: #4bbf73 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #1F9BCF !default; $cyan: #1f9bcf !default;
$primary: $gray-900 !default; $primary: $gray-900 !default;
$secondary: $white !default; $secondary: $white !default;
@ -47,76 +47,58 @@ $enable-rounded: false !default;
$body-color: $gray-700 !default; $body-color: $gray-700 !default;
// Components
// $border-radius: 0 !default;
// $border-radius-lg: 0 !default;
// $border-radius-sm: 0 !default;
// Fonts // Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; $font-family-sans-serif: "Nunito Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$font-size-base: .875rem !default;
$font-size-base: 0.875rem !default;
$h1-font-size: 2rem !default; $h1-font-size: 2rem !default;
$h2-font-size: 1.75rem !default; $h2-font-size: 1.75rem !default;
$h3-font-size: 1.5rem !default; $h3-font-size: 1.5rem !default;
$h4-font-size: 1.25rem !default; $h4-font-size: 1.25rem !default;
$h5-font-size: 1rem !default; $h5-font-size: 1rem !default;
$h6-font-size: 0.75rem !default; $h6-font-size: .75rem !default;
$headings-font-weight: 600 !default; $headings-font-weight: 600 !default;
$headings-color: $gray-900 !default; $headings-color: $gray-900 !default;
// Tables // Tables
$table-border-color: rgba(0, 0, 0, 0.05) !default; $table-border-color: rgba(0, 0, 0, .05) !default;
// Buttons + Forms // Buttons + Forms
$input-btn-border-width: 0px !default; $input-btn-border-width: 0 !default;
// Buttons // Buttons
$btn-line-height: 1.5rem !default; $btn-line-height: 1.5rem !default;
$input-btn-padding-y: .6rem !default;
$input-btn-padding-y: 0.6rem !default;
$input-btn-padding-x: 1.2rem !default; $input-btn-padding-x: 1.2rem !default;
$input-btn-padding-y-sm: .4rem !default; $input-btn-padding-y-sm: .4rem !default;
$input-btn-padding-x-sm: .8rem !default; $input-btn-padding-x-sm: .8rem !default;
$input-btn-padding-y-lg: 2rem !default; $input-btn-padding-y-lg: 2rem !default;
$input-btn-padding-x-lg: 2rem !default; $input-btn-padding-x-lg: 2rem !default;
$btn-font-weight: 600 !default; $btn-font-weight: 600 !default;
// Forms // Forms
$input-line-height: 1.5 !default; $input-line-height: 1.5 !default;
$input-bg: $gray-200 !default; $input-bg: $gray-200 !default;
$input-disabled-bg: $gray-300 !default; $input-disabled-bg: $gray-300 !default;
$input-group-addon-bg: $gray-300 !default; $input-group-addon-bg: $gray-300 !default;
// Navbar // Navbar
$navbar-padding-y: .7rem !default; $navbar-padding-y: .7rem !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
$navbar-light-color: rgba($black, .3) !default;
$navbar-light-color: rgba($black,.3) !default;
$navbar-light-hover-color: $gray-900 !default; $navbar-light-hover-color: $gray-900 !default;
$navbar-light-active-color: $gray-900 !default; $navbar-light-active-color: $gray-900 !default;
// Pagination // Pagination
$pagination-border-color: transparent !default; $pagination-border-color: transparent !default;
$pagination-hover-border-color: $pagination-border-color !default; $pagination-hover-border-color: $pagination-border-color !default;
$pagination-disabled-border-color: $pagination-border-color !default; $pagination-disabled-border-color: $pagination-border-color !default;
// Breadcrumbs // Breadcrumbs

View file

@ -1,18 +1,18 @@
// Materia 4.5.0 // Materia 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Effects ===================================================================== // Mixins ======================================================================
@mixin ripple($color){ @mixin ripple($color){
position: relative; position: relative;
&:after { &::before {
content: ""; content: "";
display: block; display: block;
position: absolute; position: absolute;
@ -30,64 +30,25 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&
transition: background .5s, opacity 1s; transition: background .5s, opacity 1s;
} }
&:active:after { &:active::before {
background-size: 0 0; background-size: 0 0;
opacity: .2; opacity: .2;
transition: 0s; transition: none;
} }
&.disabled, &.disabled,
&[disabled] { &[disabled] {
&:after { &::before {
display: none; display: none;
} }
} }
} }
// Navbar ======================================================================
.navbar {
border: none;
box-shadow: 0 1px 2px rgba(0,0,0,.3);
&-brand {
font-size: 24px;
}
&-nav .nav-link {
padding-top: 0.9rem;
padding-bottom: 0.9rem;
}
&.bg-dark,
&.bg-primary {
input[type=text],
input[type=password],
input[type=email],
input[type=number],
input[type=tel] {
color: #fff;
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5);
&:focus {
box-shadow: inset 0 -2px 0 #fff;
}
&::placeholder {
color: rgba(255, 255, 255, 0.5);
}
}
}
}
// Buttons =====================================================================
@mixin btn($class,$bg,$color){ @mixin btn($class,$bg,$color){
.btn-#{$class} { .btn-#{$class} {
&:focus { &:focus {
background-color: $bg; background-color: $bg;
box-shadow: 0 0 0 2px rgba(204, 204, 204, 0.5); box-shadow: 0 0 0 2px rgba(204, 204, 204, .5);
} }
&:hover, &:hover,
@ -96,7 +57,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&
} }
&:active { &:active {
box-shadow: 2px 2px 4px rgba(0,0,0,.4); box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
} }
@include ripple($color); @include ripple($color);
@ -107,20 +68,65 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&
} }
} }
@include btn(primary,$primary,$white); .dropdown-toggle::after,
@include btn(secondary,$secondary,$gray-500); .dropup .dropdown-toggle::after,
@include btn(success,$success,$white); .dropright .dropdown-toggle::after,
@include btn(info,$info,$white); .dropleft .dropdown-toggle::after {
@include btn(warning,$warning,$white); border-width: 4px;
@include btn(danger,$danger,$white); }
@include btn(dark,$dark,$white);
@include btn(light,$light,$white); // Navbar ======================================================================
.navbar {
border: none;
box-shadow: 0 1px 2px rgba(0, 0, 0, .3);
&-brand {
font-size: 24px;
}
&-nav .nav-link {
padding-top: .9rem;
padding-bottom: .9rem;
}
&.bg-dark,
&.bg-primary {
input[type="text"],
input[type="password"],
input[type="email"],
input[type="number"],
input[type="tel"] {
color: $white;
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, .5);
&:focus {
box-shadow: inset 0 -2px 0 $white;
}
&::placeholder {
color: rgba(255, 255, 255, .5);
}
}
}
}
// Buttons =====================================================================
@include btn(primary, $primary, $white);
@include btn(secondary, $secondary, $gray-500);
@include btn(success, $success, $white);
@include btn(info, $info, $white);
@include btn(warning, $warning, $white);
@include btn(danger, $danger, $white);
@include btn(dark, $dark, $white);
@include btn(light, $light, $white);
.btn { .btn {
text-transform: uppercase; text-transform: uppercase;
border: none; border: none;
box-shadow: 0 1px 4px rgba(0,0,0,.4); box-shadow: 0 1px 4px rgba(0, 0, 0, .4);
transition: all 0.4s; transition: color .4s, background-color .4s, border-color .4s, box-shadow .4s;
&-link { &-link {
box-shadow: none; box-shadow: none;
@ -148,13 +154,13 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&
&.disabled, &.disabled,
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, .1);
color: rgba(0, 0, 0, 0.4); color: rgba(0, 0, 0, .4);
opacity: 1; opacity: 1;
&:hover, &:hover,
&:focus { &:focus {
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, .1);
} }
} }
} }
@ -167,18 +173,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&
&-warning { &-warning {
color: $white; color: $white;
} }
&.dropdown-toggle::before {
display: inline-block;
width: 0;
height: 0;
margin-left: 0.3em;
vertical-align: middle;
content: "";
border-top: 0.3em solid;
border-right: 0.3em solid transparent;
border-left: 0.3em solid transparent;
}
} }
.btn-group { .btn-group {
@ -200,7 +194,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&
.btn + .btn, .btn + .btn,
.btn + .btn-group > .dropdown-toggle { .btn + .btn-group > .dropdown-toggle {
box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.4); box-shadow: 1px 1px 4px rgba(0, 0, 0, .4);
} }
} }
@ -231,7 +225,7 @@ p {
> tbody > tr, > tbody > tr,
> tbody > tr > th, > tbody > tr > th,
> tbody > tr > td { > tbody > tr > td {
transition: all 0.2s; transition: background-color .2s, color .2s;
} }
} }
@ -257,17 +251,17 @@ p {
textarea, textarea,
textarea.form-control, textarea.form-control,
input.form-control, input.form-control,
input[type=text], input[type="text"],
input[type=password], input[type="password"],
input[type=email], input[type="email"],
input[type=number], input[type="number"],
[type=text].form-control, [type="text"].form-control,
[type=password].form-control, [type="password"].form-control,
[type=email].form-control, [type="email"].form-control,
[type=tel].form-control, [type="tel"].form-control,
[contenteditable].form-control { [contenteditable].form-control {
box-shadow: inset 0 -1px 0 #ddd; box-shadow: inset 0 -1px 0 #ddd;
transition: box-shadow 0.2s; transition: box-shadow .2s;
&:focus { &:focus {
box-shadow: inset 0 -2px 0 $primary; box-shadow: inset 0 -2px 0 $primary;
@ -292,9 +286,9 @@ input[type=number],
select, select,
select.form-control { select.form-control {
appearance: none; appearance: none;
padding: 0.5rem 0; padding: .5rem 0;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAAJ1BMVEVmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmaP/QSjAAAADHRSTlMAAgMJC0uWpKa6wMxMdjkoAAAANUlEQVR4AeXJyQEAERAAsNl7Hf3X6xt0QL6JpZWq30pdvdadme+0PMdzvHm8YThHcT1H7K0BtOMDniZhWOgAAAAASUVORK5CYII=); background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='4' viewBox='0 0 8 4'%3E%3Cpolygon fill='%23666' points='8 0 4 4 0 0'/%3E%3C/svg%3E%0A");
background-size: 13px; background-size: 8px 4px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right center; background-position: right center;
box-shadow: inset 0 -1px 0 #ddd; box-shadow: inset 0 -1px 0 #ddd;
@ -315,7 +309,7 @@ select.form-control {
&:focus { &:focus {
box-shadow: inset 0 -2px 0 $primary; box-shadow: inset 0 -2px 0 $primary;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAAJ1BMVEUhISEhISEhISEhISEhISEhISEhISEhISEhISEhISEhISEhISEhISF8S9ewAAAADHRSTlMAAgMJC0uWpKa6wMxMdjkoAAAANUlEQVR4AeXJyQEAERAAsNl7Hf3X6xt0QL6JpZWq30pdvdadme+0PMdzvHm8YThHcT1H7K0BtOMDniZhWOgAAAAASUVORK5CYII=); background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='4' viewBox='0 0 8 4'%3E%3Cpolygon fill='%23212121' points='8 0 4 4 0 0'/%3E%3C/svg%3E%0A");
} }
&[multiple] { &[multiple] {
@ -342,52 +336,56 @@ select.form-control {
} }
.custom-checkbox .custom-control-input:checked { .custom-checkbox .custom-control-input:checked {
~ .custom-control-label::before {
background-image: none;
}
~ .custom-control-label::after { ~ .custom-control-label::after {
transform: scale(1.5); transform: scale(1.5);
} }
} }
.custom-radio .custom-control-input { .custom-radio .custom-control-input {
~ .custom-control-label::after {
transform: scale(.75);
}
&:checked { &:checked {
~ .custom-control-label::before { ~ .custom-control-label::before {
background: $white; background-color: $white;
background-image: none;
transition: border-color .24s;
} }
~ .custom-control-label::after { ~ .custom-control-label::after {
transform: scale(1.125); transform: scale(1.125);
transition: 240ms; transition: background-image .24s, transform .24s;
}
}
& {
~ .custom-control-label::after {
transform: scale(.75);
} }
} }
} }
.custom-switch { .custom-switch {
.custom-control-label::before { .custom-control-label::before {
top: 0.125rem; top: .125rem;
height: 0.875rem; height: .875rem;
background: $gray-500; background-color: $gray-500;
border: none; border: none;
} }
.custom-control-input:disabled ~ .custom-control-label { .custom-control-input:disabled ~ .custom-control-label {
opacity: 0.7; opacity: .7;
} }
.custom-control-input:disabled ~ .custom-control-label::before { .custom-control-input:disabled ~ .custom-control-label::before {
background: $gray-500; background-color: $gray-500;
} }
.custom-control-label::after { .custom-control-label::after {
background-color: #fff; background-color: $white;
box-shadow: 0 1px 4px rgba(0,0,0,.3); box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
} }
.custom-control-input:checked ~ .custom-control-label::before { .custom-control-input:checked ~ .custom-control-label::before {
opacity: 0.38; opacity: .38;
} }
.custom-control-input:checked ~ .custom-control-label::after { .custom-control-input:checked ~ .custom-control-label::after {
@ -395,31 +393,27 @@ select.form-control {
} }
.custom-control-input:hover:not(:disabled) ~ .custom-control-label::after { .custom-control-input:hover:not(:disabled) ~ .custom-control-label::after {
box-shadow: 0 1px 4px rgba(0,0,0,.3), 0 0 0 9px rgba(0,0,0,0.05); box-shadow: 0 1px 4px rgba(0, 0, 0, .3), 0 0 0 9px rgba(0, 0, 0, .05);
} }
.custom-control-input:focus:not(:disabled) ~ .custom-control-label::after { .custom-control-input:focus:not(:disabled) ~ .custom-control-label::after {
box-shadow: 0 1px 4px rgba(0,0,0,.3), 0 0 0 9px rgba(0,0,0,0.09); box-shadow: 0 1px 4px rgba(0, 0, 0, .3), 0 0 0 9px rgba(0, 0, 0, .09);
} }
.custom-control-input:active:not(:disabled) ~ .custom-control-label::after { .custom-control-input:active:not(:disabled) ~ .custom-control-label::after {
box-shadow: 0 1px 4px rgba(0,0,0,.3), 0 0 0 9px rgba(0,0,0,0.16); box-shadow: 0 1px 4px rgba(0, 0, 0, .3), 0 0 0 9px rgba(0, 0, 0, .16);
} }
.custom-control-input:hover:checked:not(:disabled) ~ .custom-control-label::after { .custom-control-input:hover:checked:not(:disabled) ~ .custom-control-label::after {
box-shadow: 0 1px 4px rgba(0,0,0,.3), 0 0 0 9px rgba(33,150,243,0.05); box-shadow: 0 1px 4px rgba(0, 0, 0, .3), 0 0 0 9px rgba(33, 150, 243, .05);
} }
.custom-control-input:focus:checked:not(:disabled) ~ .custom-control-label::after { .custom-control-input:focus:checked:not(:disabled) ~ .custom-control-label::after {
box-shadow: 0 1px 4px rgba(0,0,0,.3), 0 0 0 9px rgba(33,150,243,0.09); box-shadow: 0 1px 4px rgba(0, 0, 0, .3), 0 0 0 9px rgba(33, 150, 243, .09);
} }
.custom-control-input:active:checked:not(:disabled) ~ .custom-control-label::after { .custom-control-input:active:checked:not(:disabled) ~ .custom-control-label::after {
box-shadow: 0 1px 4px rgba(0,0,0,.3), 0 0 0 9px rgba(33,150,243,0.16); box-shadow: 0 1px 4px rgba(0, 0, 0, .3), 0 0 0 9px rgba(33, 150, 243, .16);
}
.custom-control-input:active:not(:checked) ~ .custom-control-label::before {
background-color: $gray-500;
} }
.custom-control-input:active:not(:checked) ~ .custom-control-label::before { .custom-control-input:active:not(:checked) ~ .custom-control-label::before {
@ -428,12 +422,12 @@ select.form-control {
} }
.has-warning { .has-warning {
input:not([type=checkbox]), input:not([type="checkbox"]),
.form-control, .form-control,
input.form-control[readonly], input.form-control[readonly],
input[type=text][readonly], input[type="text"][readonly],
[type=text].form-control[readonly], [type="text"].form-control[readonly],
input:not([type=checkbox]):focus, input:not([type="checkbox"]):focus,
.form-control:focus { .form-control:focus {
border-bottom: none; border-bottom: none;
box-shadow: inset 0 -2px 0 $warning; box-shadow: inset 0 -2px 0 $warning;
@ -441,12 +435,12 @@ select.form-control {
} }
.has-danger { .has-danger {
input:not([type=checkbox]), input:not([type="checkbox"]),
.form-control, .form-control,
input.form-control[readonly], input.form-control[readonly],
input[type=text][readonly], input[type="text"][readonly],
[type=text].form-control[readonly], [type="text"].form-control[readonly],
input:not([type=checkbox]):focus, input:not([type="checkbox"]):focus,
.form-control:focus { .form-control:focus {
border-bottom: none; border-bottom: none;
box-shadow: inset 0 -2px 0 $danger; box-shadow: inset 0 -2px 0 $danger;
@ -454,12 +448,12 @@ select.form-control {
} }
.has-success { .has-success {
input:not([type=checkbox]), input:not([type="checkbox"]),
.form-control, .form-control,
input.form-control[readonly], input.form-control[readonly],
input[type=text][readonly], input[type="text"][readonly],
[type=text].form-control[readonly], [type="text"].form-control[readonly],
input:not([type=checkbox]):focus, input:not([type="checkbox"]):focus,
.form-control:focus { .form-control:focus {
border-bottom: none; border-bottom: none;
box-shadow: inset 0 -2px 0 $success; box-shadow: inset 0 -2px 0 $success;
@ -468,7 +462,9 @@ select.form-control {
// Remove the Bootstrap feedback styles for input addons // Remove the Bootstrap feedback styles for input addons
.input-group-addon { .input-group-addon {
.has-warning &, .has-danger &, .has-success & { .has-warning &,
.has-danger &,
.has-success & {
color: $input-color; color: $input-color;
border-color: $input-group-addon-border-color; border-color: $input-group-addon-border-color;
background-color: $input-group-addon-bg; background-color: $input-group-addon-bg;
@ -476,23 +472,21 @@ select.form-control {
} }
.input-group { .input-group {
> .input-group-prepend > .input-group-text { > .input-group-prepend > .input-group-text {
padding-right: 0.25rem; padding-right: .25rem;
} }
> .input-group-append > .input-group-text { > .input-group-append > .input-group-text {
padding-left: 0.25rem; padding-left: .25rem;
} }
.form-control { .form-control {
padding-left: 0.25rem; padding-left: .25rem;
padding-right: 0.25rem; padding-right: .25rem;
} }
} }
.input-group-sm { .input-group-sm {
> .input-group-prepend > .btn, > .input-group-prepend > .btn,
> .input-group-append > .btn { > .input-group-append > .btn {
padding: $input-btn-padding-y-sm $input-btn-padding-x-sm; padding: $input-btn-padding-y-sm $input-btn-padding-x-sm;
@ -518,7 +512,6 @@ select.form-control {
} }
.input-group-lg { .input-group-lg {
> .input-group-prepend > .btn, > .input-group-prepend > .btn,
> .input-group-append > .btn { > .input-group-append > .btn {
padding: $input-btn-padding-y-lg $input-btn-padding-x-lg; padding: $input-btn-padding-y-lg $input-btn-padding-x-lg;
@ -565,7 +558,7 @@ select.form-control {
border: none; border: none;
color: $body-color; color: $body-color;
box-shadow: inset 0 -1px 0 #ddd; box-shadow: inset 0 -1px 0 #ddd;
transition: all 0.2s; transition: color .2s, box-shadow .2s;
&:hover { &:hover {
background-color: transparent; background-color: transparent;
@ -591,7 +584,6 @@ select.form-control {
} }
&.nav-justified { &.nav-justified {
.nav-link, .nav-link,
.nav-link:hover, .nav-link:hover,
.nav-link:focus, .nav-link:focus,
@ -610,7 +602,7 @@ select.form-control {
.dropdown-menu { .dropdown-menu {
margin-top: 0; margin-top: 0;
border: none; border: none;
box-shadow: 0 1px 4px rgba(0,0,0,.3); box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
} }
// Indicators ================================================================== // Indicators ==================================================================
@ -619,8 +611,14 @@ select.form-control {
padding-right: 2.5rem; padding-right: 2.5rem;
border: none; border: none;
&, h1, h2, h3, h4, h5, h6 { &,
color: #fff; h1,
h2,
h3,
h4,
h5,
h6 {
color: $white;
} }
@each $color, $value in $theme-colors { @each $color, $value in $theme-colors {
@ -635,26 +633,25 @@ select.form-control {
a:not(.btn), a:not(.btn),
.alert-link { .alert-link {
color: #fff; color: $white;
font-weight: bold; font-weight: 700;
} }
.close { .close {
color: #fff; color: $white;
} }
&-secondary, &-secondary,
&-light { &-light {
&, &,
& a:not(.btn), a:not(.btn),
& .alert-link { .alert-link {
color: $body-color; color: $body-color;
} }
} }
} }
.badge { .badge {
&-secondary { &-secondary {
background-color: $gray-500; background-color: $gray-500;
color: $white; color: $white;
@ -670,17 +667,15 @@ select.form-control {
} }
.tag { .tag {
padding: 4px 6px 4px; padding: 4px 6px;
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.close { .close {
line-height: 0.5; line-height: .5;
opacity: 0.6; opacity: .6;
transition: all 0.2s; transition: opacity .2s;
&:hover { &:hover {
opacity: 1; opacity: 1;
@ -688,7 +683,7 @@ select.form-control {
} }
.card { .card {
box-shadow: 0 1px 4px rgba(0,0,0,.4); box-shadow: 0 1px 4px rgba(0, 0, 0, .4);
&.border-primary, &.border-primary,
&.border-secondary, &.border-secondary,
@ -704,31 +699,41 @@ select.form-control {
.alert-dismissible { .alert-dismissible {
.close { .close {
padding: 0.5rem 0.75rem; padding: .5rem .75rem;
} }
} }
.list-group { .list-group {
&-item-action.active { &-item-action.active {
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: $white; color: $white;
} }
} }
} }
.modal-content { .modal-content {
border-radius: 0.2rem; border-radius: .2rem;
box-shadow: 0 6px 36px rgba(0,0,0,.3); box-shadow: 0 6px 36px rgba(0, 0, 0, .3);
} }
.popover { .popover {
border: none; border: none;
box-shadow: 0 1px 4px rgba(0,0,0,.3); box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
} }
.carousel { .carousel {
&-caption { &-caption {
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit; color: inherit;
} }
} }

View file

@ -1,4 +1,4 @@
// Materia 4.5.0 // Materia 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,16 +17,16 @@ $gray-800: #222 !default;
$gray-900: #212121 !default; $gray-900: #212121 !default;
$black: #000 !default; $black: #000 !default;
$blue: #2196F3 !default; $blue: #2196f3 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #e51c23 !default; $red: #e51c23 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #ff9800 !default; $yellow: #ff9800 !default;
$green: #4CAF50 !default; $green: #4caf50 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #9C27B0 !default; $cyan: #9c27b0 !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $white !default; $secondary: $white !default;
@ -39,7 +39,7 @@ $dark: $gray-800 !default;
$yiq-contrasted-threshold: 170 !default; $yiq-contrasted-threshold: 170 !default;
$enable-gradients: true; $enable-gradients: true !default;
// Body // Body
@ -47,75 +47,59 @@ $body-color: $gray-700 !default;
// Fonts // Fonts
$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !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: 0.8125rem !default; $font-size-base: .8125rem !default;
$font-weight-base: 400 !default; $font-weight-base: 400 !default;
// Buttons // Buttons
$input-btn-padding-y: 0.8rem !default; $input-btn-padding-y: .8rem !default;
$input-btn-padding-x: 1rem !default; $input-btn-padding-x: 1rem !default;
// Forms // Forms
$input-padding-y: 1rem !default; $input-padding-y: 1rem !default;
$input-padding-x: 0 !default; $input-padding-x: 0 !default;
$input-padding-y-sm: 0 !default; $input-padding-y-sm: 0 !default;
$input-padding-x-sm: 0 !default; $input-padding-x-sm: 0 !default;
$input-padding-y-lg: ($font-size-base * 1.25) !default; $input-padding-y-lg: ($font-size-base * 1.25) !default;
$input-padding-x-lg: 0 !default; $input-padding-x-lg: 0 !default;
$input-bg: transparent !default; $input-bg: transparent !default;
$input-disabled-bg: transparent !default; $input-disabled-bg: transparent !default;
$input-color: $gray-600 !default; $input-color: $gray-600 !default;
$input-border-color: transparent !default; $input-border-color: transparent !default;
$input-border-width: 0rem !default; $input-border-width: 0 !default;
$input-border-radius: 0 !default; $input-border-radius: 0 !default;
$input-border-radius-lg: 0 !default; $input-border-radius-lg: 0 !default;
$input-border-radius-sm: 0 !default; $input-border-radius-sm: 0 !default;
$input-placeholder-color: rgba(0, 0, 0, .4) !default;
$input-placeholder-color: rgba(0,0,0,0.4) !default;
$input-group-addon-bg: transparent !default; $input-group-addon-bg: transparent !default;
$custom-control-gutter: 1.75rem !default; $custom-control-gutter: 1.75rem !default;
$custom-control-indicator-focus-box-shadow: 0 !default; $custom-control-indicator-focus-box-shadow: 0 !default;
$custom-control-indicator-size: 1.25rem !default; $custom-control-indicator-size: 1.25rem !default;
$custom-control-indicator-bg: $white; $custom-control-indicator-bg: $white !default;
$custom-checkbox-indicator-border-radius: 2px !default; $custom-checkbox-indicator-border-radius: 2px !default;
$custom-control-indicator-disabled-bg: $gray-100 !default; $custom-control-indicator-disabled-bg: $gray-100 !default;
$custom-radio-indicator-icon-checked: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='4' fill='#2196f3'/></svg>") !default;
$custom-radio-indicator-icon-checked: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='4' fill='%232196F3'/%3E%3C/svg%3E") !default;
$custom-select-border-radius: 0 !default; $custom-select-border-radius: 0 !default;
$custom-select-box-shadow: none !default; $custom-select-box-shadow: none !default;
// Navs // Navs
$nav-link-disabled-color: $gray-500 !default; $nav-link-disabled-color: $gray-500 !default;
$nav-tabs-border-color: transparent !default; $nav-tabs-border-color: transparent !default;
// Navbar // Navbar
$navbar-padding-y: 0.7rem !default; $navbar-padding-y: .7rem !default;
$navbar-dark-color: rgba($white, .75) !default;
$navbar-dark-color: rgba($white,.75) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
// Cards // Cards
$card-border-width: 0; $card-border-width: 0 !default;
$card-border-color: transparent; $card-border-color: transparent !default;
// Tooltips // Tooltips
@ -127,7 +111,7 @@ $modal-content-border-color: transparent !default;
// Progress bars // Progress bars
$progress-height: 0.375rem !default; $progress-height: .375rem !default;
$progress-border-radius: 0 !default; $progress-border-radius: 0 !default;
// Close // Close

View file

@ -1,10 +1,10 @@
// Minty 4.5.0 // Minty 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Montserrat&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ====================================================================== // Navbar ======================================================================
@ -78,127 +78,159 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Montserrat&display=swap
} }
} }
// Typography ==================================================================
// Tables ====================================================================== // Tables ======================================================================
.table { .table {
&-primary, &-primary,
&-secondary, &-secondary,
&-success, &-success,
&-info, &-info,
&-warning, &-warning,
&-danger { &-danger {
color: #fff; color: $white;
} }
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -239,7 +271,12 @@ legend {
.alert { .alert {
color: $white; color: $white;
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit; color: inherit;
} }
@ -249,57 +286,71 @@ legend {
} }
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
}
&-light {
&, &,
& a:not(.btn), a:not(.btn),
& .alert-link { .alert-link {
color: $body-color; color: $body-color;
} }
} }
@ -313,13 +364,16 @@ legend {
} }
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.card, .card,
.list-group-item { .list-group-item {
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit; color: inherit;
} }
} }

View file

@ -1,4 +1,4 @@
// Minty 4.5.0 // Minty 4.5.3
// Bootswatch // Bootswatch
// //
@ -21,15 +21,15 @@ $blue: #007bff !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #FF7851 !default; $red: #ff7851 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #FFCE67 !default; $yellow: #ffce67 !default;
$green: #56CC9D !default; $green: #56cc9d !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #6CC3D5 !default; $cyan: #6cc3d5 !default;
$primary: #78C2AD !default; $primary: #78c2ad !default;
$secondary: #F3969A !default; $secondary: #f3969a !default;
$success: $green !default; $success: $green !default;
$info: $cyan !default; $info: $cyan !default;
$warning: $yellow !default; $warning: $yellow !default;
@ -51,12 +51,14 @@ $border-radius-sm: .3rem !default;
// Fonts // Fonts
$headings-font-family: "Montserrat", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; // stylelint-disable-next-line value-keyword-case
$headings-font-family: Montserrat, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
$headings-color: $gray-700 !default; $headings-color: $gray-700 !default;
$font-size-base: .875rem !default;
// Tables // Tables
$table-border-color: rgba(0,0,0,0.05) !default; $table-border-color: rgba(0, 0, 0, .05) !default;
// Dropdowns // Dropdowns
@ -65,29 +67,27 @@ $dropdown-link-hover-bg: $secondary !default;
// Navbar // Navbar
$navbar-dark-color: rgba($white,.6) !default; $navbar-padding-y: .7rem !default;
$navbar-dark-hover-color: $white !default;
$navbar-light-color: rgba($black,.3) !default; $navbar-dark-color: rgba($white, .6) !default;
$navbar-dark-hover-color: $white !default;
$navbar-light-color: rgba($black, .3) !default;
$navbar-light-hover-color: $gray-700 !default; $navbar-light-hover-color: $gray-700 !default;
$navbar-light-active-color: $gray-700 !default; $navbar-light-active-color: $gray-700 !default;
$navbar-light-disabled-color: rgba($black,.1) !default; $navbar-light-disabled-color: rgba($black, .1) !default;
// Pagination // Pagination
$pagination-color: $white !default; $pagination-color: $white !default;
$pagination-bg: $primary !default; $pagination-bg: $primary !default;
$pagination-border-color: $primary !default; $pagination-border-color: $primary !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: $secondary !default; $pagination-hover-bg: $secondary !default;
$pagination-hover-border-color: $pagination-hover-bg !default; $pagination-hover-border-color: $pagination-hover-bg !default;
$pagination-active-bg: $secondary !default; $pagination-active-bg: $secondary !default;
$pagination-active-border-color: $pagination-active-bg !default; $pagination-active-border-color: $pagination-active-bg !default;
$pagination-disabled-color: $white !default; $pagination-disabled-color: $white !default;
$pagination-disabled-bg: #CCE8E0 !default; $pagination-disabled-bg: #cce8e0 !default;
$pagination-disabled-border-color: $pagination-disabled-bg !default; $pagination-disabled-border-color: $pagination-disabled-bg !default;
// Breadcrumbs // Breadcrumbs

View file

@ -1,13 +1,9 @@
// Pulse 4.5.0 // Pulse 4.5.3
// Bootswatch // Bootswatch
// Variables ===================================================================
// Buttons ===================================================================== // Buttons =====================================================================
.btn { .btn {
&:focus, &:focus,
&:active, &:active,
&:active:focus, &:active:focus,
@ -64,11 +60,8 @@
&.disabled:focus { &.disabled:focus {
box-shadow: none; box-shadow: none;
} }
} }
// Typography ==================================================================
// Tables ====================================================================== // Tables ======================================================================
.table .thead-dark th { .table .thead-dark th {
@ -79,16 +72,15 @@
// Forms ======================================================================= // Forms =======================================================================
.form-control:focus { .form-control:focus {
box-shadow: 0 0 5px rgba(100,65,164,.4); box-shadow: 0 0 5px rgba(100, 65, 164, .4);
} }
// Navs ======================================================================== // Navs ========================================================================
.nav-tabs { .nav-tabs {
.nav-link, .nav-link,
.nav-link.active, { .nav-link.active, {
border-width: 0 0 1px 0; border-width: 0 0 1px;
} }
.nav-link:hover, .nav-link:hover,
@ -112,7 +104,7 @@
// Indicators ================================================================== // Indicators ==================================================================
.badge { .badge {
padding-bottom: 0.4em; padding-bottom: .4em;
&-secondary, &-secondary,
&-warning { &-warning {
@ -129,18 +121,17 @@
// Containers ================================================================== // Containers ==================================================================
.list-group { .list-group {
&-item { &-item {
color: rgba(255, 255, 255, 0.8); color: rgba(255, 255, 255, .8);
&.active, &.active,
&:hover, &:hover,
&:focus { &:focus {
color: #fff; color: $white;
} }
&.active { &.active {
font-weight: bold; font-weight: 700;
&:hover { &:hover {
background-color: $list-group-hover-bg; background-color: $list-group-hover-bg;

View file

@ -1,4 +1,4 @@
// Pulse 4.5.0 // Pulse 4.5.3
// Bootswatch // Bootswatch
// //
@ -7,29 +7,29 @@
$white: #fff !default; $white: #fff !default;
$gray-100: #fafafa !default; $gray-100: #fafafa !default;
$gray-200: #F9F8FC !default; $gray-200: #f9f8fc !default;
$gray-300: #EDEDED !default; $gray-300: #ededed !default;
$gray-400: #cbc8d0 !default; $gray-400: #cbc8d0 !default;
$gray-500: #adb5bd !default; $gray-500: #adb5bd !default;
$gray-600: #868e96 !default; $gray-600: #868e96 !default;
$gray-700: #444 !default; $gray-700: #444 !default;
$gray-800: #343a40 !default; $gray-800: #343a40 !default;
$gray-900: #17141F !default; $gray-900: #17141f !default;
$black: #000 !default; $black: #000 !default;
$blue: #007bff !default; $blue: #007bff !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #593196 !default; $purple: #593196 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #FC3939 !default; $red: #fc3939 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #EFA31D !default; $yellow: #efa31d !default;
$green: #13B955 !default; $green: #13b955 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #009CDC !default; $cyan: #009cdc !default;
$primary: $purple !default; $primary: $purple !default;
$secondary: #A991D4 !default; $secondary: #a991d4 !default;
$success: $green !default; $success: $green !default;
$info: $cyan !default; $info: $cyan !default;
$warning: $yellow !default; $warning: $yellow !default;
@ -51,11 +51,11 @@ $link-hover-color: $primary !default;
// Fonts // Fonts
$font-size-base: 0.875rem !default; $font-size-base: .875rem !default;
// Tables // Tables
$table-border-color: rgba(0, 0, 0, 0.05) !default; $table-border-color: rgba(0, 0, 0, .05) !default;
// Forms // Forms
@ -75,13 +75,11 @@ $nav-tabs-link-hover-border-color: $primary !default;
// Navbar // Navbar
$navbar-padding-y: .7rem !default; $navbar-padding-y: .7rem !default;
$navbar-dark-hover-color: rgba($white, .9) !default;
$navbar-dark-hover-color: rgba($white,.9) !default; $navbar-dark-active-color: rgba($white, .9) !default;
$navbar-dark-active-color: rgba($white,.9) !default; $navbar-light-color: rgba($black, .4) !default;
$navbar-light-active-color: rgba($black, .7) !default;
$navbar-light-color: rgba($black,.4) !default; $navbar-light-disabled-color: rgba($black, .2) !default;
$navbar-light-active-color: rgba($black,.7) !default;
$navbar-light-disabled-color: rgba($black,.2) !default;
// Progress bars // Progress bars
@ -92,9 +90,7 @@ $progress-bar-bg: $primary !default;
$list-group-bg: $gray-900 !default; $list-group-bg: $gray-900 !default;
$list-group-border-color: transparent !default; $list-group-border-color: transparent !default;
$list-group-hover-bg: lighten($list-group-bg, 10%) !default; $list-group-hover-bg: lighten($list-group-bg, 10%) !default;
$list-group-active-color: $white !default; $list-group-active-color: $white !default;
$list-group-active-bg: $list-group-bg !default; $list-group-active-bg: $list-group-bg !default;
$list-group-disabled-color: lighten($list-group-bg, 30%) !default; $list-group-disabled-color: lighten($list-group-bg, 30%) !default;

View file

@ -1,10 +1,10 @@
// Sandstone 4.5.0 // Sandstone 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ====================================================================== // Navbar ======================================================================
@ -54,8 +54,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700&disp
} }
} }
// Typography ==================================================================
// Tables ====================================================================== // Tables ======================================================================
.table { .table {
@ -144,73 +142,86 @@ input,
// Indicators ================================================================== // Indicators ==================================================================
.alert { .alert {
color: #fff; color: $white;
a, a,
.alert-link { .alert-link {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
}
&-light {
&, &,
& a:not(.btn), a:not(.btn),
& .alert-link { .alert-link {
color: $body-color; color: $body-color;
} }
} }
} }
.badge { .badge {
&-success, &-success,
&-warning { &-warning {
color: $white; color: $white;
@ -229,7 +240,3 @@ input,
color: darken($gray-300, 20%); color: darken($gray-300, 20%);
} }
} }
// Progress bars ===============================================================
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Sandstone 4.5.0 // Sandstone 4.5.3
// Bootswatch // Bootswatch
// //
@ -7,26 +7,26 @@
$white: #fff !default; $white: #fff !default;
$gray-100: #f8f9fa !default; $gray-100: #f8f9fa !default;
$gray-200: #F8F5F0 !default; $gray-200: #f8f5f0 !default;
$gray-300: #DFD7CA !default; $gray-300: #dfd7ca !default;
$gray-400: #ced4da !default; $gray-400: #ced4da !default;
$gray-500: #98978B !default; $gray-500: #98978b !default;
$gray-600: #8E8C84 !default; $gray-600: #8e8c84 !default;
$gray-700: #495057 !default; $gray-700: #495057 !default;
$gray-800: #3E3F3A !default; $gray-800: #3e3f3a !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #325D88 !default; $blue: #325d88 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #d9534f !default; $red: #d9534f !default;
$orange: #F47C3C !default; $orange: #f47c3c !default;
$yellow: #ffc107 !default; $yellow: #ffc107 !default;
$green: #93C54B !default; $green: #93c54b !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #29ABE0 !default; $cyan: #29abe0 !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-600 !default; $secondary: $gray-600 !default;
@ -49,10 +49,9 @@ $link-color: $success !default;
// Fonts // Fonts
$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; // stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI", "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;
$headings-font-weight: 400 !default; $headings-font-weight: 400 !default;
// Dropdowns // Dropdowns
@ -60,26 +59,22 @@ $headings-font-weight: 400 !default;
$dropdown-link-color: $gray-600 !default; $dropdown-link-color: $gray-600 !default;
$dropdown-link-hover-color: $dropdown-link-color !default; $dropdown-link-hover-color: $dropdown-link-color !default;
$dropdown-link-hover-bg: $gray-200 !default; $dropdown-link-hover-bg: $gray-200 !default;
$dropdown-link-active-color: $dropdown-link-color !default; $dropdown-link-active-color: $dropdown-link-color !default;
$dropdown-link-active-bg: $dropdown-link-hover-bg !default; $dropdown-link-active-bg: $dropdown-link-hover-bg !default;
// Navs // Navs
$nav-link-padding-x: 1rem !default; $nav-link-padding-x: .9rem !default;
$nav-link-disabled-color: $gray-300 !default; $nav-link-disabled-color: $gray-300 !default;
$nav-tabs-border-color: $gray-300 !default; $nav-tabs-border-color: $gray-300 !default;
$nav-tabs-link-hover-border-color: $gray-300 !default; $nav-tabs-link-hover-border-color: $gray-300 !default;
$nav-tabs-link-active-bg: $white !default; $nav-tabs-link-active-bg: $white !default;
$nav-pills-link-active-color: $gray-600 !default; $nav-pills-link-active-color: $gray-600 !default;
$nav-pills-link-active-bg: $gray-200 !default; $nav-pills-link-active-bg: $gray-200 !default;
// Navbar // Navbar
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
$navbar-light-hover-color: $black !default; $navbar-light-hover-color: $black !default;
$navbar-light-active-color: $black !default; $navbar-light-active-color: $black !default;
@ -88,13 +83,10 @@ $navbar-light-active-color: $black !default;
$pagination-color: $gray-600 !default; $pagination-color: $gray-600 !default;
$pagination-bg: $gray-200 !default; $pagination-bg: $gray-200 !default;
$pagination-border-color: $gray-300 !default; $pagination-border-color: $gray-300 !default;
$pagination-hover-color: $pagination-color !default; $pagination-hover-color: $pagination-color !default;
$pagination-active-color: $pagination-color !default; $pagination-active-color: $pagination-color !default;
$pagination-active-bg: $gray-300 !default; $pagination-active-bg: $gray-300 !default;
$pagination-active-border-color: $gray-300 !default; $pagination-active-border-color: $gray-300 !default;
$pagination-disabled-color: $gray-300 !default; $pagination-disabled-color: $gray-300 !default;
$pagination-disabled-bg: $gray-200 !default; $pagination-disabled-bg: $gray-200 !default;
$pagination-disabled-border-color: $pagination-border-color !default; $pagination-disabled-border-color: $pagination-border-color !default;
@ -111,7 +103,6 @@ $popover-header-bg: $gray-200 !default;
// Modals // Modals
$modal-content-border-color: $gray-300 !default; $modal-content-border-color: $gray-300 !default;
$modal-header-border-color: $modal-content-border-color !default; $modal-header-border-color: $modal-content-border-color !default;
// Progress bars // Progress bars
@ -123,21 +114,16 @@ $progress-bar-color: $primary !default;
// List group // List group
$list-group-border-color: $gray-300 !default; $list-group-border-color: $gray-300 !default;
$list-group-hover-bg: $gray-200 !default; $list-group-hover-bg: $gray-200 !default;
$list-group-active-color: $body-color !default; $list-group-active-color: $body-color !default;
$list-group-active-bg: $gray-200 !default; $list-group-active-bg: $gray-200 !default;
$list-group-active-border-color: $gray-300 !default; $list-group-active-border-color: $gray-300 !default;
$list-group-disabled-color: $gray-500 !default; $list-group-disabled-color: $gray-500 !default;
$list-group-disabled-bg: $white !default; $list-group-disabled-bg: $white !default;
$list-group-action-color: $list-group-active-color !default; $list-group-action-color: $list-group-active-color !default;
$list-group-action-active-color: $list-group-active-color !default; $list-group-action-active-color: $list-group-active-color !default;
$list-group-action-active-bg: $gray-300 !default; $list-group-action-active-bg: $gray-300 !default;
// Close // Close
$close-text-shadow: none !default; $close-text-shadow: none !default;

View file

@ -1,12 +1,14 @@
// Simplex 4.5.0 // Simplex 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Mixins ======================================================================
@mixin btn-shadow($color){ @mixin btn-shadow($color){
@include gradient-y-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); @include gradient-y-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%));
filter: none; filter: none;
@ -20,7 +22,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700&displ
border-style: solid; border-style: solid;
&-fixed-top { &-fixed-top {
border-width: 0 0 1px 0; border-width: 0 0 1px;
} }
&-fixed-bottom { &-fixed-bottom {
@ -39,7 +41,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700&displ
} }
.bg-light { .bg-light {
border-color: darken(#fff, 6.5%); border-color: darken($white, 6.5%);
} }
// Buttons ===================================================================== // Buttons =====================================================================
@ -57,7 +59,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700&displ
.btn-secondary:focus, .btn-secondary:focus,
.btn-secondary:not([disabled]):not(.disabled):active, .btn-secondary:not([disabled]):not(.disabled):active,
.btn-secondary:not([disabled]):not(.disabled).active { .btn-secondary:not([disabled]):not(.disabled).active {
box-shadow: 0 0 0 0.2rem rgba($gray-200, 0.5); box-shadow: 0 0 0 .2rem rgba($gray-200, .5);
} }
.btn-success, .btn-success,
@ -103,11 +105,9 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700&displ
// Typography ================================================================== // Typography ==================================================================
.text-secondary { .text-secondary {
color: $gray-700 !important; color: $gray-600 !important;
} }
// Tables ======================================================================
// Forms ======================================================================= // Forms =======================================================================
legend, legend,
@ -118,7 +118,7 @@ label {
// Navs ======================================================================= // Navs =======================================================================
.breadcrumb { .breadcrumb {
border: 1px solid darken(#fff, 6.5%); border: 1px solid darken($white, 6.5%);
} }
.pagination { .pagination {
@ -126,9 +126,3 @@ label {
text-decoration: none; text-decoration: none;
} }
} }
// Indicators ==================================================================
// Progress bars ===============================================================
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Simplex 4.5.0 // Simplex 4.5.3
// Bootswatch // Bootswatch
// //
@ -19,33 +19,33 @@ $black: #000 !default;
$blue: #007bff !default; $blue: #007bff !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #9B479F !default; $purple: #9b479f !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #D9230F !default; $red: #d9230f !default;
$orange: #D9831F !default; $orange: #d9831f !default;
$yellow: #ffc107 !default; $yellow: #ffc107 !default;
$green: #469408 !default; $green: #469408 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #029ACF !default; $cyan: #029acf !default;
$primary: $red !default; $primary: $red !default;
$secondary: $white !default; $secondary: $white !default;
$success: $green !default; $success: $green !default;
$info: $cyan !default; $info: $cyan !default;
$warning: $purple !default; $warning: $orange !default;
$danger: $orange !default; $danger: $purple !default;
$light: $white !default; $light: $white !default;
$dark: $gray-800 !default; $dark: $gray-800 !default;
// Body // Body
$body-bg: #FCFCFC !default; $body-bg: #fcfcfc !default;
// Fonts // Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; $font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$font-size-base: .8125rem !default;
$font-size-base: 0.8125rem !default;
// Dropdowns // Dropdowns
@ -54,24 +54,21 @@ $dropdown-link-hover-bg: $primary !default;
// Navs // Navs
$nav-link-padding-y: .9rem !default; $nav-link-padding-y: .7rem !default;
$nav-link-disabled-color: $gray-400 !default; $nav-link-disabled-color: $gray-400 !default;
$nav-tabs-border-color: darken(#fff, 6.5%) !default; $nav-tabs-border-color: darken(#fff, 6.5%) !default;
// Navbar // Navbar
$navbar-dark-color: rgba($white,.75) !default; $navbar-dark-color: rgba($white, .75) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
// Pagination // Pagination
$pagination-border-color: $nav-tabs-border-color !default; $pagination-border-color: $nav-tabs-border-color !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: $primary !default; $pagination-hover-bg: $primary !default;
$pagination-hover-border-color: $primary !default; $pagination-hover-border-color: $primary !default;
$pagination-disabled-color: $gray-400 !default; $pagination-disabled-color: $gray-400 !default;
$pagination-disabled-border-color: $pagination-border-color !default; $pagination-disabled-border-color: $pagination-border-color !default;
@ -90,7 +87,6 @@ $popover-border-color: $nav-tabs-border-color !default;
// Modals // Modals
$modal-content-border-color: $nav-tabs-border-color !default; $modal-content-border-color: $nav-tabs-border-color !default;
$modal-header-border-color: $nav-tabs-border-color !default; $modal-header-border-color: $nav-tabs-border-color !default;
// Progress bars // Progress bars
@ -100,7 +96,6 @@ $progress-bar-color: $primary !default;
// List group // List group
$list-group-border-color: $nav-tabs-border-color !default; $list-group-border-color: $nav-tabs-border-color !default;
$list-group-disabled-bg: $nav-tabs-border-color !default; $list-group-disabled-bg: $nav-tabs-border-color !default;
// Breadcrumbs // Breadcrumbs

View file

@ -1,4 +1,4 @@
// Sketchy 4.5.0 // Sketchy 4.5.3
// Bootswatch // Bootswatch
@ -7,9 +7,11 @@
$web-font-path: "https://fonts.googleapis.com/css?family=Neucha|Cabin+Sketch&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css?family=Neucha|Cabin+Sketch&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
$border-radius-sketchy: 255px 25px 225px 25px/25px 225px 25px 255px; // stylelint-disable scss/dollar-variable-default
$border-radius-lg-sketchy: 555px 25px 15px 25px/25px 5px 35px 555px; $border-radius-sketchy: 255px 25px 225px 25px / 25px 225px 25px 255px;
$border-radius-sm-sketchy: 255px 25px 225px 25px/25px 225px 25px 255px; $border-radius-lg-sketchy: 555px 25px 15px 25px / 25px 5px 35px 555px;
$border-radius-sm-sketchy: 255px 25px 225px 25px / 25px 225px 25px 255px;
// style-enable scss/dollar-variable-default
// Navbar ====================================================================== // Navbar ======================================================================
@ -24,17 +26,17 @@ $border-radius-sm-sketchy: 255px 25px 225px 25px/25px 225px 25px 255px;
&.fixed-top { &.fixed-top {
border-radius: 0 25px 225px 0/25px 0 25px 255px; border-radius: 0 25px 225px 0/25px 0 25px 255px;
border-width: 0 0 2px 0; border-width: 0 0 2px;
} }
&.fixed-bottom { &.fixed-bottom {
border-radius: 255px 25px 0 25px/25px 225px 25px 0; border-radius: 255px 25px 0 25px/25px 225px 25px 0;
border-width: 2px 0 0 0; border-width: 2px 0 0;
} }
&-brand { &-brand {
font-family: $headings-font-family; font-family: $headings-font-family;
font-weight: normal; font-weight: 400;
text-decoration: none; text-decoration: none;
} }
} }
@ -56,7 +58,11 @@ $border-radius-sm-sketchy: 255px 25px 225px 25px/25px 225px 25px 255px;
// Typography ================================================================== // Typography ==================================================================
button, input, optgroup, select, textarea { button,
input,
optgroup,
select,
textarea {
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
} }
@ -69,7 +75,7 @@ blockquote {
table { table {
th, th,
td { td {
background-color: #fff; background-color: $white;
} }
} }
@ -87,7 +93,8 @@ table {
.table-success, .table-success,
.table-success:hover { .table-success:hover {
td, th { td,
th {
background-color: $success; background-color: $success;
color: $white; color: $white;
} }
@ -95,7 +102,8 @@ table {
.table-info, .table-info,
.table-info:hover { .table-info:hover {
td, th { td,
th {
background-color: $info; background-color: $info;
color: $white; color: $white;
} }
@ -103,7 +111,8 @@ table {
.table-warning, .table-warning,
.table-warning:hover { .table-warning:hover {
td, th { td,
th {
background-color: $warning; background-color: $warning;
color: $white; color: $white;
} }
@ -111,7 +120,8 @@ table {
.table-danger, .table-danger,
.table-danger:hover { .table-danger:hover {
td, th { td,
th {
background-color: $danger; background-color: $danger;
color: $white; color: $white;
} }
@ -125,7 +135,6 @@ table {
&.table-hover .table-active:hover > td { &.table-hover .table-active:hover > td {
background-color: $gray-800; background-color: $gray-800;
} }
} }
@ -153,11 +162,11 @@ select.form-control {
border: none; border: none;
cursor: pointer; cursor: pointer;
&:before { &::before {
content: ""; content: "";
position: absolute; position: absolute;
left: -1.2em; left: -1.2em;
top: -0.9em; top: -.9em;
display: inline-block; display: inline-block;
width: 15px; width: 15px;
height: 16px; height: 16px;
@ -165,18 +174,18 @@ select.form-control {
border-radius: 2px 8px 2px 4px / 5px 3px 5px 3px; border-radius: 2px 8px 2px 4px / 5px 3px 5px 3px;
} }
&:checked:after { &:checked::after {
content: "x"; content: "x";
position: absolute; position: absolute;
left: -0.64em; left: -.64em;
top: -0.48em; top: -.48em;
font-size: 1.5rem; font-size: 1.5rem;
line-height: 0.5; line-height: .5;
color: $gray-800; color: $gray-800;
} }
&:disabled { &:disabled {
&:before { &::before {
border: 2px solid $gray-500; border: 2px solid $gray-500;
} }
} }
@ -190,11 +199,11 @@ select.form-control {
border: none; border: none;
cursor: pointer; cursor: pointer;
&:before { &::before {
content: ""; content: "";
position: absolute; position: absolute;
left: -1.2em; left: -1.2em;
top: -0.9em; top: -.9em;
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;
@ -202,12 +211,12 @@ select.form-control {
border-radius: 50% 45% 40% 50% / 40% 50% 50% 45%; border-radius: 50% 45% 40% 50% / 40% 50% 50% 45%;
} }
&:checked:before { &:checked::before {
background-color: $gray-800; background-color: $gray-800;
} }
&:disabled { &:disabled {
&:before { &::before {
border: 2px solid $gray-500; border: 2px solid $gray-500;
} }
} }
@ -219,19 +228,19 @@ select.form-control {
.form-check-inline { .form-check-inline {
[type="checkbox"] { [type="checkbox"] {
&:before { &::before {
left: 0; left: 0;
top: 0; top: 0;
} }
&:after { &::after {
left: 0.14em; left: .14em;
top: 0.12em; top: .12em;
} }
} }
[type="radio"] { [type="radio"] {
&:before { &::before {
left: 0; left: 0;
top: 0; top: 0;
} }
@ -306,10 +315,6 @@ select.form-control {
// Indicators ================================================================== // Indicators ==================================================================
.progress {
border: 2px solid $gray-800;
}
.badge { .badge {
border-radius: $border-radius-sm-sketchy; border-radius: $border-radius-sm-sketchy;
@ -329,9 +334,9 @@ select.form-control {
.close { .close {
color: transparent; color: transparent;
&:before { &::before {
right: 1rem; right: 1rem;
top: 0.8rem; top: .8rem;
} }
} }
@ -340,7 +345,7 @@ select.form-control {
&, &,
.alert-link, .alert-link,
.close:before { .close::before {
color: $success; color: $success;
} }
} }
@ -350,7 +355,7 @@ select.form-control {
&, &,
.alert-link, .alert-link,
.close:before { .close::before {
color: $info; color: $info;
} }
} }
@ -360,7 +365,7 @@ select.form-control {
&, &,
.alert-link, .alert-link,
.close:before { .close::before {
color: $warning; color: $warning;
} }
} }
@ -370,7 +375,7 @@ select.form-control {
&, &,
.alert-link, .alert-link,
.close:before { .close::before {
color: $danger; color: $danger;
} }
} }
@ -380,6 +385,7 @@ select.form-control {
// Progress bars =============================================================== // Progress bars ===============================================================
.progress { .progress {
border: 2px solid $gray-800;
border-radius: $border-radius-sm-sketchy; border-radius: $border-radius-sm-sketchy;
} }
@ -461,7 +467,6 @@ select.form-control {
} }
.tooltip { .tooltip {
&-inner { &-inner {
border-radius: $border-radius-sm-sketchy; border-radius: $border-radius-sm-sketchy;
} }
@ -478,7 +483,7 @@ pre {
.close:active { .close:active {
opacity: 1; opacity: 1;
&:before { &::before {
position: absolute; position: absolute;
content: "X"; content: "X";
color: $gray-800; color: $gray-800;

View file

@ -1,4 +1,4 @@
// Sketchy 4.5.0 // Sketchy 4.5.3
// Bootswatch // Bootswatch
// //
@ -46,18 +46,16 @@ $link-decoration: underline !default;
// Components // Components
$border-width: 2px !default; $border-width: 2px !default;
$border-radius: 25px !default; $border-radius: 25px !default;
$border-radius-lg: 35px !default; $border-radius-lg: 35px !default;
$border-radius-sm: 15px !default; $border-radius-sm: 15px !default;
// Fonts // Fonts
$font-family-sans-serif: 'Neucha', -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; // stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Neucha, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
$font-weight-base: 700 !default; $font-weight-base: 700 !default;
$headings-font-family: "Cabin Sketch", cursive !default;
$headings-font-family: 'Cabin Sketch', cursive !default;
$blockquote-small-color: $gray-800 !default; $blockquote-small-color: $gray-800 !default;
@ -65,21 +63,18 @@ $blockquote-small-color: $gray-800 !default;
$table-accent-bg: $gray-400 !default; $table-accent-bg: $gray-400 !default;
$table-hover-bg: $white !default; $table-hover-bg: $white !default;
$table-border-width: 2px !default; $table-border-width: 2px !default;
$table-border-color: $gray-800 !default; $table-border-color: $gray-800 !default;
// Forms // Forms
$input-border-color: $gray-800 !default; $input-border-color: $gray-800 !default;
$input-focus-border-color: $input-border-color !default; $input-focus-border-color: $input-border-color !default;
// Dropdowns // Dropdowns
$dropdown-border-color: $gray-800 !default; $dropdown-border-color: $gray-800 !default;
$dropdown-divider-bg: $gray-800 !default; $dropdown-divider-bg: $gray-800 !default;
$dropdown-link-hover-color: $white !default; $dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $gray-800 !default; $dropdown-link-hover-bg: $gray-800 !default;
@ -95,7 +90,6 @@ $nav-tabs-link-active-border-color: $gray-800 !default;
$navbar-dark-color: $white !default; $navbar-dark-color: $white !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
$navbar-dark-toggler-border-color: $white !default; $navbar-dark-toggler-border-color: $white !default;
$navbar-light-color: $gray-800 !default; $navbar-light-color: $gray-800 !default;
$navbar-light-hover-color: $gray-800 !default; $navbar-light-hover-color: $gray-800 !default;
$navbar-light-active-color: $gray-800 !default; $navbar-light-active-color: $gray-800 !default;
@ -104,15 +98,12 @@ $navbar-light-toggler-border-color: $gray-800 !default;
// Pagination // Pagination
$pagination-border-color: $gray-800 !default; $pagination-border-color: $gray-800 !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: $gray-800 !default; $pagination-hover-bg: $gray-800 !default;
$pagination-hover-border-color: $gray-800 !default; $pagination-hover-border-color: $gray-800 !default;
$pagination-disabled-color: $gray-400 !default; $pagination-disabled-color: $gray-400 !default;
$pagination-disabled-border-color: $gray-800 !default; $pagination-disabled-border-color: $gray-800 !default;
// Jumbotron // Jumbotron
$jumbotron-bg: transparent !default; $jumbotron-bg: transparent !default;
@ -128,21 +119,19 @@ $popover-border-color: $gray-800 !default;
// Badges // Badges
$badge-padding-y: 0.5em !default; $badge-padding-y: .5em !default;
$badge-padding-x: 1.2em !default; $badge-padding-x: 1.2em !default;
// Toasts // Toasts
$toast-border-width: 2px !default; $toast-border-width: 2px !default;
$toast-border-color: $gray-800 !default; $toast-border-color: $gray-800 !default;
$toast-header-color: $gray-800 !default; $toast-header-color: $gray-800 !default;
$toast-header-border-color: $toast-border-color !default; $toast-header-border-color: $toast-border-color !default;
// Modals // Modals
$modal-content-border-color: $gray-800 !default; $modal-content-border-color: $gray-800 !default;
$modal-header-border-color: $gray-800 !default; $modal-header-border-color: $gray-800 !default;
// Progress bars // Progress bars
@ -153,11 +142,9 @@ $progress-bar-bg: $gray-400 !default;
// List group // List group
$list-group-border-color: $gray-800 !default; $list-group-border-color: $gray-800 !default;
$list-group-hover-bg: $gray-300 !default; $list-group-hover-bg: $gray-300 !default;
$list-group-active-color: $white !default; $list-group-active-color: $white !default;
$list-group-active-bg: $gray-800 !default; $list-group-active-bg: $gray-800 !default;
$list-group-action-color: $gray-800 !default; $list-group-action-color: $gray-800 !default;
// Breadcrumbs // Breadcrumbs

View file

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

View file

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

View file

@ -1,14 +1,12 @@
// Solar 4.5.0 // Solar 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ======================================================================
// Buttons ===================================================================== // Buttons =====================================================================
.btn { .btn {
@ -23,12 +21,9 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
} }
} }
// Typography ==================================================================
// Tables ====================================================================== // Tables ======================================================================
.table { .table {
&-primary, &-primary,
&-secondary, &-secondary,
&-dark, &-dark,
@ -36,115 +31,150 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
&-info, &-info,
&-warning, &-warning,
&-danger { &-danger {
color: #fff; color: $white;
} }
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -155,7 +185,8 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
// Forms ======================================================================= // Forms =======================================================================
.custom-control-input:checked ~ .custom-control-label::before { .custom-control-input:checked ~ .custom-control-label::before {
background: $primary; background-color: $primary;
background-image: none;
} }
.custom-control-input:focus:not(:checked) ~ .custom-control-label::before { .custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
@ -163,7 +194,8 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
} }
.custom-control-input:not(:disabled):active ~ .custom-control-label::before { .custom-control-input:not(:disabled):active ~ .custom-control-label::before {
background: $primary; background-color: $primary;
background-image: none;
border-color: $primary; border-color: $primary;
} }
@ -173,12 +205,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
} }
.custom-control-input:checked ~ .custom-control-label::after { .custom-control-input:checked ~ .custom-control-label::after {
background-color: rgba(255, 255, 255, 0.75); background-color: rgba(255, 255, 255, .75);
} }
} }
// Navs ========================================================================
// Indicators ================================================================== // Indicators ==================================================================
.alert { .alert {
@ -187,7 +217,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
a, a,
.alert-link { .alert-link {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
@ -203,13 +233,9 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro&display
&-light { &-light {
&, &,
& a:not(.btn), a:not(.btn),
& .alert-link { .alert-link {
color: $body-bg; color: $body-bg;
} }
} }
} }
// Progress bars ===============================================================
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Solar 4.5.0 // Solar 4.5.3
// Bootswatch // Bootswatch
// //
@ -7,27 +7,27 @@
// stylelint-disable // stylelint-disable
$white: #fff !default; $white: #fff !default;
$gray-100: #FDF6E3 !default; $gray-100: #fdf6e3 !default;
$gray-200: #EEE8D5 !default; $gray-200: #eee8d5 !default;
$gray-300: #dee2e6 !default; $gray-300: #dee2e6 !default;
$gray-400: #ced4da !default; $gray-400: #ced4da !default;
$gray-500: #adb5bd !default; $gray-500: #adb5bd !default;
$gray-600: #839496 !default; $gray-600: #839496 !default;
$gray-700: #495057 !default; $gray-700: #495057 !default;
$gray-800: #073642 !default; $gray-800: #073642 !default;
$gray-900: #002B36 !default; $gray-900: #002b36 !default;
$black: #000 !default; $black: #000 !default;
$blue: #B58900 !default; $blue: #b58900 !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #D33682 !default; $red: #d33682 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #CB4B16 !default; $yellow: #cb4b16 !default;
$green: #2AA198 !default; $green: #2aa198 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #268BD2 !default; $cyan: #268bd2 !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-600 !default; $secondary: $gray-600 !default;
@ -52,33 +52,28 @@ $link-hover-color: $link-color !default;
// Components // Components
$component-active-color: rgba(255,255,255,.75) !default; $component-active-color: rgba(255, 255, 255, .75) !default;
$component-active-bg: $gray-800 !default; $component-active-bg: $gray-800 !default;
// Fonts // Fonts
$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 !default; $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 !default;
// Tables // Tables
$table-accent-bg: rgba($white,.05) !default; $table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white,.075) !default; $table-hover-bg: rgba($white, .075) !default;
$table-border-color: $component-active-bg !default; $table-border-color: $component-active-bg !default;
$table-dark-bg: $gray-500 !default; $table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 3%) !default; $table-dark-border-color: darken($gray-500, 3%) !default;
$table-dark-color: $body-bg !default; $table-dark-color: $body-bg !default;
// Forms // Forms
$input-bg: #A9BDBD !default; $input-bg: #a9bdbd !default;
$input-disabled-bg: #657B83 !default; $input-disabled-bg: #657b83 !default;
$input-border-color: rgba($black, .15) !default;
$input-border-color: rgba($black,.15) !default; $input-placeholder-color: #657b83 !default;
$input-placeholder-color: #657B83 !default;
$input-group-addon-color: $gray-600 !default; $input-group-addon-color: $gray-600 !default;
$input-group-addon-bg: $gray-800 !default; $input-group-addon-bg: $gray-800 !default;
@ -86,9 +81,8 @@ $input-group-addon-bg: $gray-800 !default;
$dropdown-bg: $gray-800 !default; $dropdown-bg: $gray-800 !default;
$dropdown-divider-bg: $body-bg !default; $dropdown-divider-bg: $body-bg !default;
$dropdown-link-color: $body-color !default; $dropdown-link-color: $body-color !default;
$dropdown-link-hover-color: rgba(255,255,255,.75) !default; $dropdown-link-hover-color: rgba(255, 255, 255, .75) !default;
$dropdown-link-hover-bg: $body-bg !default; $dropdown-link-hover-bg: $body-bg !default;
// Navs // Navs
@ -101,21 +95,18 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
// Navbars // Navbars
$navbar-light-color: rgba($black,.4) !default !default; $navbar-light-color: rgba($black, .4) !default !default;
$navbar-light-active-color: rgba($black,.7) !default !default; $navbar-light-active-color: rgba($black, .7) !default !default;
// Pagination // Pagination
$pagination-bg: transparent !default; $pagination-bg: transparent !default;
$pagination-border-color: $gray-800 !default; $pagination-border-color: $gray-800 !default;
$pagination-hover-bg: $gray-800 !default; $pagination-hover-bg: $gray-800 !default;
$pagination-hover-border-color: $gray-800 !default; $pagination-hover-border-color: $gray-800 !default;
$pagination-active-color: rgba(255, 255, 255, .75) !default;
$pagination-active-color: rgba(255,255,255,.75) !default;
$pagination-active-bg: $gray-800 !default; $pagination-active-bg: $gray-800 !default;
$pagination-active-border-color: $gray-800 !default; $pagination-active-border-color: $gray-800 !default;
$pagination-disabled-color: $gray-800 !default; $pagination-disabled-color: $gray-800 !default;
$pagination-disabled-bg: transparent !default; $pagination-disabled-bg: transparent !default;
$pagination-disabled-border-color: $gray-800 !default; $pagination-disabled-border-color: $gray-800 !default;
@ -134,14 +125,12 @@ $card-bg: rgba($gray-200, .125) !default;
$popover-bg: $gray-800 !default; $popover-bg: $gray-800 !default;
$popover-border-color: $body-bg !default; $popover-border-color: $body-bg !default;
$popover-header-bg: $gray-800 !default; $popover-header-bg: $gray-800 !default;
// Toasts // Toasts
$toast-background-color: lighten($body-bg, 5%) !default; $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-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default; $toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default; $toast-header-border-color: $toast-border-color !default;
@ -150,7 +139,6 @@ $toast-header-border-color: $toast-border-color !default;
$modal-content-bg: $gray-800 !default; $modal-content-bg: $gray-800 !default;
$modal-content-border-color: $body-bg !default; $modal-content-border-color: $body-bg !default;
$modal-header-border-color: $body-bg !default; $modal-header-border-color: $body-bg !default;
// Progress bars // Progress bars
@ -162,13 +150,10 @@ $progress-bar-color: $primary !default;
$list-group-bg: transparent !default; $list-group-bg: transparent !default;
$list-group-border-color: $gray-800 !default; $list-group-border-color: $gray-800 !default;
$list-group-hover-bg: $gray-800 !default; $list-group-hover-bg: $gray-800 !default;
$list-group-active-color: rgba(255,255,255,.75) !default; $list-group-active-color: rgba(255, 255, 255, .75) !default;
$list-group-disabled-color: $component-active-bg !default; $list-group-disabled-color: $component-active-bg !default;
$list-group-disabled-bg: transparent !default; $list-group-disabled-bg: transparent !default;
$list-group-action-color: $body-color !default; $list-group-action-color: $body-color !default;
$list-group-action-hover-color: $component-active-color !default; $list-group-action-hover-color: $component-active-color !default;

View file

@ -1,12 +1,14 @@
// Spacelab 4.5.0 // Spacelab 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Mixins ======================================================================
@mixin btn-shadow($color){ @mixin btn-shadow($color){
@include gradient-y-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%)); @include gradient-y-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%));
filter: none; filter: none;
@ -16,10 +18,9 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700
// Navbar ====================================================================== // Navbar ======================================================================
.navbar { .navbar {
.nav-link, .nav-link,
.navbar-brand { .navbar-brand {
text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.1); text-shadow: -1px -1px 0 rgba(0, 0, 0, .1);
transition: color ease-in-out .2s; transition: color ease-in-out .2s;
} }
@ -36,7 +37,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700
.nav-link, .nav-link,
.navbar-brand { .navbar-brand {
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.1); text-shadow: 1px 1px 0 rgba(255, 255, 255, .1);
} }
.navbar-brand { .navbar-brand {
@ -52,7 +53,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700
// Buttons ===================================================================== // Buttons =====================================================================
.btn { .btn {
text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.1); text-shadow: -1px -1px 0 rgba(0, 0, 0, .1);
&-link { &-link {
text-shadow: none; text-shadow: none;
@ -73,30 +74,24 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700
text-shadow: none; text-shadow: none;
} }
// Typography ==================================================================
// Tables ======================================================================
// Forms =======================================================================
// Navs ========================================================================
// Indicators ================================================================== // Indicators ==================================================================
.badge { .badge {
&-secondary { &-secondary {
color: $white; color: $white;
} }
} }
// Progress bars ===============================================================
// Containers ================================================================== // Containers ==================================================================
.card, .card,
.list-group-item { .list-group-item {
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit; color: inherit;
} }
} }

View file

@ -1,4 +1,4 @@
// Spacelab 4.5.0 // Spacelab 4.5.3
// Bootswatch // Bootswatch
// //
@ -17,16 +17,16 @@ $gray-800: #333 !default;
$gray-900: #2d2d2d !default; $gray-900: #2d2d2d !default;
$black: #000 !default; $black: #000 !default;
$blue: #446E9B !default; $blue: #446e9b !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #CD0200 !default; $red: #cd0200 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #D47500 !default; $yellow: #d47500 !default;
$green: #3CB521 !default; $green: #3cb521 !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #3399F3 !default; $cyan: #3399f3 !default;
$primary: $blue !default; $primary: $blue !default;
$secondary: $gray-500 !default; $secondary: $gray-500 !default;
@ -49,15 +49,16 @@ $link-color: $info !default;
// Fonts // Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; $font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$headings-color: $gray-900 !default; $headings-color: $gray-900 !default;
// Navbar // Navbar
$navbar-dark-color: rgba($white,.75) !default; $navbar-dark-color: rgba($white, .75) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
$navbar-light-color: rgba($black, .4) !default;
$navbar-light-color: rgba($black,.4) !default;
$navbar-light-hover-color: $info !default; $navbar-light-hover-color: $info !default;
$navbar-light-active-color: $info !default; $navbar-light-active-color: $info !default;
$navbar-padding-y: .7rem !default;

View file

@ -1,10 +1,10 @@
// Superhero 4.5.0 // Superhero 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ====================================================================== // Navbar ======================================================================
@ -30,7 +30,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700&displa
// Typography ================================================================== // Typography ==================================================================
.dropdown-menu { .dropdown-menu {
font-size: $font-size-sm; font-size: $font-size-sm;
} }
@ -52,7 +51,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700&displa
} }
a:not(.btn) { a:not(.btn) {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
@ -64,116 +63,149 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700&displa
color: $text-muted; color: $text-muted;
} }
&-dark {
color: #fff;
}
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { color: $white;
&,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -206,7 +238,7 @@ label,
.page-link:hover, .page-link:hover,
.page-link:focus { .page-link:focus {
color: #fff; color: $white;
text-decoration: none; text-decoration: none;
} }
@ -218,7 +250,7 @@ label,
a, a,
.alert-link { .alert-link {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
@ -241,9 +273,9 @@ label,
} }
.close { .close {
color: #fff; color: $white;
text-shadow: none; text-shadow: none;
opacity: 0.5; opacity: .5;
&:hover, &:hover,
&:focus { &:focus {
@ -251,8 +283,6 @@ label,
} }
} }
// Progress bars ===============================================================
// Popovers =============================================================== // Popovers ===============================================================
.popover-header { .popover-header {

View file

@ -1,4 +1,4 @@
// Superhero 4.5.0 // Superhero 4.5.3
// Bootswatch // Bootswatch
// //
@ -6,8 +6,8 @@
// //
$white: #fff !default; $white: #fff !default;
$gray-100: #EBEBEB !default; $gray-100: #ebebeb !default;
$gray-200: #4E5D6C !default; $gray-200: #4e5d6c !default;
$gray-300: #dee2e6 !default; $gray-300: #dee2e6 !default;
$gray-400: #ced4da !default; $gray-400: #ced4da !default;
$gray-500: #adb5bd !default; $gray-500: #adb5bd !default;
@ -17,7 +17,7 @@ $gray-800: #343a40 !default;
$gray-900: #212529 !default; $gray-900: #212529 !default;
$black: #000 !default; $black: #000 !default;
$blue: #DF691A !default; $blue: #df691a !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
@ -41,29 +41,28 @@ $yiq-contrasted-threshold: 185 !default;
// Body // Body
$body-bg: #2B3E50 !default; $body-bg: #2b3e50 !default;
$body-color: $gray-100 !default; $body-color: $gray-100 !default;
// Components // Components
$border-radius: 0px !default; $border-radius: 0 !default;
$border-radius-lg: 0px !default; $border-radius-lg: 0 !default;
$border-radius-sm: 0px !default; $border-radius-sm: 0 !default;
// Fonts // Fonts
$font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$text-muted: rgba(255,255,255,.4) !default; // stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Lato, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$text-muted: rgba(255, 255, 255, .4) !default;
// Tables // Tables
$table-accent-bg: rgba($white,.05) !default; $table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white,.075) !default; $table-hover-bg: rgba($white, .075) !default;
$table-border-color: rgba($black, .15) !default;
$table-border-color: rgba($black,.15) !default;
$table-head-bg: $light !default; $table-head-bg: $light !default;
$table-dark-bg: $light !default; $table-dark-bg: $light !default;
$table-dark-border-color: $gray-200 !default; $table-dark-border-color: $gray-200 !default;
$table-dark-color: $body-bg !default; $table-dark-color: $body-bg !default;
@ -71,36 +70,30 @@ $table-dark-color: $body-bg !default;
// Forms // Forms
$input-disabled-bg: $gray-100 !default; $input-disabled-bg: $gray-100 !default;
$input-border-color: transparent !default; $input-border-color: transparent !default;
$input-group-addon-color: $body-color !default; $input-group-addon-color: $body-color !default;
$custom-file-button-color: $white !default; $custom-file-button-color: $white !default;
$custom-file-border-color: $gray-200 !default; $custom-file-border-color: $gray-200 !default;
// Dropdowns // Dropdowns
$dropdown-bg: $gray-200 !default; $dropdown-bg: $gray-200 !default;
$dropdown-divider-bg: rgba($black,.15) !default; $dropdown-divider-bg: rgba($black, .15) !default;
$dropdown-link-color: $body-color !default; $dropdown-link-color: $body-color !default;
$dropdown-link-hover-color: $dropdown-link-color !default; $dropdown-link-hover-color: $dropdown-link-color !default;
$dropdown-link-hover-bg: $table-hover-bg !default; $dropdown-link-hover-bg: $table-hover-bg !default;
// Navs // Navs
$nav-link-disabled-color: rgba(255,255,255,.4) !default; $nav-link-disabled-color: rgba(255, 255, 255, .4) !default;
$nav-tabs-border-color: $gray-200 !default; $nav-tabs-border-color: $gray-200 !default;
$nav-tabs-link-active-color: $body-color !default; $nav-tabs-link-active-color: $body-color !default;
$nav-tabs-link-active-border-color: $gray-200 !default; $nav-tabs-link-active-border-color: $gray-200 !default;
// Navbar // Navbar
$navbar-padding-y: 0.7rem !default; $navbar-padding-y: .7rem !default;
$navbar-dark-color: rgba($white, .75) !default;
$navbar-dark-color: rgba($white,.75) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
// Pagination // Pagination
@ -108,11 +101,9 @@ $navbar-dark-hover-color: $white !default;
$pagination-color: $white !default; $pagination-color: $white !default;
$pagination-bg: $gray-200 !default; $pagination-bg: $gray-200 !default;
$pagination-border-color: transparent !default; $pagination-border-color: transparent !default;
$pagination-hover-color: $white !default; $pagination-hover-color: $white !default;
$pagination-hover-bg: $nav-link-disabled-color !default; $pagination-hover-bg: $nav-link-disabled-color !default;
$pagination-hover-border-color: $pagination-border-color !default; $pagination-hover-border-color: $pagination-border-color !default;
$pagination-disabled-color: $nav-link-disabled-color !default; $pagination-disabled-color: $nav-link-disabled-color !default;
$pagination-disabled-bg: $pagination-bg !default; $pagination-disabled-bg: $pagination-bg !default;
$pagination-disabled-border-color: $pagination-border-color !default; $pagination-disabled-border-color: $pagination-border-color !default;
@ -121,19 +112,17 @@ $pagination-disabled-border-color: $pagination-border-color !default;
$card-cap-bg: $table-hover-bg !default; $card-cap-bg: $table-hover-bg !default;
$card-bg: $gray-200 !default; $card-bg: $gray-200 !default;
$card-inner-border-radius: 0px !default; $card-inner-border-radius: 0 !default;
// Popovers // Popovers
$popover-bg: $gray-200 !default; $popover-bg: $gray-200 !default;
$popover-header-bg: $table-hover-bg !default; $popover-header-bg: $table-hover-bg !default;
// Toasts // Toasts
$toast-background-color: $gray-200 !default; $toast-background-color: $gray-200 !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-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default; $toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default; $toast-header-border-color: $toast-border-color !default;
@ -141,18 +130,14 @@ $toast-header-border-color: $toast-border-color !default;
// Modals // Modals
$modal-content-bg: $gray-200 !default; $modal-content-bg: $gray-200 !default;
$modal-header-border-color: rgba(0, 0, 0, .2) !default;
$modal-header-border-color: rgba(0,0,0,.2) !default;
// List group // List group
$list-group-bg: $gray-200 !default; $list-group-bg: $gray-200 !default;
$list-group-border-color: transparent !default; $list-group-border-color: transparent !default;
$list-group-hover-bg: $nav-link-disabled-color !default; $list-group-hover-bg: $nav-link-disabled-color !default;
$list-group-disabled-color: $nav-link-disabled-color !default; $list-group-disabled-color: $nav-link-disabled-color !default;
$list-group-action-color: $white !default; $list-group-action-color: $white !default;
$list-group-action-hover-color: $white !default; $list-group-action-hover-color: $white !default;

View file

@ -1,26 +1,8 @@
// United 4.5.0 // United 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Ubuntu:wght@400;700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ======================================================================
// Buttons =====================================================================
// Typography ==================================================================
// Tables ======================================================================
// Forms =======================================================================
// Navs ========================================================================
// Indicators ==================================================================
// Progress bars ===============================================================
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// United 4.5.0 // United 4.5.3
// Bootswatch // Bootswatch
// //
@ -10,7 +10,7 @@ $gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default; $gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default; $gray-300: #dee2e6 !default;
$gray-400: #ced4da !default; $gray-400: #ced4da !default;
$gray-500: #AEA79F !default; $gray-500: #aea79f !default;
$gray-600: #868e96 !default; $gray-600: #868e96 !default;
$gray-700: #495057 !default; $gray-700: #495057 !default;
$gray-800: #333 !default; $gray-800: #333 !default;
@ -21,10 +21,10 @@ $blue: #007bff !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #772953 !default; $purple: #772953 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #DF382C !default; $red: #df382c !default;
$orange: #E95420 !default; $orange: #e95420 !default;
$yellow: #EFB73E !default; $yellow: #efb73e !default;
$green: #38B44A !default; $green: #38b44a !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #17a2b8 !default; $cyan: #17a2b8 !default;
@ -45,9 +45,14 @@ $body-color: $gray-800 !default;
// Fonts // Fonts
$font-family-sans-serif: "Ubuntu", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; // stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Ubuntu, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
// Tables // Tables
$table-dark-bg: $dark !default; $table-dark-bg: $dark !default;
$table-dark-border-color: darken($dark, 5%) !default; $table-dark-border-color: darken($dark, 5%) !default;
// Navbar
$navbar-padding-y: .7rem !default;

View file

@ -1,10 +1,10 @@
// Yeti 4.5.0 // Yeti 4.5.3
// Bootswatch // Bootswatch
// Variables =================================================================== // Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700&display=swap" !default; $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap" !default;
@import url($web-font-path); @import url($web-font-path);
// Navbar ====================================================================== // Navbar ======================================================================
@ -15,7 +15,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400
} }
.bg-primary { .bg-primary {
.dropdown-menu { .dropdown-menu {
background-color: $primary; background-color: $primary;
@ -28,7 +27,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400
.dropdown-item:hover, .dropdown-item:hover,
.dropdown-item:focus { .dropdown-item:focus {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
color: #fff; color: $white;
} }
} }
} }
@ -48,13 +47,12 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400
.dropdown-item:hover, .dropdown-item:hover,
.dropdown-item:focus { .dropdown-item:focus {
background-color: darken($gray-800, 5%); background-color: darken($gray-800, 5%);
color: #fff; color: $white;
} }
} }
} }
.bg-light { .bg-light {
.dropdown-menu { .dropdown-menu {
background-color: $gray-200; background-color: $gray-200;
@ -111,13 +109,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400
} }
.btn-group { .btn-group {
.dropdown-menu { .dropdown-menu {
border-top-width: 0; border-top-width: 0;
} }
.dropdown-toggle { .dropdown-toggle {
&.btn-primary ~ .dropdown-menu { &.btn-primary ~ .dropdown-menu {
background-color: $primary; background-color: $primary;
border-color: darken($primary, 5%); border-color: darken($primary, 5%);
@ -137,7 +133,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400
border-color: darken($secondary, 5%); border-color: darken($secondary, 5%);
.dropdown-item { .dropdown-item {
color: $white; color: $body-color;
} }
.dropdown-item:hover, .dropdown-item:hover,
@ -190,7 +186,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400
&.btn-danger ~ .dropdown-menu { &.btn-danger ~ .dropdown-menu {
background-color: $danger; background-color: $danger;
border-color: darken($primary, 5%); border-color: darken($danger, 5%);
.dropdown-item { .dropdown-item {
color: $white; color: $white;
@ -221,121 +217,155 @@ table {
} }
.table { .table {
&-primary, &-primary,
&-success, &-success,
&-info, &-info,
&-warning, &-warning,
&-danger { &-danger {
color: #fff; color: $white;
} }
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-active { &-active {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
&-hover { &-hover {
.table-primary:hover { .table-primary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($primary, 5%); background-color: darken($primary, 5%);
} }
} }
.table-secondary:hover { .table-secondary:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($secondary, 5%); background-color: darken($secondary, 5%);
} }
} }
.table-light:hover { .table-light:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($light, 5%); background-color: darken($light, 5%);
} }
} }
.table-dark:hover { .table-dark:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($dark, 5%); background-color: darken($dark, 5%);
} }
} }
.table-success:hover { .table-success:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($success, 5%); background-color: darken($success, 5%);
} }
} }
.table-info:hover { .table-info:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($info, 5%); background-color: darken($info, 5%);
} }
} }
.table-danger:hover { .table-danger:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($danger, 5%); background-color: darken($danger, 5%);
} }
} }
.table-warning:hover { .table-warning:hover {
&, > th, > td { &,
> th,
> td {
background-color: darken($warning, 5%); background-color: darken($warning, 5%);
} }
} }
.table-active:hover { .table-active:hover {
&, > th, > td { &,
> th,
> td {
background-color: $table-active-bg; background-color: $table-active-bg;
} }
} }
@ -357,8 +387,8 @@ label,
// Navs ======================================================================== // Navs ========================================================================
.dropdown-item { .dropdown-item {
padding-top: 0.75rem; padding-top: .75rem;
padding-bottom: 0.75rem; padding-bottom: .75rem;
font-size: $font-size-sm; font-size: $font-size-sm;
font-weight: 300; font-weight: 300;
} }
@ -398,8 +428,8 @@ label,
.page-link { .page-link {
border-color: transparent; border-color: transparent;
border-radius: 3px; border-radius: 3px;
margin-left: 0.1em; margin-left: .1em;
margin-right: 0.1em; margin-right: .1em;
&:hover, &:hover,
&:focus { &:focus {
@ -433,7 +463,7 @@ label,
// Indicators ================================================================== // Indicators ==================================================================
.close { .close {
opacity: 0.6; opacity: .6;
text-shadow: none; text-shadow: none;
&:hover, &:hover,
@ -448,64 +478,80 @@ label,
color: $white; color: $white;
&-primary { &-primary {
&, > th, > td { &,
> th,
> td {
background-color: $primary; background-color: $primary;
} }
} }
&-secondary { &-secondary {
&, > th, > td { &,
> th,
> td {
background-color: $secondary; background-color: $secondary;
} }
} }
&-success { &-success {
&, > th, > td { &,
> th,
> td {
background-color: $success; background-color: $success;
} }
} }
&-info { &-info {
&, > th, > td { &,
> th,
> td {
background-color: $info; background-color: $info;
} }
} }
&-danger { &-danger {
&, > th, > td { &,
> th,
> td {
background-color: $danger; background-color: $danger;
} }
} }
&-warning { &-warning {
&, > th, > td { &,
> th,
> td {
background-color: $warning; background-color: $warning;
} }
} }
&-dark { &-dark {
&, > th, > td { &,
> th,
> td {
background-color: $dark; background-color: $dark;
} }
} }
&-light { &-light {
&, > th, > td { &,
> th,
> td {
background-color: $light; background-color: $light;
} }
} }
.alert-link { .alert-link {
font-weight: normal; font-weight: 400;
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
&-secondary, &-secondary,
&-light { &-light {
&, &,
& a:not(.btn), a:not(.btn),
& .alert-link { .alert-link {
color: $body-color; color: $body-color;
} }
} }
@ -537,6 +583,3 @@ label,
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
} }
// Containers ==================================================================

View file

@ -1,4 +1,4 @@
// Yeti 4.5.0 // Yeti 4.5.3
// Bootswatch // Bootswatch
// //
@ -21,9 +21,9 @@ $blue: #008cba !default;
$indigo: #6610f2 !default; $indigo: #6610f2 !default;
$purple: #6f42c1 !default; $purple: #6f42c1 !default;
$pink: #e83e8c !default; $pink: #e83e8c !default;
$red: #F04124 !default; $red: #f04124 !default;
$orange: #fd7e14 !default; $orange: #fd7e14 !default;
$yellow: #E99002 !default; $yellow: #e99002 !default;
$green: #43ac6a !default; $green: #43ac6a !default;
$teal: #20c997 !default; $teal: #20c997 !default;
$cyan: #5bc0de !default; $cyan: #5bc0de !default;
@ -41,49 +41,45 @@ $yiq-contrasted-threshold: 200 !default;
// Components // Components
$border-radius: 0px !default; $border-radius: 0 !default;
$border-radius-lg: 0px !default; $border-radius-lg: 0 !default;
$border-radius-sm: 0px !default; $border-radius-sm: 0 !default;
// Fonts // Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; $font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$font-size-base: .9375rem !default;
$font-size-base: 0.9375rem !default; $font-size-sm: $font-size-base * .88 !default;
$headings-font-weight: 300 !default; $headings-font-weight: 300 !default;
// Buttons // Buttons
$input-btn-padding-x: 0.5rem !default; $input-btn-padding-x: .5rem !default;
$btn-font-weight: 300 !default; $btn-font-weight: 300 !default;
// Dropdowns // Dropdowns
$dropdown-border-color: rgba($black,.1) !default; $dropdown-border-color: rgba($black, .1) !default;
$dropdown-divider-bg: rgba($black,.1) !default; $dropdown-divider-bg: rgba($black, .1) !default;
// Navs // Navs
$nav-link-disabled-color: $gray-400 !default; $nav-link-disabled-color: $gray-400 !default;
$nav-tabs-border-color: $dropdown-border-color !default; $nav-tabs-border-color: $dropdown-border-color !default;
$nav-tabs-link-hover-border-color: $nav-tabs-border-color !default; $nav-tabs-link-hover-border-color: $nav-tabs-border-color !default;
$nav-tabs-link-active-border-color: $nav-tabs-border-color !default; $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
// Navbar // Navbar
$navbar-dark-color: rgba($white,.7) !default; $navbar-dark-color: rgba($white, .7) !default;
$navbar-dark-hover-color: $white !default; $navbar-dark-hover-color: $white !default;
// Pagination // Pagination
$pagination-color: $gray-600 !default; $pagination-color: $gray-600 !default;
$pagination-border-color: $nav-tabs-border-color !default; $pagination-border-color: $nav-tabs-border-color !default;
$pagination-active-border-color: darken($primary, 5%) !default; $pagination-active-border-color: darken($primary, 5%) !default;
$pagination-disabled-color: $gray-200 !default; $pagination-disabled-color: $gray-200 !default;
// Jumbotron // Jumbotron
@ -92,7 +88,7 @@ $jumbotron-padding: 4rem !default;
// Cards // Cards
$card-inner-border-radius: 0px !default; $card-inner-border-radius: 0 !default;
// Badges // Badges

View file

@ -18,8 +18,7 @@
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
<div role="tabpanel" class="tab-pane tab-pane-bordered active" id="takesnapshot"> <div role="tabpanel" class="tab-pane tab-pane-bordered active" id="takesnapshot">
{% if instance.status == 5 %} <p>{% trans "This may take more than an hour, depending on how much content is on your instance and how large the disk is. It could cause web server timeout.." %}</p>
<p>{% trans "This may take more than an hour, depending on how much content is on your instance and how large the disk is." %}</p>
<form action="{% url 'instances:snapshot' instance.id %}" class="form-inline" method="post" role="form" aria-label="Create snapshot form"> <form action="{% url 'instances:snapshot' instance.id %}" class="form-inline" method="post" role="form" aria-label="Create snapshot form">
{% csrf_token %} {% csrf_token %}
<div class="form-group row"> <div class="form-group row">
@ -27,16 +26,9 @@
<input type="text" class="form-control form-control-lg" name="name" placeholder="{% trans "Enter Snapshot Name" %}" maxlength="14"> <input type="text" class="form-control form-control-lg" name="name" placeholder="{% trans "Enter Snapshot Name" %}" maxlength="14">
</div> </div>
</div> </div>
{% if instance.status == 5 %} <input type="submit" class="btn btn-lg btn-success float-right" name="snapshot" value="{% trans "Take Snapshot" %}" onclick="showPleaseWaitDialog();">
<input type="submit" class="btn btn-lg btn-success float-right" name="snapshot" value="{% trans "Take Snapshot" %}">
{% else %}
<button class="btn btn-lg btn-success float-right disabled">{% trans "Take Snapshot" %}</button>
{% endif %}
</form> </form>
<div class="clearfix"></div> <div class="clearfix"></div>
{% else %}
<p>{% trans "To take a snapshot please Power Off the instance." %}</p>
{% endif %}
</div> </div>
<div role="tabpanel" class="tab-pane tab-pane-bordered" id="managesnapshot"> <div role="tabpanel" class="tab-pane tab-pane-bordered" id="managesnapshot">
{% if instance.snapshots %} {% if instance.snapshots %}

View file

@ -1063,11 +1063,7 @@ def clone(request, pk):
} }
messages.error(request, msg) messages.error(request, msg)
elif check_instance: elif check_instance:
<<<<<<< HEAD
msg = _("Instance '%(clone_name)s' already exists!") % {"clone_name": clone_data["name"]} msg = _("Instance '%(clone_name)s' already exists!") % {"clone_name": clone_data["name"]}
=======
msg = _("Instance '%(clone_name)s' already exists!") % {'clone_name': clone_data['name']}
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
messages.error(request, msg) messages.error(request, msg)
elif not re.match(r"^[a-zA-Z0-9-]+$", clone_data["name"]): elif not re.match(r"^[a-zA-Z0-9-]+$", clone_data["name"]):
msg = _("Instance name '%(clone_name)s' contains invalid characters!") % {"clone_name": clone_data["name"]} msg = _("Instance name '%(clone_name)s' contains invalid characters!") % {"clone_name": clone_data["name"]}

File diff suppressed because one or more lines are too long