Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

Commit

Permalink
Bump to 1.1.0
Browse files Browse the repository at this point in the history
Bootstrap updated from 5.0.0 to 5.0.1 (patch update), Bootstrap Icons updated from 1.4.1 to 1.5.0 (minor update).
  • Loading branch information
jonaharagon committed May 19, 2021
1 parent 7b143fa commit 2092a48
Show file tree
Hide file tree
Showing 16 changed files with 77 additions and 33 deletions.
10 changes: 5 additions & 5 deletions _sass/bootstrap/_list-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,12 @@
// Organizationally, this must come after the `:hover` states.

@each $state, $value in $theme-colors {
$list-group-background: shift-color($value, $list-group-item-bg-scale);
$list-group-color: shift-color($value, $list-group-item-color-scale);
@if (contrast-ratio($list-group-background, $list-group-color) < $min-contrast-ratio) {
$list-group-color: mix($value, color-contrast($list-group-background), abs($list-group-item-color-scale));
$list-group-variant-bg: shift-color($value, $list-group-item-bg-scale);
$list-group-variant-color: shift-color($value, $list-group-item-color-scale);
@if (contrast-ratio($list-group-variant-bg, $list-group-variant-color) < $min-contrast-ratio) {
$list-group-variant-color: mix($value, color-contrast($list-group-variant-bg), abs($list-group-item-color-scale));
}

@include list-group-item-variant($state, $list-group-background, $list-group-color);
@include list-group-item-variant($state, $list-group-variant-bg, $list-group-variant-color);
}
// scss-docs-end list-group-modifiers
13 changes: 2 additions & 11 deletions _sass/bootstrap/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@
// .modal-content - actual modal w/ bg and corners and stuff


.modal-open {
// Kill the scroll on the body
overflow: hidden;

.modal {
overflow-x: hidden;
overflow-y: auto;
}
}

// Container that the modal scrolls within
.modal {
position: fixed;
Expand All @@ -23,7 +13,8 @@
display: none;
width: 100%;
height: 100%;
overflow: hidden;
overflow-x: hidden;
overflow-y: auto;
// Prevent Chrome on Windows from adding a focus outline. For details, see
// https://github.com/twbs/bootstrap/pull/10951.
outline: 0;
Expand Down
1 change: 1 addition & 0 deletions _sass/bootstrap/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

.table {
--#{$variable-prefix}table-bg: #{$table-bg};
--#{$variable-prefix}table-accent-bg: #{$table-bg};
--#{$variable-prefix}table-striped-color: #{$table-striped-color};
--#{$variable-prefix}table-striped-bg: #{$table-striped-bg};
--#{$variable-prefix}table-active-color: #{$table-active-color};
Expand Down
2 changes: 1 addition & 1 deletion _sass/bootstrap/bootstrap-grid.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Grid v5.0.0 (https://getbootstrap.com/)
* Bootstrap Grid v5.0.1 (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)
Expand Down
2 changes: 1 addition & 1 deletion _sass/bootstrap/bootstrap-reboot.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v5.0.0 (https://getbootstrap.com/)
* Bootstrap Reboot v5.0.1 (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)
Expand Down
2 changes: 1 addition & 1 deletion _sass/bootstrap/bootstrap-utilities.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Utilities v5.0.0 (https://getbootstrap.com/)
* Bootstrap Utilities v5.0.1 (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)
Expand Down
2 changes: 1 addition & 1 deletion _sass/bootstrap/bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v5.0.0 (https://getbootstrap.com/)
* Bootstrap v5.0.1 (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)
Expand Down
10 changes: 5 additions & 5 deletions _sass/bootstrap/forms/_form-control.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
&[type="file"] {
overflow: hidden; // prevent pseudo element button overlap

&:not(:disabled):not(:read-only) {
&:not(:disabled):not([readonly]) {
cursor: pointer;
}
}
Expand Down Expand Up @@ -65,7 +65,7 @@
// disabled if the fieldset is disabled. Due to implementation difficulty, we
// don't honor that edge case; we style them as disabled anyway.
&:disabled,
&:read-only {
&[readonly] {
background-color: $input-disabled-bg;
border-color: $input-disabled-border-color;
// iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
Expand All @@ -88,7 +88,7 @@
@include transition($btn-transition);
}

&:hover:not(:disabled):not(:read-only)::file-selector-button {
&:hover:not(:disabled):not([readonly])::file-selector-button {
background-color: $form-file-button-hover-bg;
}

Expand All @@ -107,7 +107,7 @@
@include transition($btn-transition);
}

&:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
&:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
background-color: $form-file-button-hover-bg;
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ textarea {
height: auto; // Override fixed browser height
padding: $input-padding-y;

&:not(:disabled):not(:read-only) {
&:not(:disabled):not([readonly]) {
cursor: pointer;
}

Expand Down
9 changes: 8 additions & 1 deletion _sass/bootstrap/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,14 @@
.input-group .form-control,
.input-group .form-select {
@include form-validation-state-selector($state) {
z-index: 3;
@if $state == "valid" {
z-index: 1;
} @else if $state == "invalid" {
z-index: 2;
}
&:focus {
z-index: 3;
}
}
}
}
Expand Down
49 changes: 47 additions & 2 deletions assets/css/bootstrap-icons.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@font-face {
font-family: "bootstrap-icons";
src: url("./fonts/bootstrap-icons.woff2?231ce25e89ab5804f9a6c427b8d325c9") format("woff2"),
url("./fonts/bootstrap-icons.woff?231ce25e89ab5804f9a6c427b8d325c9") format("woff");
src: url("./fonts/bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d") format("woff2"),
url("./fonts/bootstrap-icons.woff?856008caa5eb66df68595e734e59580d") format("woff");
}

[class^="bi-"]::before,
Expand Down Expand Up @@ -1343,3 +1343,48 @@ url("./fonts/bootstrap-icons.woff?231ce25e89ab5804f9a6c427b8d325c9") format("wof
.bi-youtube::before { content: "\f62b"; }
.bi-zoom-in::before { content: "\f62c"; }
.bi-zoom-out::before { content: "\f62d"; }
.bi-bank::before { content: "\f62e"; }
.bi-bank2::before { content: "\f62f"; }
.bi-bell-slash-fill::before { content: "\f630"; }
.bi-bell-slash::before { content: "\f631"; }
.bi-cash-coin::before { content: "\f632"; }
.bi-check-lg::before { content: "\f633"; }
.bi-coin::before { content: "\f634"; }
.bi-currency-bitcoin::before { content: "\f635"; }
.bi-currency-dollar::before { content: "\f636"; }
.bi-currency-euro::before { content: "\f637"; }
.bi-currency-exchange::before { content: "\f638"; }
.bi-currency-pound::before { content: "\f639"; }
.bi-currency-yen::before { content: "\f63a"; }
.bi-dash-lg::before { content: "\f63b"; }
.bi-exclamation-lg::before { content: "\f63c"; }
.bi-file-earmark-pdf-fill::before { content: "\f63d"; }
.bi-file-earmark-pdf::before { content: "\f63e"; }
.bi-file-pdf-fill::before { content: "\f63f"; }
.bi-file-pdf::before { content: "\f640"; }
.bi-gender-ambiguous::before { content: "\f641"; }
.bi-gender-female::before { content: "\f642"; }
.bi-gender-male::before { content: "\f643"; }
.bi-gender-trans::before { content: "\f644"; }
.bi-headset-vr::before { content: "\f645"; }
.bi-info-lg::before { content: "\f646"; }
.bi-mastodon::before { content: "\f647"; }
.bi-messenger::before { content: "\f648"; }
.bi-piggy-bank-fill::before { content: "\f649"; }
.bi-piggy-bank::before { content: "\f64a"; }
.bi-pin-map-fill::before { content: "\f64b"; }
.bi-pin-map::before { content: "\f64c"; }
.bi-plus-lg::before { content: "\f64d"; }
.bi-question-lg::before { content: "\f64e"; }
.bi-recycle::before { content: "\f64f"; }
.bi-reddit::before { content: "\f650"; }
.bi-safe-fill::before { content: "\f651"; }
.bi-safe2-fill::before { content: "\f652"; }
.bi-safe2::before { content: "\f653"; }
.bi-sd-card-fill::before { content: "\f654"; }
.bi-sd-card::before { content: "\f655"; }
.bi-skype::before { content: "\f656"; }
.bi-slash-lg::before { content: "\f657"; }
.bi-translate::before { content: "\f658"; }
.bi-x-lg::before { content: "\f659"; }
.bi-safe::before { content: "\f65a"; }
Binary file modified assets/css/fonts/bootstrap-icons.woff
Binary file not shown.
Binary file modified assets/css/fonts/bootstrap-icons.woff2
Binary file not shown.
4 changes: 2 additions & 2 deletions assets/js/bootstrap.bundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/bootstrap.bundle.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jekyll-bootstrap-theme.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

version = "1.0.0"
version = "1.1.0"

Gem::Specification.new do |spec|
spec.name = "jekyll-bootstrap-theme"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jekyll-bootstrap-theme",
"version": "1.0.0",
"version": "1.1.0",
"description": "A basic but extensible Jekyll theme based on Bootstrap 5.",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 2092a48

Please sign in to comment.