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.0.0
Browse files Browse the repository at this point in the history
First non-beta release. Bumps [bootstrap](https://github.com/twbs/bootstrap) from 5.0.0-beta3 to 5.0.0.
  • Loading branch information
jonaharagon committed May 6, 2021
1 parent 65056ab commit 45bae56
Show file tree
Hide file tree
Showing 20 changed files with 71 additions and 68 deletions.
6 changes: 4 additions & 2 deletions _sass/bootstrap/_accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
}

.accordion-item {
margin-bottom: -$accordion-border-width;
background-color: $accordion-bg;
border: $accordion-border-width solid $accordion-border-color;

Expand All @@ -70,9 +69,12 @@
}
}

&:not(:first-of-type) {
border-top: 0;
}

// Only set a border-radius on the last item if the accordion is collapsed
&:last-of-type {
margin-bottom: 0;
@include border-bottom-radius($accordion-border-radius);

.accordion-button {
Expand Down
20 changes: 7 additions & 13 deletions _sass/bootstrap/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// The dropdown menu
.dropdown-menu {
position: absolute;
top: 100%;
z-index: $zindex-dropdown;
display: none; // none by default, but block on "open" of the menu
min-width: $dropdown-min-width;
Expand All @@ -33,6 +32,7 @@
@include box-shadow($dropdown-box-shadow);

&[data-bs-popper] {
top: 100%;
left: 0;
margin-top: $dropdown-spacer;
}
Expand Down Expand Up @@ -83,15 +83,12 @@
}

.dropend {
.dropdown-menu {
.dropdown-menu[data-bs-popper] {
top: 0;
right: auto;
left: 100%;

&[data-bs-popper] {
margin-top: 0;
margin-left: $dropdown-spacer;
}
margin-top: 0;
margin-left: $dropdown-spacer;
}

.dropdown-toggle {
Expand All @@ -103,15 +100,12 @@
}

.dropstart {
.dropdown-menu {
.dropdown-menu[data-bs-popper] {
top: 0;
right: 100%;
left: auto;

&[data-bs-popper] {
margin-top: 0;
margin-right: $dropdown-spacer;
}
margin-top: 0;
margin-right: $dropdown-spacer;
}

.dropdown-toggle {
Expand Down
2 changes: 1 addition & 1 deletion _sass/bootstrap/_list-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
$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($alert-color-scale));
$list-group-color: mix($value, color-contrast($list-group-background), abs($list-group-item-color-scale));
}

@include list-group-item-variant($state, $list-group-background, $list-group-color);
Expand Down
1 change: 1 addition & 0 deletions _sass/bootstrap/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// Helpers
@import "mixins/breakpoints";
@import "mixins/color-scheme";
@import "mixins/image";
@import "mixins/resize";
@import "mixins/visually-hidden";
Expand Down
9 changes: 0 additions & 9 deletions _sass/bootstrap/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,6 @@
}
}

// Measure scrollbar width for padding body during modal show/hide
.modal-scrollbar-measure {
position: absolute;
top: -9999px;
width: 50px;
height: 50px;
overflow: scroll;
}

// Scale up the modal
@include media-breakpoint-up(sm) {
// Automatically set modal's width for larger viewports
Expand Down
22 changes: 11 additions & 11 deletions _sass/bootstrap/_offcanvas.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

.offcanvas-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: $offcanvas-padding-y $offcanvas-padding-x;

Expand Down Expand Up @@ -52,6 +53,16 @@
transform: translateX(100%);
}

.offcanvas-top {
top: 0;
right: 0;
left: 0;
height: $offcanvas-vertical-height;
max-height: 100%;
border-bottom: $offcanvas-border-width solid $offcanvas-border-color;
transform: translateY(-100%);
}

.offcanvas-bottom {
right: 0;
left: 0;
Expand All @@ -64,14 +75,3 @@
.offcanvas.show {
transform: none;
}

.offcanvas-backdrop::before {
position: fixed;
top: 0;
left: 0;
z-index: $zindex-offcanvas - 1;
width: 100vw;
height: 100vh;
content: "";
background-color: $offcanvas-body-backdrop-color;
}
4 changes: 2 additions & 2 deletions _sass/bootstrap/_spinners.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
display: inline-block;
width: $spinner-width;
height: $spinner-height;
vertical-align: text-bottom;
vertical-align: $spinner-vertical-align;
border: $spinner-border-width solid currentColor;
border-right-color: transparent;
// stylelint-disable-next-line property-disallowed-list
Expand Down Expand Up @@ -46,7 +46,7 @@
display: inline-block;
width: $spinner-width;
height: $spinner-height;
vertical-align: text-bottom;
vertical-align: $spinner-vertical-align;
background-color: currentColor;
// stylelint-disable-next-line property-disallowed-list
border-radius: 50%;
Expand Down
14 changes: 7 additions & 7 deletions _sass/bootstrap/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ $form-check-transition: null !default;
$form-check-input-active-filter: brightness(90%) !default;

$form-check-input-bg: $input-bg !default;
$form-check-input-border: 1px solid rgba(0, 0, 0, .25) !default;
$form-check-input-border: 1px solid rgba($black, .25) !default;
$form-check-input-border-radius: .25em !default;
$form-check-radio-border-radius: 50% !default;
$form-check-input-focus-border: $input-focus-border-color !default;
Expand Down Expand Up @@ -902,8 +902,8 @@ $form-validation-states: (
$zindex-dropdown: 1000 !default;
$zindex-sticky: 1020 !default;
$zindex-fixed: 1030 !default;
$zindex-offcanvas: 1040 !default;
$zindex-modal-backdrop: 1050 !default;
$zindex-modal-backdrop: 1040 !default;
$zindex-offcanvas: 1050 !default;
$zindex-modal: 1060 !default;
$zindex-popover: 1070 !default;
$zindex-tooltip: 1080 !default;
Expand All @@ -917,8 +917,8 @@ $nav-link-padding-y: .5rem !default;
$nav-link-padding-x: 1rem !default;
$nav-link-font-size: null !default;
$nav-link-font-weight: null !default;
$nav-link-color: null !default;
$nav-link-hover-color: null !default;
$nav-link-color: $link-color !default;
$nav-link-hover-color: $link-hover-color !default;
$nav-link-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default;
$nav-link-disabled-color: $gray-600 !default;

Expand Down Expand Up @@ -1125,7 +1125,7 @@ $accordion-icon-width: 1.25rem !default;
$accordion-icon-color: $accordion-color !default;
$accordion-icon-active-color: $accordion-button-active-color !default;
$accordion-icon-transition: transform .2s ease-in-out !default;
$accordion-icon-transform: rotate(180deg) !default;
$accordion-icon-transform: rotate(-180deg) !default;

$accordion-button-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
$accordion-button-active-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-active-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
Expand Down Expand Up @@ -1406,6 +1406,7 @@ $carousel-dark-control-icon-filter: invert(1) grayscale(100) !default;
// scss-docs-start spinner-variables
$spinner-width: 2rem !default;
$spinner-height: $spinner-width !default;
$spinner-vertical-align: -.125em !default;
$spinner-border-width: .25em !default;
$spinner-animation-speed: .75s !default;

Expand Down Expand Up @@ -1446,7 +1447,6 @@ $offcanvas-border-width: $modal-content-border-width !default;
$offcanvas-title-line-height: $modal-title-line-height !default;
$offcanvas-bg-color: $modal-content-bg !default;
$offcanvas-color: $modal-content-color !default;
$offcanvas-body-backdrop-color: rgba($modal-backdrop-bg, $modal-backdrop-opacity) !default;
$offcanvas-box-shadow: $modal-content-box-shadow-xs !default;
// scss-docs-end offcanvas-variables

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-beta3 (https://getbootstrap.com/)
* Bootstrap Grid v5.0.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)
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-beta3 (https://getbootstrap.com/)
* Bootstrap Reboot v5.0.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)
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-beta3 (https://getbootstrap.com/)
* Bootstrap Utilities v5.0.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)
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-beta3 (https://getbootstrap.com/)
* Bootstrap v5.0.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)
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([readonly]) {
&:not(:disabled):not(:read-only) {
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,
&[readonly] {
&:read-only {
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([readonly])::file-selector-button {
&:hover:not(:disabled):not(:read-only)::file-selector-button {
background-color: $form-file-button-hover-bg;
}

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

&:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
&:hover:not(:disabled):not(:read-only)::-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([readonly]) {
&:not(:disabled):not(:read-only) {
cursor: pointer;
}

Expand Down
7 changes: 7 additions & 0 deletions _sass/bootstrap/mixins/_color-scheme.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// scss-docs-start mixin-color-scheme
@mixin color-scheme($name) {
@media (prefers-color-scheme: #{$name}) {
@content;
}
}
// scss-docs-end mixin-color-scheme
11 changes: 7 additions & 4 deletions _sass/bootstrap/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@
border-color: $color;

@if $enable-validation-icons {
padding-right: $form-select-feedback-icon-padding-end;
background-image: escape-svg($form-select-indicator), escape-svg($icon);
background-position: $form-select-bg-position, $form-select-feedback-icon-position;
background-size: $form-select-bg-size, $form-select-feedback-icon-size;
&:not([multiple]):not([size]),
&:not([multiple])[size="1"] {
padding-right: $form-select-feedback-icon-padding-end;
background-image: escape-svg($form-select-indicator), escape-svg($icon);
background-position: $form-select-bg-position, $form-select-feedback-icon-position;
background-size: $form-select-bg-size, $form-select-feedback-icon-size;
}
}

&:focus {
Expand Down
11 changes: 8 additions & 3 deletions _sass/bootstrap/mixins/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@
margin-top: var(--#{$variable-prefix}gutter-y);
}

@mixin make-col($size, $columns: $grid-columns) {
flex: 0 0 auto;
width: percentage($size / $columns);
@mixin make-col($size: false, $columns: $grid-columns) {
@if $size {
flex: 0 0 auto;
width: percentage($size / $columns);
} @else {
flex: 1 1 0;
max-width: 100%;
}
}

@mixin make-col-auto() {
Expand Down
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.

6 changes: 3 additions & 3 deletions jekyll-bootstrap-theme.gemspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true

version = "0.1.1"
version = "1.0.0"

Gem::Specification.new do |spec|
spec.name = "jekyll-bootstrap-theme"
spec.version = version
spec.homepage = "https://github.com/jonaharagon/jekyll-bootstrap-theme/"
spec.homepage = "https://github.com/jonaharagon/jekyll-bootstrap-theme"

spec.author = "Jonah Aragon"
spec.email = "jonah@triplebit.net"
Expand Down Expand Up @@ -34,7 +34,7 @@ Gem::Specification.new do |spec|

spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README)!i) }

spec.add_runtime_dependency "jekyll", ">= 4.2", "<5.0"
spec.add_runtime_dependency "jekyll", ">= 4.0", "<5.0"
spec.add_runtime_dependency "jekyll-feed", "~> 0.9"
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.1"

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": "0.1.1",
"version": "1.0.0",
"description": "A basic but extensible Jekyll theme based on Bootstrap 5.",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 45bae56

Please sign in to comment.