From c3e9fedca8577469dc58981e59a71ab78d0ced34 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 13 May 2020 22:04:16 +0200 Subject: v1.0.4 - updated Bootstrap to v4.5 --- CHANGELOG.md | 3 ++ assets/css/ace.scss | 2 +- assets/css/bootstrap/_breadcrumb.scss | 2 ++ assets/css/bootstrap/_buttons.scss | 17 +++++---- assets/css/bootstrap/_card.scss | 18 ++++++---- assets/css/bootstrap/_close.scss | 1 - assets/css/bootstrap/_custom-forms.scss | 3 +- assets/css/bootstrap/_dropdown.scss | 3 +- assets/css/bootstrap/_forms.scss | 9 +++++ assets/css/bootstrap/_functions.scss | 17 ++++++--- assets/css/bootstrap/_grid.scss | 10 +++++- assets/css/bootstrap/_input-group.scss | 3 +- assets/css/bootstrap/_list-group.scss | 22 +++++------- assets/css/bootstrap/_modal.scss | 2 ++ assets/css/bootstrap/_nav.scss | 1 + assets/css/bootstrap/_pagination.scss | 1 + assets/css/bootstrap/_progress.scss | 1 + assets/css/bootstrap/_reboot.scss | 22 ++++++------ assets/css/bootstrap/_spinners.scss | 1 + assets/css/bootstrap/_utilities.scss | 3 +- assets/css/bootstrap/_variables.scss | 4 +++ assets/css/bootstrap/bootstrap-grid.scss | 29 ++++++++++++++++ assets/css/bootstrap/bootstrap-reboot.scss | 12 +++++++ assets/css/bootstrap/bootstrap.scss | 6 ++-- .../css/bootstrap/mixins/_background-variant.scss | 3 +- assets/css/bootstrap/mixins/_border-radius.scss | 39 ++++++++++++++------- assets/css/bootstrap/mixins/_buttons.scss | 12 +++---- assets/css/bootstrap/mixins/_forms.scss | 4 +-- assets/css/bootstrap/mixins/_grid-framework.scss | 40 ++++++++++++++-------- assets/css/bootstrap/mixins/_transition.scss | 24 +++++++++---- assets/css/bootstrap/utilities/_background.scss | 2 +- assets/css/bootstrap/utilities/_interactions.scss | 5 +++ assets/css/bootstrap/utilities/_text.scss | 3 +- ...e.scss_b95b077eb505d5c0aff8055eaced30ad.content | 8 ++--- 34 files changed, 227 insertions(+), 105 deletions(-) create mode 100644 assets/css/bootstrap/bootstrap-grid.scss create mode 100644 assets/css/bootstrap/bootstrap-reboot.scss create mode 100644 assets/css/bootstrap/utilities/_interactions.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index b0f0b71..17eb2be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## Version 1.0.4 + - Updated Bootstrap to v4.5 + ## Version 1.0.3 - [FIX] Typo in readme, added changelog, updated config.toml in exampleSite - [FIX] Remove source map imports from JS files ([@jhollowe, PR #8](https://github.com/vantagedesign/ace-documentation/pull/8)) diff --git a/assets/css/ace.scss b/assets/css/ace.scss index 45a370b..1d34591 100644 --- a/assets/css/ace.scss +++ b/assets/css/ace.scss @@ -2,7 +2,7 @@ * ACE DOCUMENTATION * Stylesheet * @author Vantage Design -* @version 1.0.0 +* @version 1.0.4 * @license https://github.com/vantagedesign/ace-documentation/blob/master/LICENSE * ------------------------------------------------------------------------ */ diff --git a/assets/css/bootstrap/_breadcrumb.scss b/assets/css/bootstrap/_breadcrumb.scss index d748894..a0cf7e2 100644 --- a/assets/css/bootstrap/_breadcrumb.scss +++ b/assets/css/bootstrap/_breadcrumb.scss @@ -10,6 +10,8 @@ } .breadcrumb-item { + display: flex; + // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item { padding-left: $breadcrumb-item-padding; diff --git a/assets/css/bootstrap/_buttons.scss b/assets/css/bootstrap/_buttons.scss index e87d339..6ee24ba 100644 --- a/assets/css/bootstrap/_buttons.scss +++ b/assets/css/bootstrap/_buttons.scss @@ -10,9 +10,9 @@ font-weight: $btn-font-weight; color: $body-color; text-align: center; + text-decoration: if($link-decoration == none, null, none); white-space: $btn-white-space; vertical-align: middle; - cursor: if($enable-pointer-cursor-for-buttons, pointer, null); user-select: none; background-color: transparent; border: $btn-border-width solid transparent; @@ -37,12 +37,16 @@ @include box-shadow(none); } - &:not(:disabled):not(.disabled):active, - &:not(:disabled):not(.disabled).active { - @include box-shadow($btn-active-box-shadow); + &:not(:disabled):not(.disabled) { + cursor: if($enable-pointer-cursor-for-buttons, pointer, null); - &:focus { - @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + &:active, + &.active { + @include box-shadow($btn-active-box-shadow); + + &:focus { + @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + } } } } @@ -89,7 +93,6 @@ fieldset:disabled a.btn { &:focus, &.focus { text-decoration: $link-hover-decoration; - box-shadow: none; } &:disabled, diff --git a/assets/css/bootstrap/_card.scss b/assets/css/bootstrap/_card.scss index d6759fd..fabe9f3 100644 --- a/assets/css/bootstrap/_card.scss +++ b/assets/css/bootstrap/_card.scss @@ -19,15 +19,18 @@ margin-left: 0; } - > .list-group:first-child { - .list-group-item:first-child { - @include border-top-radius($card-border-radius); + > .list-group { + border-top: inherit; + border-bottom: inherit; + + &:first-child { + border-top-width: 0; + @include border-top-radius($card-inner-border-radius); } - } - > .list-group:last-child { - .list-group-item:last-child { - @include border-bottom-radius($card-border-radius); + &:last-child { + border-bottom-width: 0; + @include border-bottom-radius($card-inner-border-radius); } } } @@ -90,6 +93,7 @@ .card-footer { padding: $card-spacer-y $card-spacer-x; + color: $card-cap-color; background-color: $card-cap-bg; border-top: $card-border-width solid $card-border-color; diff --git a/assets/css/bootstrap/_close.scss b/assets/css/bootstrap/_close.scss index 071aebe..82e9593 100644 --- a/assets/css/bootstrap/_close.scss +++ b/assets/css/bootstrap/_close.scss @@ -30,7 +30,6 @@ button.close { padding: 0; background-color: transparent; border: 0; - appearance: none; } // Future-proof disabling of clicks on `` elements diff --git a/assets/css/bootstrap/_custom-forms.scss b/assets/css/bootstrap/_custom-forms.scss index 21e72da..0804c63 100644 --- a/assets/css/bootstrap/_custom-forms.scss +++ b/assets/css/bootstrap/_custom-forms.scss @@ -237,8 +237,9 @@ border-color: $custom-select-focus-border-color; outline: 0; @if $enable-shadows { - box-shadow: $custom-select-box-shadow, $custom-select-focus-box-shadow; + @include box-shadow($custom-select-box-shadow, $custom-select-focus-box-shadow); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: $custom-select-focus-box-shadow; } diff --git a/assets/css/bootstrap/_dropdown.scss b/assets/css/bootstrap/_dropdown.scss index 76f33a4..2ab7536 100644 --- a/assets/css/bootstrap/_dropdown.scss +++ b/assets/css/bootstrap/_dropdown.scss @@ -128,6 +128,7 @@ font-weight: $font-weight-normal; color: $dropdown-link-color; text-align: inherit; // For `