administrate-bootstrap-theme 0.2.0 → 0.2.2

data/app/assets/stylesheets/administrate-bootstrap-theme/_base.scss

@@ -1,7 +1,7 @@
 // from: node_modules/bootstrap/scss
 @import "bootstrap/bootstrap";
-// from: node_modules/flatpickr/dist/flatpickr.css
-@import "flatpickr/flatpickr.css";
+// from: node_modules/flatpickr/dist/flatpickr.css => flatpickr/flatpickr.scss
+@import "flatpickr/flatpickr";
 @import "selectize";
 
 @import "variables";

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_accordion.scss

@@ -58,7 +58,6 @@
 }
 
 .accordion-item {
-  margin-bottom: -$accordion-border-width;
   background-color: $accordion-bg;
   border: $accordion-border-width solid $accordion-border-color;
 
@@ -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 {

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_dropdown.scss

@@ -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;
@@ -33,6 +32,7 @@
   @include box-shadow($dropdown-box-shadow);
 
   &[data-bs-popper] {
+    top: 100%;
     left: 0;
     margin-top: $dropdown-spacer;
   }
@@ -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 {
@@ -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 {

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_list-group.scss

@@ -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($alert-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

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_mixins.scss

@@ -10,6 +10,7 @@
 
 // Helpers
 @import "mixins/breakpoints";
+@import "mixins/color-scheme";
 @import "mixins/image";
 @import "mixins/resize";
 @import "mixins/visually-hidden";

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_modal.scss

@@ -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;
@@ -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;
@@ -159,15 +150,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

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_offcanvas.scss

@@ -16,6 +16,7 @@
 
 .offcanvas-header {
   display: flex;
+  align-items: center;
   justify-content: space-between;
   padding: $offcanvas-padding-y $offcanvas-padding-x;
 
@@ -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;
@@ -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;
-}

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_spinners.scss

@@ -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
@@ -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%;

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_tables.scss

@@ -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};

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_variables.scss

@@ -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;
@@ -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;
@@ -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;
 
@@ -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;
@@ -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;
 
@@ -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
 

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/bootstrap-grid.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.0.0-beta3 (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)

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/bootstrap-reboot.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.0.0-beta3 (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)

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/bootstrap-utilities.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.0.0-beta3 (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)

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.0-beta3 (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)

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_color-scheme.scss

@@ -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

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_forms.scss

@@ -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 {
@@ -127,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;
+      }
     }
   }
 }

data/app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_grid.scss

@@ -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() {

data/lib/administrate-bootstrap-theme/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdministrateBootstrapTheme
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "administrate-bootstrap-theme",
+  "version": "0.2.2",
+  "main": "index.js",
+  "author": "Mattia Roccoberton <mat@blocknot.es>",
+  "license": "MIT",
+  "dependencies": {
+    "bootstrap": "^5.0.1",
+    "flatpickr": "^4.6.9"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-bootstrap-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -33,7 +33,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/assets/config/administrate-bootstrap-theme_manifest.js
 - app/assets/javascripts/administrate-bootstrap-theme/bootstrap/bootstrap.bundle.js
 - app/assets/javascripts/administrate-bootstrap-theme/flatpickr/flatpickr.js
@@ -102,6 +101,7 @@ files:
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_buttons.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_caret.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_clearfix.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_color-scheme.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_container.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_deprecate.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_forms.scss
@@ -125,11 +125,12 @@ files:
 - app/assets/stylesheets/administrate-bootstrap-theme/components/_form.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/components/_navigation.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/components/_pagination.scss
-- app/assets/stylesheets/administrate-bootstrap-theme/flatpickr/flatpickr.css
+- app/assets/stylesheets/administrate-bootstrap-theme/flatpickr/flatpickr.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/theme.scss
 - lib/administrate-bootstrap-theme.rb
 - lib/administrate-bootstrap-theme/engine.rb
 - lib/administrate-bootstrap-theme/version.rb
+- package.json
 homepage: https://github.com/blocknotes/administrate-bootstrap-theme
 licenses:
 - MIT
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Administrate Bootstrap Theme