diff --git a/README.md b/README.md index 637fef2..54f826f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ How to update gstfsd daemon on hypervisor: ```bash -wget -O - https://clck.ru/9VMRH | sudo tee -a /usr/local/bin/gstfsd +wget -O - https://bit.ly/2NAaWXG | sudo tee -a /usr/local/bin/gstfsd sudo service supervisor restart ``` @@ -86,7 +86,7 @@ sudo service supervisor restart Setup libvirt and KVM on server ```bash -wget -O - https://clck.ru/9V9fH | sudo sh +wget -O - https://bit.ly/36baWUu | sudo sh ``` Done!! diff --git a/computes/utils.py b/computes/utils.py index 351c5ff..05feb03 100644 --- a/computes/utils.py +++ b/computes/utils.py @@ -4,8 +4,10 @@ from instances.models import Instance def refresh_instance_database(compute): domains = compute.proxy.wvm.listAllDomains() domain_names = [d.name() for d in domains] + domain_uuids = [d.UUIDString() for d in domains] # Delete instances that're not on host from DB Instance.objects.filter(compute=compute).exclude(name__in=domain_names).delete() + Instance.objects.filter(compute=compute).exclude(uuid__in=domain_uuids).delete() # Create instances that're on host but not in DB names = Instance.objects.filter(compute=compute).values_list('name', flat=True) for domain in domains: diff --git a/conf/requirements.txt b/conf/requirements.txt index bbc4cc8..18b63c2 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,14 +1,13 @@ -Django==2.2.17 +Django==2.2.19 django-bootstrap4==2.3.1 -django-icons==2.2.0 +django-icons==2.2.1 django-login-required-middleware==0.5.0 django-otp==1.0.2 django-qr-code==1.3.1 gunicorn==20.0.4 -importlib-metadata==2.0.0 libsass==0.20.1 -libvirt-python==6.9.0 -lxml==4.6.1 +libvirt-python==7.1.0 +lxml==4.6.3 qrcode==6.1 rwlock==0.0.7 websockify==0.9.0 diff --git a/conf/supervisor/gstfsd.conf b/conf/supervisor/gstfsd.conf index 094f41c..71592aa 100644 --- a/conf/supervisor/gstfsd.conf +++ b/conf/supervisor/gstfsd.conf @@ -1,5 +1,5 @@ [program:gstfsd] -command=/srv/webvirtcloud/venv/bin/python3 /usr/local/bin/gstfsd +command=/usr/bin/python3 /usr/local/bin/gstfsd directory=/usr/local/bin user=root autostart=true diff --git a/dev/libvirt-bootstrap.sh b/dev/libvirt-bootstrap.sh index 67ef6e2..e1e1442 100644 --- a/dev/libvirt-bootstrap.sh +++ b/dev/libvirt-bootstrap.sh @@ -45,7 +45,7 @@ echowarn() { # DESCRIPTION: Echo debug information to stdout. #------------------------------------------------------------------------------- echodebug() { - if [ "$_ECHO_DEBUG" -eq "$BS_TRUE" ]; then + if [ $_ECHO_DEBUG -eq $BS_TRUE ]; then printf "${BC} * DEBUG${EC}: %s\n" "$@"; fi } @@ -342,7 +342,7 @@ __check_end_of_life_versions() { ;; centos) - # CentOS versions lower than 5 are no longer supported + # CentOS versions lower than 6 are no longer supported if { [ "$DISTRO_MAJOR_VERSION" -eq 6 ] && [ "$DISTRO_MINOR_VERSION" -lt 3 ]; } || [ "$DISTRO_MAJOR_VERSION" -lt 5 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" @@ -374,26 +374,32 @@ __check_end_of_life_versions # CentOS Install Functions # install_centos() { - if [ "$DISTRO_MAJOR_VERSION" -ge 6 ]; then - yum -y install qemu-kvm libvirt bridge-utils python-libguestfs libguestfs-tools supervisor cyrus-sasl-md5 epel-release || return 1 + yum -y install epel-release || return 1 + + if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then + yum -y install qemu-kvm libvirt bridge-utils python-libguestfs libguestfs-tools supervisor cyrus-sasl-md5 || return 1 + else + yum -y install qemu-kvm libvirt python3-libguestfs libguestfs-tools cyrus-sasl-md5 supervisor || return 1 fi return 0 } install_centos_post() { - if [ -f /etc/sysconfig/libvirtd ]; then - sed -i 's/#LIBVIRTD_ARGS/LIBVIRTD_ARGS/g' /etc/sysconfig/libvirtd - else - echoerror "/etc/sysconfig/libvirtd not found. Exiting..." - exit 1 - fi - if [ -f /etc/libvirt/libvirtd.conf ]; then - sed -i 's/#listen_tls/listen_tls/g' /etc/libvirt/libvirtd.conf - sed -i 's/#listen_tcp/listen_tcp/g' /etc/libvirt/libvirtd.conf - sed -i 's/#auth_tcp/auth_tcp/g' /etc/libvirt/libvirtd.conf - else - echoerror "/etc/libvirt/libvirtd.conf not found. Exiting..." - exit 1 + if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then + if [ -f /etc/sysconfig/libvirtd ]; then + sed -i 's/#LIBVIRTD_ARGS/LIBVIRTD_ARGS/g' /etc/sysconfig/libvirtd + else + echoerror "/etc/sysconfig/libvirtd not found. Exiting..." + exit 1 + fi + if [ -f /etc/libvirt/libvirtd.conf ]; then + sed -i 's/#listen_tls/listen_tls/g' /etc/libvirt/libvirtd.conf + sed -i 's/#listen_tcp/listen_tcp/g' /etc/libvirt/libvirtd.conf + sed -i 's/#auth_tcp/auth_tcp/g' /etc/libvirt/libvirtd.conf + else + echoerror "/etc/libvirt/libvirtd.conf not found. Exiting..." + exit 1 + fi fi if [ -f /etc/libvirt/qemu.conf ]; then sed -i 's/#[ ]*vnc_listen.*/vnc_listen = "0.0.0.0"/g' /etc/libvirt/qemu.conf @@ -440,14 +446,24 @@ daemons_running_centos() { service libvirt-guests stop > /dev/null 2>&1 service libvirt-guests start fi - if [ -f /usr/lib/systemd/system/libvirtd.service ]; then - systemctl stop libvirtd.service > /dev/null 2>&1 - systemctl start libvirtd.service + + if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then + if [ -f /usr/lib/systemd/system/libvirtd.service ]; then + systemctl stop libvirtd.service > /dev/null 2>&1 + systemctl start libvirtd.service + fi + else + if [ -f /usr/lib/systemd/system/libvirtd-tcp.socket ]; then + systemctl stop libvirtd-tcp.socket > /dev/null 2>&1 + systemctl start libvirtd-tcp.socket + fi fi + if [ -f /usr/lib/systemd/system/libvirt-guests.service ]; then systemctl stop libvirt-guests.service > /dev/null 2>&1 systemctl start libvirt-guests.service fi + if [ -f /etc/init.d/supervisord ]; then service supervisord stop > /dev/null 2>&1 service supervisord start @@ -599,7 +615,6 @@ install_ubuntu() { apt install -y qemu-kvm libvirt-bin bridge-utils virt-manager sasl2-bin python3-guestfs supervisor || return 1 fi - return 0 } diff --git a/dev/requirements.txt b/dev/requirements.txt index 0cb3e52..39d5cbf 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,7 +1,7 @@ -r ../conf/requirements.txt -coverage==5.3 -django-debug-toolbar==3.1.1 -pycodestyle==2.6.0 -pyflakes==2.2.0 -pylint==2.6.0 -yapf==0.30.0 +coverage==5.5 +django-debug-toolbar==3.2 +pycodestyle==2.7.0 +pyflakes==2.3.1 +pylint==2.7.2 +yapf==0.31.0 diff --git a/dev/scss/bootstrap/_breadcrumb.scss b/dev/scss/bootstrap/_breadcrumb.scss index a0cf7e2..9c204c7 100644 --- a/dev/scss/bootstrap/_breadcrumb.scss +++ b/dev/scss/bootstrap/_breadcrumb.scss @@ -10,14 +10,12 @@ } .breadcrumb-item { - display: flex; - // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item { padding-left: $breadcrumb-item-padding; &::before { - display: inline-block; // Suppress underlining of the separator in modern browsers + float: left; // Suppress inline spacings and underlining of the separator padding-right: $breadcrumb-item-padding; color: $breadcrumb-divider-color; content: escape-svg($breadcrumb-divider); diff --git a/dev/scss/bootstrap/_carousel.scss b/dev/scss/bootstrap/_carousel.scss index fb5e9f8..db30bed 100644 --- a/dev/scss/bootstrap/_carousel.scss +++ b/dev/scss/bootstrap/_carousel.scss @@ -127,7 +127,7 @@ display: inline-block; width: $carousel-control-icon-width; height: $carousel-control-icon-width; - background: no-repeat 50% / 100% 100%; + background: 50% / 100% 100% no-repeat; } .carousel-control-prev-icon { background-image: escape-svg($carousel-control-prev-icon-bg); diff --git a/dev/scss/bootstrap/_custom-forms.scss b/dev/scss/bootstrap/_custom-forms.scss index 0057b33..06725ff 100644 --- a/dev/scss/bootstrap/_custom-forms.scss +++ b/dev/scss/bootstrap/_custom-forms.scss @@ -104,7 +104,7 @@ width: $custom-control-indicator-size; height: $custom-control-indicator-size; content: ""; - background: no-repeat 50% / #{$custom-control-indicator-bg-size}; + background: 50% / #{$custom-control-indicator-bg-size} no-repeat; } } @@ -315,6 +315,7 @@ width: 100%; height: $custom-file-height; margin: 0; + overflow: hidden; opacity: 0; &:focus ~ .custom-file-label { @@ -347,6 +348,7 @@ z-index: 1; height: $custom-file-height; padding: $custom-file-padding-y $custom-file-padding-x; + overflow: hidden; font-family: $custom-file-font-family; font-weight: $custom-file-font-weight; line-height: $custom-file-line-height; @@ -388,7 +390,7 @@ appearance: none; &:focus { - outline: none; + outline: 0; // Pseudo-elements must be split across multiple rulesets to have an effect. // No box-shadow() mixin for focus accessibility. diff --git a/dev/scss/bootstrap/_dropdown.scss b/dev/scss/bootstrap/_dropdown.scss index a8aaa58..f39de11 100644 --- a/dev/scss/bootstrap/_dropdown.scss +++ b/dev/scss/bootstrap/_dropdown.scss @@ -100,7 +100,7 @@ } } -// When enabled Popper.js, reset basic dropdown position +// When Popper is enabled, reset the basic dropdown position // stylelint-disable-next-line no-duplicate-selectors .dropdown-menu { &[x-placement^="top"], diff --git a/dev/scss/bootstrap/_input-group.scss b/dev/scss/bootstrap/_input-group.scss index cad8ea3..d72ebea 100644 --- a/dev/scss/bootstrap/_input-group.scss +++ b/dev/scss/bootstrap/_input-group.scss @@ -42,7 +42,6 @@ > .form-control, > .custom-select { - &:not(:last-child) { @include border-right-radius(0); } &:not(:first-child) { @include border-left-radius(0); } } @@ -53,9 +52,24 @@ align-items: center; &:not(:last-child) .custom-file-label, - &:not(:last-child) .custom-file-label::after { @include border-right-radius(0); } &:not(:first-child) .custom-file-label { @include border-left-radius(0); } } + + &:not(.has-validation) { + > .form-control:not(:last-child), + > .custom-select:not(:last-child), + > .custom-file:not(:last-child) .custom-file-label::after { + @include border-right-radius(0); + } + } + + &.has-validation { + > .form-control:nth-last-child(n + 3), + > .custom-select:nth-last-child(n + 3), + > .custom-file:nth-last-child(n + 3) .custom-file-label::after { + @include border-right-radius(0); + } + } } @@ -175,8 +189,10 @@ .input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .input-group-text, -.input-group > .input-group-append:not(:last-child) > .btn, -.input-group > .input-group-append:not(:last-child) > .input-group-text, +.input-group:not(.has-validation) > .input-group-append:not(:last-child) > .btn, +.input-group:not(.has-validation) > .input-group-append:not(:last-child) > .input-group-text, +.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .btn, +.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .input-group-text, .input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { @include border-right-radius(0); diff --git a/dev/scss/bootstrap/_nav.scss b/dev/scss/bootstrap/_nav.scss index d866c98..fad684e 100644 --- a/dev/scss/bootstrap/_nav.scss +++ b/dev/scss/bootstrap/_nav.scss @@ -35,11 +35,8 @@ .nav-tabs { border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color; - .nav-item { - margin-bottom: -$nav-tabs-border-width; - } - .nav-link { + margin-bottom: -$nav-tabs-border-width; border: $nav-tabs-border-width solid transparent; @include border-top-radius($nav-tabs-border-radius); diff --git a/dev/scss/bootstrap/_navbar.scss b/dev/scss/bootstrap/_navbar.scss index 5f10a62..cf5b667 100644 --- a/dev/scss/bootstrap/_navbar.scss +++ b/dev/scss/bootstrap/_navbar.scss @@ -136,8 +136,12 @@ height: 1.5em; vertical-align: middle; content: ""; - background: no-repeat center center; - background-size: 100% 100%; + background: 50% / 100% 100% no-repeat; +} + +.navbar-nav-scroll { + max-height: $navbar-nav-scroll-max-height; + overflow-y: auto; } // Generate series of `.navbar-expand-*` responsive classes for configuring @@ -199,6 +203,10 @@ } } + .navbar-nav-scroll { + overflow: visible; + } + .navbar-collapse { display: flex !important; // stylelint-disable-line declaration-no-important diff --git a/dev/scss/bootstrap/_pagination.scss b/dev/scss/bootstrap/_pagination.scss index d7d553c..9313cc5 100644 --- a/dev/scss/bootstrap/_pagination.scss +++ b/dev/scss/bootstrap/_pagination.scss @@ -66,9 +66,9 @@ // .pagination-lg { - @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $line-height-lg, $border-radius-lg); + @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $line-height-lg, $pagination-border-radius-lg); } .pagination-sm { - @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $line-height-sm, $border-radius-sm); + @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $line-height-sm, $pagination-border-radius-sm); } diff --git a/dev/scss/bootstrap/_progress.scss b/dev/scss/bootstrap/_progress.scss index 1a03704..e206474 100644 --- a/dev/scss/bootstrap/_progress.scss +++ b/dev/scss/bootstrap/_progress.scss @@ -36,7 +36,7 @@ @if $enable-transitions { .progress-bar-animated { - animation: progress-bar-stripes $progress-bar-animation-timing; + animation: $progress-bar-animation-timing progress-bar-stripes; @if $enable-prefers-reduced-motion-media-query { @media (prefers-reduced-motion: reduce) { diff --git a/dev/scss/bootstrap/_reboot.scss b/dev/scss/bootstrap/_reboot.scss index 6f73466..cd93bfe 100644 --- a/dev/scss/bootstrap/_reboot.scss +++ b/dev/scss/bootstrap/_reboot.scss @@ -1,4 +1,4 @@ -// stylelint-disable at-rule-no-vendor-prefix, declaration-no-important, selector-no-qualifying-type, property-no-vendor-prefix +// stylelint-disable declaration-no-important, selector-no-qualifying-type, property-no-vendor-prefix // Reboot // @@ -307,13 +307,13 @@ button { border-radius: 0; } -// Work around a Firefox/IE bug where the transparent `button` background -// results in a loss of the default `button` focus styles. -// -// Credit: https://github.com/suitcss/base/ -button:focus { - outline: 1px dotted; - outline: 5px auto -webkit-focus-ring-color; +// Explicitly remove focus outline in Chromium when it shouldn't be +// visible (e.g. as result of mouse click or touch tap). It already +// should be doing this automatically, but seems to currently be +// confused and applies its very visible two-tone outline anyway. + +button:focus:not(:focus-visible) { + outline: 0; } input, diff --git a/dev/scss/bootstrap/_root.scss b/dev/scss/bootstrap/_root.scss index 8110030..ad550df 100644 --- a/dev/scss/bootstrap/_root.scss +++ b/dev/scss/bootstrap/_root.scss @@ -1,4 +1,3 @@ -// Do not forget to update getting-started/theming.md! :root { // Custom variable values only support SassScript inside `#{}`. @each $color, $value in $colors { diff --git a/dev/scss/bootstrap/_spinners.scss b/dev/scss/bootstrap/_spinners.scss index 146c820..7d8fba7 100644 --- a/dev/scss/bootstrap/_spinners.scss +++ b/dev/scss/bootstrap/_spinners.scss @@ -15,7 +15,7 @@ border-right-color: transparent; // stylelint-disable-next-line property-disallowed-list border-radius: 50%; - animation: spinner-border .75s linear infinite; + animation: .75s linear infinite spinner-border; } .spinner-border-sm { @@ -47,10 +47,19 @@ // stylelint-disable-next-line property-disallowed-list border-radius: 50%; opacity: 0; - animation: spinner-grow .75s linear infinite; + animation: .75s linear infinite spinner-grow; } .spinner-grow-sm { width: $spinner-width-sm; height: $spinner-height-sm; } + +@if $enable-prefers-reduced-motion-media-query { + @media (prefers-reduced-motion: reduce) { + .spinner-border, + .spinner-grow { + animation-duration: 1.5s; + } + } +} diff --git a/dev/scss/bootstrap/_type.scss b/dev/scss/bootstrap/_type.scss index 43dde7d..3112a73 100644 --- a/dev/scss/bootstrap/_type.scss +++ b/dev/scss/bootstrap/_type.scss @@ -1,4 +1,4 @@ -// stylelint-disable declaration-no-important, selector-list-comma-newline-after +// stylelint-disable selector-list-comma-newline-after // // Headings diff --git a/dev/scss/bootstrap/_variables.scss b/dev/scss/bootstrap/_variables.scss index d7171e5..a24e691 100644 --- a/dev/scss/bootstrap/_variables.scss +++ b/dev/scss/bootstrap/_variables.scss @@ -274,7 +274,7 @@ $embed-responsive-aspect-ratios: join( // Font, line-height, and color for body text, headings, and more. // 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", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; // stylelint-enable value-keyword-case @@ -583,7 +583,7 @@ $custom-select-disabled-bg: $gray-200 !default; $custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions $custom-select-indicator-color: $gray-800 !default; $custom-select-indicator: url("data:image/svg+xml,") !default; -$custom-select-background: escape-svg($custom-select-indicator) no-repeat right $custom-select-padding-x center / $custom-select-bg-size !default; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +$custom-select-background: escape-svg($custom-select-indicator) right $custom-select-padding-x center / $custom-select-bg-size no-repeat !default; // Used so we can have multiple background elements (e.g., arrow and feedback icon) $custom-select-feedback-icon-padding-right: add(1em * .75, (2 * $custom-select-padding-y * .75) + $custom-select-padding-x + $custom-select-indicator-padding) !default; $custom-select-feedback-icon-position: center right ($custom-select-padding-x + $custom-select-indicator-padding) !default; @@ -694,7 +694,7 @@ $zindex-tooltip: 1070 !default; // Navs $nav-link-padding-y: .5rem !default; -$nav-link-padding-x: 1rem !default; +$nav-link-padding-x: 1.25rem !default; $nav-link-disabled-color: $gray-600 !default; $nav-tabs-border-color: $gray-300 !default; @@ -731,6 +731,8 @@ $navbar-toggler-padding-x: .75rem !default; $navbar-toggler-font-size: $font-size-lg !default; $navbar-toggler-border-radius: $btn-border-radius !default; +$navbar-nav-scroll-max-height: 75vh !default; + $navbar-dark-color: rgba($white, .5) !default; $navbar-dark-hover-color: rgba($white, .75) !default; $navbar-dark-active-color: $white !default; @@ -772,12 +774,12 @@ $dropdown-box-shadow: 0 .5rem 1rem rgba($black, .175) !default; $dropdown-link-color: $gray-900 !default; $dropdown-link-hover-color: darken($gray-900, 5%) !default; -$dropdown-link-hover-bg: $gray-100 !default; +$dropdown-link-hover-bg: $gray-200 !default; $dropdown-link-active-color: $component-active-color !default; $dropdown-link-active-bg: $component-active-bg !default; -$dropdown-link-disabled-color: $gray-600 !default; +$dropdown-link-disabled-color: $gray-500 !default; $dropdown-item-padding-y: .25rem !default; $dropdown-item-padding-x: 1.5rem !default; @@ -816,6 +818,8 @@ $pagination-disabled-color: $gray-600 !default; $pagination-disabled-bg: $white !default; $pagination-disabled-border-color: $gray-300 !default; +$pagination-border-radius-sm: $border-radius-sm !default; +$pagination-border-radius-lg: $border-radius-lg !default; // Jumbotron @@ -1054,7 +1058,7 @@ $figure-caption-color: $gray-600 !default; $breadcrumb-font-size: null !default; $breadcrumb-padding-y: .75rem !default; -$breadcrumb-padding-x: 1rem !default; +$breadcrumb-padding-x: .5rem !default; $breadcrumb-item-padding: .5rem !default; $breadcrumb-margin-bottom: 1rem !default; diff --git a/dev/scss/bootstrap/bootstrap-grid.scss b/dev/scss/bootstrap/bootstrap-grid.scss index a5cf3b7..6a66483 100644 --- a/dev/scss/bootstrap/bootstrap-grid.scss +++ b/dev/scss/bootstrap/bootstrap-grid.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap Grid v4.5.3 (https://getbootstrap.com/) - * Copyright 2011-2020 The Bootstrap Authors - * Copyright 2011-2020 Twitter, Inc. + * Bootstrap Grid v4.6.0 (https://getbootstrap.com/) + * Copyright 2011-2021 The Bootstrap Authors + * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ @@ -19,6 +19,7 @@ html { @import "functions"; @import "variables"; +@import "mixins/deprecate"; @import "mixins/breakpoints"; @import "mixins/grid-framework"; @import "mixins/grid"; diff --git a/dev/scss/bootstrap/bootstrap-reboot.scss b/dev/scss/bootstrap/bootstrap-reboot.scss index de63f52..2b6cfc2 100644 --- a/dev/scss/bootstrap/bootstrap-reboot.scss +++ b/dev/scss/bootstrap/bootstrap-reboot.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap Reboot v4.5.3 (https://getbootstrap.com/) - * Copyright 2011-2020 The Bootstrap Authors - * Copyright 2011-2020 Twitter, Inc. + * Bootstrap Reboot v4.6.0 (https://getbootstrap.com/) + * Copyright 2011-2021 The Bootstrap Authors + * Copyright 2011-2021 Twitter, Inc. * 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) */ diff --git a/dev/scss/bootstrap/bootstrap.scss b/dev/scss/bootstrap/bootstrap.scss index 0a20655..e86c49d 100644 --- a/dev/scss/bootstrap/bootstrap.scss +++ b/dev/scss/bootstrap/bootstrap.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap v4.5.3 (https://getbootstrap.com/) - * Copyright 2011-2020 The Bootstrap Authors - * Copyright 2011-2020 Twitter, Inc. + * Bootstrap v4.6.0 (https://getbootstrap.com/) + * Copyright 2011-2021 The Bootstrap Authors + * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ diff --git a/dev/scss/bootstrap/mixins/_forms.scss b/dev/scss/bootstrap/mixins/_forms.scss index 39b52f3..a321630 100644 --- a/dev/scss/bootstrap/mixins/_forms.scss +++ b/dev/scss/bootstrap/mixins/_forms.scss @@ -64,6 +64,13 @@ color: color-yiq($color); background-color: rgba($color, $form-feedback-tooltip-opacity); @include border-radius($form-feedback-tooltip-border-radius); + + // See https://github.com/twbs/bootstrap/pull/31557 + // Align tooltip to form elements + .form-row > .col > &, + .form-row > [class*="col-"] > & { + left: $form-grid-gutter-width / 2; + } } @include form-validation-state-selector($state) { @@ -108,7 +115,7 @@ @if $enable-validation-icons { padding-right: $custom-select-feedback-icon-padding-right; - background: $custom-select-background, escape-svg($icon) $custom-select-bg no-repeat $custom-select-feedback-icon-position / $custom-select-feedback-icon-size; + background: $custom-select-background, $custom-select-bg escape-svg($icon) $custom-select-feedback-icon-position / $custom-select-feedback-icon-size no-repeat; } &:focus { diff --git a/dev/scss/bootstrap/mixins/_image.scss b/dev/scss/bootstrap/mixins/_image.scss index c971e03..3aaa0d7 100644 --- a/dev/scss/bootstrap/mixins/_image.scss +++ b/dev/scss/bootstrap/mixins/_image.scss @@ -26,7 +26,7 @@ // Autoprefixer takes care of adding -webkit-min-device-pixel-ratio and -o-min-device-pixel-ratio, // but doesn't convert dppx=>dpi. // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard. - // Compatibility info: https://caniuse.com/#feat=css-media-resolution + // Compatibility info: https://caniuse.com/css-media-resolution @media only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx only screen and (min-resolution: 2dppx) { // Standardized background-image: url($file-2x); diff --git a/dev/scss/wvc-main.scss b/dev/scss/wvc-main.scss index b85716f..41cf796 100644 --- a/dev/scss/wvc-main.scss +++ b/dev/scss/wvc-main.scss @@ -1,3 +1,3 @@ -@import 'dev/scss/wvc-theme/flatly/variables'; -@import 'dev/scss/bootstrap-overrides.scss'; -@import 'dev/scss/wvc-theme/flatly/bootswatch'; +@import 'dev/scss//wvc-theme/flatly/variables'; +@import 'dev/scss//bootstrap-overrides.scss'; +@import 'dev/scss//wvc-theme/flatly/bootswatch'; diff --git a/dev/scss/wvc-theme/cerulean/_bootswatch.scss b/dev/scss/wvc-theme/cerulean/_bootswatch.scss index 7a9e3ef..dd70824 100755 --- a/dev/scss/wvc-theme/cerulean/_bootswatch.scss +++ b/dev/scss/wvc-theme/cerulean/_bootswatch.scss @@ -1,4 +1,4 @@ -// Cerulean 4.5.3 +// Cerulean 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/cerulean/_variables.scss b/dev/scss/wvc-theme/cerulean/_variables.scss index 494c672..6f23f67 100755 --- a/dev/scss/wvc-theme/cerulean/_variables.scss +++ b/dev/scss/wvc-theme/cerulean/_variables.scss @@ -1,4 +1,4 @@ -// Cerulean 4.5.3 +// Cerulean 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/cosmo/_bootswatch.scss b/dev/scss/wvc-theme/cosmo/_bootswatch.scss index 1d2c826..7905796 100755 --- a/dev/scss/wvc-theme/cosmo/_bootswatch.scss +++ b/dev/scss/wvc-theme/cosmo/_bootswatch.scss @@ -1,4 +1,4 @@ -// Cosmo 4.5.3 +// Cosmo 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/cosmo/_variables.scss b/dev/scss/wvc-theme/cosmo/_variables.scss index 755ca40..60d9d92 100755 --- a/dev/scss/wvc-theme/cosmo/_variables.scss +++ b/dev/scss/wvc-theme/cosmo/_variables.scss @@ -1,4 +1,4 @@ -// Cosmo 4.5.3 +// Cosmo 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/cyborg/_bootswatch.scss b/dev/scss/wvc-theme/cyborg/_bootswatch.scss index 63f304e..b1e064d 100755 --- a/dev/scss/wvc-theme/cyborg/_bootswatch.scss +++ b/dev/scss/wvc-theme/cyborg/_bootswatch.scss @@ -1,4 +1,4 @@ -// Cyborg 4.5.3 +// Cyborg 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/cyborg/_variables.scss b/dev/scss/wvc-theme/cyborg/_variables.scss index 85c7483..3f39d9d 100755 --- a/dev/scss/wvc-theme/cyborg/_variables.scss +++ b/dev/scss/wvc-theme/cyborg/_variables.scss @@ -1,4 +1,4 @@ -// Cyborg 4.5.3 +// Cyborg 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/darkly/_bootswatch.scss b/dev/scss/wvc-theme/darkly/_bootswatch.scss index 589ecc7..0f9e36e 100755 --- a/dev/scss/wvc-theme/darkly/_bootswatch.scss +++ b/dev/scss/wvc-theme/darkly/_bootswatch.scss @@ -1,4 +1,4 @@ -// Darkly 4.5.3 +// Darkly 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/darkly/_variables.scss b/dev/scss/wvc-theme/darkly/_variables.scss index 535a775..c16c0e0 100755 --- a/dev/scss/wvc-theme/darkly/_variables.scss +++ b/dev/scss/wvc-theme/darkly/_variables.scss @@ -1,4 +1,4 @@ -// Darkly 4.5.3 +// Darkly 4.6.0 // Bootswatch // @@ -83,7 +83,7 @@ $dropdown-link-hover-bg: $primary !default; // Navs -$nav-link-padding-x: 1.5rem !default; +$nav-link-padding-x: 1.25rem !default; $nav-link-disabled-color: $gray-500 !default; $nav-tabs-border-color: $gray-700 !default; $nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color transparent !default; diff --git a/dev/scss/wvc-theme/flatly/_bootswatch.scss b/dev/scss/wvc-theme/flatly/_bootswatch.scss index 4da7e85..661e506 100755 --- a/dev/scss/wvc-theme/flatly/_bootswatch.scss +++ b/dev/scss/wvc-theme/flatly/_bootswatch.scss @@ -1,4 +1,4 @@ -// Flatly 4.5.3 +// Flatly 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/flatly/_variables.scss b/dev/scss/wvc-theme/flatly/_variables.scss index 158cdfc..2515acd 100755 --- a/dev/scss/wvc-theme/flatly/_variables.scss +++ b/dev/scss/wvc-theme/flatly/_variables.scss @@ -1,4 +1,4 @@ -// Flatly 4.5.3 +// Flatly 4.6.0 // Bootswatch // @@ -66,7 +66,7 @@ $dropdown-link-hover-bg: $primary !default; // Navs $nav-link-padding-y: .5rem !default !default; -$nav-link-padding-x: 1.5rem !default; +$nav-link-padding-x: 1.25rem !default; $nav-link-disabled-color: $gray-600 !default !default; $nav-tabs-border-color: $gray-200 !default; diff --git a/dev/scss/wvc-theme/journal/_bootswatch.scss b/dev/scss/wvc-theme/journal/_bootswatch.scss index b56a5b4..90dcbda 100755 --- a/dev/scss/wvc-theme/journal/_bootswatch.scss +++ b/dev/scss/wvc-theme/journal/_bootswatch.scss @@ -1,4 +1,4 @@ -// Journal 4.5.3 +// Journal 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/journal/_variables.scss b/dev/scss/wvc-theme/journal/_variables.scss index 91ffca4..4c07db3 100755 --- a/dev/scss/wvc-theme/journal/_variables.scss +++ b/dev/scss/wvc-theme/journal/_variables.scss @@ -1,4 +1,4 @@ -// Journal 4.5.3 +// Journal 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/litera/_bootswatch.scss b/dev/scss/wvc-theme/litera/_bootswatch.scss index 757bd4f..5f96498 100755 --- a/dev/scss/wvc-theme/litera/_bootswatch.scss +++ b/dev/scss/wvc-theme/litera/_bootswatch.scss @@ -1,4 +1,4 @@ -// Litera 4.5.3 +// Litera 4.6.0 // Bootswatch // Navbar ====================================================================== @@ -24,20 +24,6 @@ } } -// Buttons ===================================================================== - -.btn { - border-radius: 1.078em; - - &-lg { - border-radius: 2.688em; - } - - &-sm { - border-radius: .844em; - } -} - // Typography ================================================================== p { diff --git a/dev/scss/wvc-theme/litera/_variables.scss b/dev/scss/wvc-theme/litera/_variables.scss index 921bec7..1d35e66 100755 --- a/dev/scss/wvc-theme/litera/_variables.scss +++ b/dev/scss/wvc-theme/litera/_variables.scss @@ -1,4 +1,4 @@ -// Litera 4.5.3 +// Litera 4.6.0 // Bootswatch // @@ -65,15 +65,17 @@ $btn-font-family: $font-family-sans-serif !default; $btn-font-size: .875rem !default; $btn-font-size-sm: .688rem !default; +$btn-border-radius: 1.078em !default; +$btn-border-radius-lg: 2.688em !default; +$btn-border-radius-sm: .844em !default; + // Forms -$input-border-color: rgba(0, 0, 0, .1) !default; -$input-group-addon-bg: $gray-200 !default !default; +$input-border-color: rgba(0, 0, 0, .1) !default; +$input-group-addon-bg: $gray-200 !default !default; // Navbar -$navbar-padding-y: .7rem !default; - $navbar-dark-color: rgba($white, .6) !default; $navbar-dark-hover-color: $white !default; $navbar-light-hover-color: $body-color !default; @@ -86,8 +88,8 @@ $tooltip-font-size: 11px !default; // Badges $badge-font-weight: 400 !default; -$badge-padding-y: .3em !default; -$badge-padding-x: .6em !default; +$badge-padding-y: .6em !default; +$badge-padding-x: 1.2em !default; // Alerts diff --git a/dev/scss/wvc-theme/lumen/_bootswatch.scss b/dev/scss/wvc-theme/lumen/_bootswatch.scss index e25c582..4441748 100755 --- a/dev/scss/wvc-theme/lumen/_bootswatch.scss +++ b/dev/scss/wvc-theme/lumen/_bootswatch.scss @@ -1,4 +1,4 @@ -// Lumen 4.5.3 +// Lumen 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/lumen/_variables.scss b/dev/scss/wvc-theme/lumen/_variables.scss index 0856dbb..bad7ea1 100755 --- a/dev/scss/wvc-theme/lumen/_variables.scss +++ b/dev/scss/wvc-theme/lumen/_variables.scss @@ -1,4 +1,4 @@ -// Lumen 4.5.3 +// Lumen 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/lux/_bootswatch.scss b/dev/scss/wvc-theme/lux/_bootswatch.scss index f1a5970..adeff53 100755 --- a/dev/scss/wvc-theme/lux/_bootswatch.scss +++ b/dev/scss/wvc-theme/lux/_bootswatch.scss @@ -1,4 +1,4 @@ -// Lux 4.5.3 +// Lux 4.6.0 // Bootswatch @@ -22,7 +22,7 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;6 } &-brand { - margin-right: 1rem; + margin-right: 2rem; } } @@ -43,7 +43,7 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;6 } .nav-item { - margin-right: 1rem; + margin-right: .5rem; } // Buttons ===================================================================== diff --git a/dev/scss/wvc-theme/lux/_variables.scss b/dev/scss/wvc-theme/lux/_variables.scss index 3d025f6..10c61c5 100755 --- a/dev/scss/wvc-theme/lux/_variables.scss +++ b/dev/scss/wvc-theme/lux/_variables.scss @@ -1,4 +1,4 @@ -// Lux 4.5.3 +// Lux 4.6.0 // Bootswatch // @@ -72,12 +72,12 @@ $input-btn-border-width: 0 !default; // Buttons $btn-line-height: 1.5rem !default; -$input-btn-padding-y: .6rem !default; -$input-btn-padding-x: 1.2rem !default; -$input-btn-padding-y-sm: .4rem !default; -$input-btn-padding-x-sm: .8rem !default; -$input-btn-padding-y-lg: 2rem !default; -$input-btn-padding-x-lg: 2rem !default; +$input-btn-padding-y: .5rem !default; +$input-btn-padding-x: 1rem !default; +$input-btn-padding-y-sm: .25rem !default; +$input-btn-padding-x-sm: .75rem !default; +$input-btn-padding-y-lg: 1rem !default; +$input-btn-padding-x-lg: 1rem !default; $btn-font-weight: 600 !default; // Forms @@ -95,6 +95,7 @@ $navbar-light-color: rgba($black, .3) !default; $navbar-light-hover-color: $gray-900 !default; $navbar-light-active-color: $gray-900 !default; + // Pagination $pagination-border-color: transparent !default; diff --git a/dev/scss/wvc-theme/materia/_bootswatch.scss b/dev/scss/wvc-theme/materia/_bootswatch.scss index 57e64c5..27e0af0 100755 --- a/dev/scss/wvc-theme/materia/_bootswatch.scss +++ b/dev/scss/wvc-theme/materia/_bootswatch.scss @@ -1,4 +1,4 @@ -// Materia 4.5.3 +// Materia 4.6.0 // Bootswatch @@ -287,7 +287,7 @@ select, select.form-control { appearance: none; padding: .5rem 0; - 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-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: 8px 4px; background-repeat: no-repeat; background-position: right center; @@ -309,7 +309,7 @@ select.form-control { &:focus { box-shadow: inset 0 -2px 0 $primary; - 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"); + 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] { diff --git a/dev/scss/wvc-theme/materia/_variables.scss b/dev/scss/wvc-theme/materia/_variables.scss index dc1b45b..6b03652 100755 --- a/dev/scss/wvc-theme/materia/_variables.scss +++ b/dev/scss/wvc-theme/materia/_variables.scss @@ -1,4 +1,4 @@ -// Materia 4.5.3 +// Materia 4.6.0 // Bootswatch // @@ -54,12 +54,12 @@ $font-weight-base: 400 !default; // Buttons -$input-btn-padding-y: .8rem !default; +$input-btn-padding-y: .5rem !default; $input-btn-padding-x: 1rem !default; // Forms -$input-padding-y: 1rem !default; +$input-padding-y: .5rem !default; $input-padding-x: 0 !default; $input-padding-y-sm: 0 !default; $input-padding-x-sm: 0 !default; diff --git a/dev/scss/wvc-theme/minty/_bootswatch.scss b/dev/scss/wvc-theme/minty/_bootswatch.scss index 8a4c6bf..e170d41 100755 --- a/dev/scss/wvc-theme/minty/_bootswatch.scss +++ b/dev/scss/wvc-theme/minty/_bootswatch.scss @@ -1,4 +1,4 @@ -// Minty 4.5.3 +// Minty 4.6.0 // Bootswatch @@ -33,7 +33,7 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Montserrat:wght@400;50 &-light, &-light:hover { - color: $gray-700; + color: $gray-900; } &-link, diff --git a/dev/scss/wvc-theme/minty/_variables.scss b/dev/scss/wvc-theme/minty/_variables.scss index 922478e..a060fa2 100755 --- a/dev/scss/wvc-theme/minty/_variables.scss +++ b/dev/scss/wvc-theme/minty/_variables.scss @@ -1,4 +1,4 @@ -// Minty 4.5.3 +// Minty 4.6.0 // Bootswatch // @@ -34,7 +34,7 @@ $success: $green !default; $info: $cyan !default; $warning: $yellow !default; $danger: $red !default; -$light: $gray-100 !default; +$light: $primary !default; $dark: $gray-800 !default; $yiq-contrasted-threshold: 250 !default; @@ -54,7 +54,6 @@ $border-radius-sm: .3rem !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; -$font-size-base: .875rem !default; // Tables @@ -67,8 +66,6 @@ $dropdown-link-hover-bg: $secondary !default; // Navbar -$navbar-padding-y: .7rem !default; - $navbar-dark-color: rgba($white, .6) !default; $navbar-dark-hover-color: $white !default; $navbar-light-color: rgba($black, .3) !default; diff --git a/dev/scss/wvc-theme/pulse/_bootswatch.scss b/dev/scss/wvc-theme/pulse/_bootswatch.scss index 83a0f7f..160d954 100755 --- a/dev/scss/wvc-theme/pulse/_bootswatch.scss +++ b/dev/scss/wvc-theme/pulse/_bootswatch.scss @@ -1,4 +1,4 @@ -// Pulse 4.5.3 +// Pulse 4.6.0 // Bootswatch // Buttons ===================================================================== diff --git a/dev/scss/wvc-theme/pulse/_variables.scss b/dev/scss/wvc-theme/pulse/_variables.scss index 355dded..3b1afe0 100755 --- a/dev/scss/wvc-theme/pulse/_variables.scss +++ b/dev/scss/wvc-theme/pulse/_variables.scss @@ -1,4 +1,4 @@ -// Pulse 4.5.3 +// Pulse 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/sandstone/_bootswatch.scss b/dev/scss/wvc-theme/sandstone/_bootswatch.scss index a12df79..ff72ae3 100755 --- a/dev/scss/wvc-theme/sandstone/_bootswatch.scss +++ b/dev/scss/wvc-theme/sandstone/_bootswatch.scss @@ -1,4 +1,4 @@ -// Sandstone 4.5.3 +// Sandstone 4.6.0 // Bootswatch @@ -22,7 +22,7 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;70 } .sandstone { - font-size: 11px; + font-size: 12px; line-height: 22px; font-weight: 500; text-transform: uppercase; diff --git a/dev/scss/wvc-theme/sandstone/_variables.scss b/dev/scss/wvc-theme/sandstone/_variables.scss index f37c7f5..06213ff 100755 --- a/dev/scss/wvc-theme/sandstone/_variables.scss +++ b/dev/scss/wvc-theme/sandstone/_variables.scss @@ -1,4 +1,4 @@ -// Sandstone 4.5.3 +// Sandstone 4.6.0 // Bootswatch // @@ -51,7 +51,7 @@ $link-color: $success !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: .875rem !default; +$font-size-base: .975rem !default; $headings-font-weight: 400 !default; // Dropdowns @@ -64,7 +64,7 @@ $dropdown-link-active-bg: $dropdown-link-hover-bg !default; // Navs -$nav-link-padding-x: .9rem !default; +$nav-link-padding-x: 1.25rem !default; $nav-link-disabled-color: $gray-300 !default; $nav-tabs-border-color: $gray-300 !default; $nav-tabs-link-hover-border-color: $gray-300 !default; diff --git a/dev/scss/wvc-theme/simplex/_bootswatch.scss b/dev/scss/wvc-theme/simplex/_bootswatch.scss index 7361da6..0480c56 100755 --- a/dev/scss/wvc-theme/simplex/_bootswatch.scss +++ b/dev/scss/wvc-theme/simplex/_bootswatch.scss @@ -1,4 +1,4 @@ -// Simplex 4.5.3 +// Simplex 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/simplex/_variables.scss b/dev/scss/wvc-theme/simplex/_variables.scss index 3a51209..17e04ce 100755 --- a/dev/scss/wvc-theme/simplex/_variables.scss +++ b/dev/scss/wvc-theme/simplex/_variables.scss @@ -1,4 +1,4 @@ -// Simplex 4.5.3 +// Simplex 4.6.0 // Bootswatch // @@ -54,7 +54,7 @@ $dropdown-link-hover-bg: $primary !default; // Navs -$nav-link-padding-y: .7rem !default; +$nav-link-padding-y: .9rem !default; $nav-link-disabled-color: $gray-400 !default; $nav-tabs-border-color: darken(#fff, 6.5%) !default; diff --git a/dev/scss/wvc-theme/sketchy/_bootswatch.scss b/dev/scss/wvc-theme/sketchy/_bootswatch.scss index 6c8ccc2..acd3ab6 100755 --- a/dev/scss/wvc-theme/sketchy/_bootswatch.scss +++ b/dev/scss/wvc-theme/sketchy/_bootswatch.scss @@ -1,4 +1,4 @@ -// Sketchy 4.5.3 +// Sketchy 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/sketchy/_variables.scss b/dev/scss/wvc-theme/sketchy/_variables.scss index e159662..4b73e8d 100755 --- a/dev/scss/wvc-theme/sketchy/_variables.scss +++ b/dev/scss/wvc-theme/sketchy/_variables.scss @@ -1,4 +1,4 @@ -// Sketchy 4.5.3 +// Sketchy 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/slate/_bootswatch.scss b/dev/scss/wvc-theme/slate/_bootswatch.scss index 8a98f05..f902620 100755 --- a/dev/scss/wvc-theme/slate/_bootswatch.scss +++ b/dev/scss/wvc-theme/slate/_bootswatch.scss @@ -1,4 +1,4 @@ -// Slate 4.5.3 +// Slate 4.6.0 // Bootswatch @@ -525,7 +525,7 @@ legend { } .list-group { - &-item:hover { + &-item-action:hover { background-color: darken($gray-900, 5%); } } diff --git a/dev/scss/wvc-theme/slate/_variables.scss b/dev/scss/wvc-theme/slate/_variables.scss index 2dbdd9b..0565669 100755 --- a/dev/scss/wvc-theme/slate/_variables.scss +++ b/dev/scss/wvc-theme/slate/_variables.scss @@ -1,4 +1,4 @@ -// Slate 4.5.3 +// Slate 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/solar/_bootswatch.scss b/dev/scss/wvc-theme/solar/_bootswatch.scss index fe2b6e3..6ac13e1 100755 --- a/dev/scss/wvc-theme/solar/_bootswatch.scss +++ b/dev/scss/wvc-theme/solar/_bootswatch.scss @@ -1,4 +1,4 @@ -// Solar 4.5.3 +// Solar 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/solar/_variables.scss b/dev/scss/wvc-theme/solar/_variables.scss index e65cc0c..35faa1c 100755 --- a/dev/scss/wvc-theme/solar/_variables.scss +++ b/dev/scss/wvc-theme/solar/_variables.scss @@ -1,4 +1,4 @@ -// Solar 4.5.3 +// Solar 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/spacelab/_bootswatch.scss b/dev/scss/wvc-theme/spacelab/_bootswatch.scss index ba1f005..ef15577 100755 --- a/dev/scss/wvc-theme/spacelab/_bootswatch.scss +++ b/dev/scss/wvc-theme/spacelab/_bootswatch.scss @@ -1,4 +1,4 @@ -// Spacelab 4.5.3 +// Spacelab 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/spacelab/_variables.scss b/dev/scss/wvc-theme/spacelab/_variables.scss index cb2a3d8..9fe2b13 100755 --- a/dev/scss/wvc-theme/spacelab/_variables.scss +++ b/dev/scss/wvc-theme/spacelab/_variables.scss @@ -1,4 +1,4 @@ -// Spacelab 4.5.3 +// Spacelab 4.6.0 // Bootswatch // @@ -51,14 +51,16 @@ $link-color: $info !default; // 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-size-base: .9375rem !default; +$font-size-sm: $font-size-base * .88 !default; +$headings-font-weight: 300 !default; $headings-color: $gray-900 !default; // Navbar +$navbar-padding-y: .7rem !default; $navbar-dark-color: rgba($white, .75) !default; $navbar-dark-hover-color: $white !default; $navbar-light-color: rgba($black, .4) !default; $navbar-light-hover-color: $info !default; $navbar-light-active-color: $info !default; - -$navbar-padding-y: .7rem !default; \ No newline at end of file diff --git a/dev/scss/wvc-theme/superhero/_bootswatch.scss b/dev/scss/wvc-theme/superhero/_bootswatch.scss index 3b85eed..e9c0171 100755 --- a/dev/scss/wvc-theme/superhero/_bootswatch.scss +++ b/dev/scss/wvc-theme/superhero/_bootswatch.scss @@ -1,4 +1,4 @@ -// Superhero 4.5.3 +// Superhero 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/superhero/_variables.scss b/dev/scss/wvc-theme/superhero/_variables.scss index c7c37b8..e6e321c 100755 --- a/dev/scss/wvc-theme/superhero/_variables.scss +++ b/dev/scss/wvc-theme/superhero/_variables.scss @@ -1,4 +1,4 @@ -// Superhero 4.5.3 +// Superhero 4.6.0 // Bootswatch // diff --git a/dev/scss/wvc-theme/united/_bootswatch.scss b/dev/scss/wvc-theme/united/_bootswatch.scss index 1871af8..c2fb83c 100755 --- a/dev/scss/wvc-theme/united/_bootswatch.scss +++ b/dev/scss/wvc-theme/united/_bootswatch.scss @@ -1,4 +1,4 @@ -// United 4.5.3 +// United 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/united/_variables.scss b/dev/scss/wvc-theme/united/_variables.scss index fd73315..32e9953 100755 --- a/dev/scss/wvc-theme/united/_variables.scss +++ b/dev/scss/wvc-theme/united/_variables.scss @@ -1,4 +1,4 @@ -// United 4.5.3 +// United 4.6.0 // Bootswatch // @@ -34,7 +34,7 @@ $success: $green !default; $info: $cyan !default; $warning: $yellow !default; $danger: $red !default; -$light: $gray-200 !default; +$light: $gray-100 !default; $dark: $purple !default; $yiq-contrasted-threshold: 200 !default; @@ -53,6 +53,13 @@ $font-family-sans-serif: Ubuntu, -apple-system, BlinkMacSystemFont, "Segoe $table-dark-bg: $dark !default; $table-dark-border-color: darken($dark, 5%) !default; + // Navbar -$navbar-padding-y: .7rem !default; \ No newline at end of file +$navbar-padding-y: .7rem !default; + +// Breadcrumb + +$breadcrumb-padding-y: .75rem !default; +$breadcrumb-padding-x: .25rem !default; +$breadcrumb-item-padding: .25rem !default; \ No newline at end of file diff --git a/dev/scss/wvc-theme/yeti/_bootswatch.scss b/dev/scss/wvc-theme/yeti/_bootswatch.scss index 65f09bd..4029c54 100755 --- a/dev/scss/wvc-theme/yeti/_bootswatch.scss +++ b/dev/scss/wvc-theme/yeti/_bootswatch.scss @@ -1,4 +1,4 @@ -// Yeti 4.5.3 +// Yeti 4.6.0 // Bootswatch diff --git a/dev/scss/wvc-theme/yeti/_variables.scss b/dev/scss/wvc-theme/yeti/_variables.scss index 8eae40d..44da552 100755 --- a/dev/scss/wvc-theme/yeti/_variables.scss +++ b/dev/scss/wvc-theme/yeti/_variables.scss @@ -1,4 +1,4 @@ -// Yeti 4.5.3 +// Yeti 4.6.0 // Bootswatch // diff --git a/instances/models.py b/instances/models.py index ef95154..68d2ecc 100644 --- a/instances/models.py +++ b/instances/models.py @@ -204,10 +204,6 @@ class Instance(models.Model): def formats(self): return self.proxy.get_image_formats() - @cached_property - def interfaces(self): - return self.proxy.get_ifaces() - class PermissionSet(models.Model): """ diff --git a/instances/templates/add_instance_network_block.html b/instances/templates/add_instance_network_block.html index 6d82fd5..724ca80 100644 --- a/instances/templates/add_instance_network_block.html +++ b/instances/templates/add_instance_network_block.html @@ -27,7 +27,7 @@ {% for c_net in networks_host %} {% endfor %} - {% for c_iface in instance.interfaces %} + {% for c_iface in interfaces_host %} {% endfor %} diff --git a/instances/templates/instance.html b/instances/templates/instance.html index c4ce0e4..161fe93 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -54,7 +54,14 @@ {{ ipv4 }} | {% endfor %} {% endfor %} - + {% if instance.guest_agent_ready %} + + + + {% endif %} + + + {% if user_quota_msg %}
@@ -71,13 +78,13 @@