administrate-bootstrap-theme 1.0.4 → 1.1.0

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

@@ -2,30 +2,9 @@
 
 // scss-docs-start pagination-mixin
 @mixin pagination-size($padding-y, $padding-x, $font-size, $border-radius) {
-  .page-link {
-    padding: $padding-y $padding-x;
-    @include font-size($font-size);
-  }
-
-  .page-item {
-    @if $pagination-margin-start == (-$pagination-border-width) {
-      &:first-child {
-        .page-link {
-          @include border-start-radius($border-radius);
-        }
-      }
-
-      &:last-child {
-        .page-link {
-          @include border-end-radius($border-radius);
-        }
-      }
-    } @else {
-      //Add border-radius to all pageLinks in case they have left margin
-      .page-link {
-        @include border-radius($border-radius);
-      }
-    }
-  }
+  --#{$prefix}pagination-padding-x: #{$padding-x};
+  --#{$prefix}pagination-padding-y: #{$padding-y};
+  @include rfs($font-size, --#{$prefix}pagination-font-size);
+  --#{$prefix}pagination-border-radius: #{$border-radius};
 }
 // scss-docs-end pagination-mixin

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

@@ -11,7 +11,7 @@
   text-transform: none;
   letter-spacing: normal;
   word-break: normal;
-  word-spacing: normal;
   white-space: normal;
+  word-spacing: normal;
   line-break: auto;
 }

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

@@ -5,17 +5,20 @@
     $hover-bg: mix($color, $background, percentage($table-hover-bg-factor));
     $striped-bg: mix($color, $background, percentage($table-striped-bg-factor));
     $active-bg: mix($color, $background, percentage($table-active-bg-factor));
+    $table-border-color: mix($color, $background, percentage($table-border-factor));
 
-    --#{$variable-prefix}table-bg: #{$background};
-    --#{$variable-prefix}table-striped-bg: #{$striped-bg};
-    --#{$variable-prefix}table-striped-color: #{color-contrast($striped-bg)};
-    --#{$variable-prefix}table-active-bg: #{$active-bg};
-    --#{$variable-prefix}table-active-color: #{color-contrast($active-bg)};
-    --#{$variable-prefix}table-hover-bg: #{$hover-bg};
-    --#{$variable-prefix}table-hover-color: #{color-contrast($hover-bg)};
+    --#{$prefix}table-color: #{$color};
+    --#{$prefix}table-bg: #{$background};
+    --#{$prefix}table-border-color: #{$table-border-color};
+    --#{$prefix}table-striped-bg: #{$striped-bg};
+    --#{$prefix}table-striped-color: #{color-contrast($striped-bg)};
+    --#{$prefix}table-active-bg: #{$active-bg};
+    --#{$prefix}table-active-color: #{color-contrast($active-bg)};
+    --#{$prefix}table-hover-bg: #{$hover-bg};
+    --#{$prefix}table-hover-color: #{color-contrast($hover-bg)};
 
-    color: $color;
-    border-color: mix($color, $background, percentage($table-border-factor));
+    color: var(--#{$prefix}table-color);
+    border-color: var(--#{$prefix}table-border-color);
   }
 }
 // scss-docs-end table-variant

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

@@ -1,6 +1,6 @@
 // Utility generator
 // Used to generate utilities & print utilities
-@mixin generate-utility($utility, $infix, $is-rfs-media-query: false) {
+@mixin generate-utility($utility, $infix: "", $is-rfs-media-query: false) {
   $values: map-get($utility, values);
 
   // If the values are a list or string, convert it into a map
@@ -20,12 +20,15 @@
     $property-class: if(map-has-key($utility, class), map-get($utility, class), nth($properties, 1));
     $property-class: if($property-class == null, "", $property-class);
 
+    // Use custom CSS variable name if present, otherwise default to `class`
+    $css-variable-name: if(map-has-key($utility, css-variable-name), map-get($utility, css-variable-name), map-get($utility, class));
+
     // State params to generate pseudo-classes
     $state: if(map-has-key($utility, state), map-get($utility, state), ());
 
     $infix: if($property-class == "" and str-slice($infix, 1, 1) == "-", str-slice($infix, 2), $infix);
 
-    // Don't prefix if value key is null (eg. with shadow class)
+    // Don't prefix if value key is null (e.g. with shadow class)
     $property-class-modifier: if($key, if($property-class == "" and $infix == "", "", "-") + $key, "");
 
     @if map-get($utility, rfs) {
@@ -52,20 +55,20 @@
 
       @if $is-css-var {
         .#{$property-class + $infix + $property-class-modifier} {
-          --#{$variable-prefix}#{$property-class}: #{$value};
+          --#{$prefix}#{$css-variable-name}: #{$value};
         }
 
         @each $pseudo in $state {
           .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
-            --#{$variable-prefix}#{$property-class}: #{$value};
+            --#{$prefix}#{$css-variable-name}: #{$value};
           }
         }
       } @else {
         .#{$property-class + $infix + $property-class-modifier} {
           @each $property in $properties {
             @if $is-local-vars {
-              @each $local-var, $value in $is-local-vars {
-                --#{$variable-prefix}#{$local-var}: #{$value};
+              @each $local-var, $variable in $is-local-vars {
+                --#{$prefix}#{$local-var}: #{$variable};
               }
             }
             #{$property}: $value if($enable-important-utilities, !important, null);
@@ -75,6 +78,11 @@
         @each $pseudo in $state {
           .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
             @each $property in $properties {
+              @if $is-local-vars {
+                @each $local-var, $variable in $is-local-vars {
+                  --#{$prefix}#{$local-var}: #{$variable};
+                }
+              }
               #{$property}: $value if($enable-important-utilities, !important, null);
             }
           }

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

@@ -3,10 +3,9 @@
 // Hide content visually while keeping it accessible to assistive technologies
 //
 // See: https://www.a11yproject.com/posts/2013-01-11-how-to-hide-content/
-// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/
+// See: https://kittygiraudel.com/2016/10/13/css-hide-and-seek/
 
 @mixin visually-hidden() {
-  position: absolute !important;
   width: 1px !important;
   height: 1px !important;
   padding: 0 !important;
@@ -15,6 +14,11 @@
   clip: rect(0, 0, 0, 0) !important;
   white-space: nowrap !important;
   border: 0 !important;
+
+  // Fix for positioned table caption that could become anonymous cells
+  &:not(caption) {
+    position: absolute !important;
+  }
 }
 
 // Use to only display content when it's focused, or one of its child elements is focused

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

@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist, scss/dollar-variable-default
+// stylelint-disable scss/dimension-no-non-numeric-values
 
 // SCSS RFS mixin
 //
@@ -154,8 +154,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
     &.enable-rfs {
       @content;
     }
-  }
-  @else {
+  } @else {
     @content;
   }
 }
@@ -168,7 +167,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
       @content;
     }
 
-    @include _rfs-media-query {
+    @include _rfs-media-query () {
       .enable-rfs &,
       &.enable-rfs {
         @content;
@@ -182,7 +181,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
         @content;
       }
     }
-    @include _rfs-media-query {
+    @include _rfs-media-query () {
       @content;
     }
   }
@@ -193,12 +192,12 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
   // Convert to list
   $values: if(type-of($values) != list, ($values,), $values);
 
-  $val: '';
+  $val: "";
 
   // Loop over each value and calculate value
   @each $value in $values {
     @if $value == 0 {
-      $val: $val + ' 0';
+      $val: $val + " 0";
     }
     @else {
       // Cache $value unit
@@ -206,15 +205,14 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
 
       @if $unit == px {
         // Convert to rem if needed
-        $val: $val + ' ' + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
+        $val: $val + " " + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
       }
       @else if $unit == rem {
         // Convert to px if needed
-        $val: $val + ' ' + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
-      }
-      @else {
+        $val: $val + " " + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
+      } @else {
         // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
-        $val: $val + ' ' + $value;
+        $val: $val + " " + $value;
       }
     }
   }
@@ -228,30 +226,26 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
   // Convert to list
   $values: if(type-of($values) != list, ($values,), $values);
 
-  $val: '';
+  $val: "";
 
   // Loop over each value and calculate value
   @each $value in $values {
     @if $value == 0 {
-      $val: $val + ' 0';
-    }
-
-    @else {
+      $val: $val + " 0";
+    } @else {
       // Cache $value unit
       $unit: if(type-of($value) == "number", unit($value), false);
 
       // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
       @if not $unit or $unit != px and $unit != rem {
-        $val: $val + ' ' + $value;
-      }
-
-      @else {
+        $val: $val + " " + $value;
+      } @else {
         // Remove unit from $value for calculations
         $value: divide($value, $value * 0 + if($unit == px, 1, divide(1, $rfs-rem-value)));
 
         // Only add the media query if the value is greater than the minimum value
         @if abs($value) <= $rfs-base-value or not $enable-rfs {
-          $val: $val + ' ' +  if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
+          $val: $val + " " + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
         }
         @else {
           // Calculate the minimum value
@@ -273,7 +267,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
           $variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
 
           // Return the calculated value
-          $val: $val + ' calc(' + $min-width + if($value < 0, ' - ', ' + ') + $variable-width + ')';
+          $val: $val + " calc(" + $min-width + if($value < 0, " - ", " + ") + $variable-width + ")";
         }
       }
     }
@@ -287,22 +281,22 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
 @mixin rfs($values, $property: font-size) {
   @if $values != null {
     $val: rfs-value($values);
-    $fluidVal: rfs-fluid-value($values);
+    $fluid-val: rfs-fluid-value($values);
 
     // Do not print the media query if responsive & non-responsive values are the same
-    @if $val == $fluidVal {
+    @if $val == $fluid-val {
       #{$property}: $val;
     }
     @else {
-      @include _rfs-rule {
-        #{$property}: if($rfs-mode == max-media-query, $val, $fluidVal);
+      @include _rfs-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $val, $fluid-val);
 
         // Include safari iframe resize fix if needed
         min-width: if($rfs-safari-iframe-resize-bug-fix, (0 * 1vw), null);
       }
 
-      @include _rfs-media-query-rule {
-        #{$property}: if($rfs-mode == max-media-query, $fluidVal, $val);
+      @include _rfs-media-query-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $fluid-val, $val);
       }
     }
   }

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

@@ -5,7 +5,7 @@
     @extend .table-striped;
   }
 
-  > dl {
+  >dl {
     @extend .row;
 
     dt {
@@ -17,6 +17,20 @@
     dd {
       @extend .col-10;
     }
+
+    >fieldset {
+      display: flex;
+      flex-wrap: wrap;
+      margin-left: calc(-.5 * var(--bs-gutter-x));
+    }
+
+    .attribute-data {
+      padding-left: var(--bs-gutter-x);
+    }
+  }
+
+  th[scope="col"] {
+    border-bottom: 1px solid $dark;
   }
 
   a {
@@ -27,12 +41,12 @@
     @extend .table;
   }
 
-  .attribute-data > table {
+  .attribute-data>table {
     @extend .table-bordered;
   }
 
   .attribute--nested {
-    > div {
+    >div {
       @extend .d-flex;
     }
 
@@ -45,21 +59,21 @@
     }
   }
 
-  .cell-label__sort-indicator > svg {
+  .cell-label__sort-indicator>svg {
     height: 1.2rem;
     width: 1.2rem;
   }
 
-  .cell-label__sort-indicator--desc > svg {
+  .cell-label__sort-indicator--desc>svg {
     transform: rotate(180deg);
   }
 
-  .form-actions > input {
+  .form-actions>input {
     @extend .btn-primary;
   }
 
   .js-table-row {
-    > td {
+    >td {
       @extend .text-center, .p-1;
 
       &.cell-data {

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

@@ -30,6 +30,10 @@ nav.navigation {
     color: $navigation-fg;
   }
 
+  .navigation__link:hover {
+    background: $navigation-fg;
+  }
+
   .navigation__link--active {
     background: $navigation-bg-active;
   }

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

@@ -1,7 +1,15 @@
 nav.pagination {
-  @extend .border, .justify-content-center, .mb-3;
+  @extend .justify-content-center, .mb-3;
 
-  > span {
-    @extend .nav-link;
+  >span {
+    @extend .page-item;
+
+    >a {
+      @extend .page-link;
+    }
+  }
+
+  >span.current {
+    @extend .disabled, .page-link;
   }
 }

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module AdministrateBootstrapTheme
-  VERSION = '1.0.4'
-  BOOTSTRAP_VERSION = '5.1.0'
+  VERSION = '1.1.0'
+
+  BOOTSTRAP_VERSION = '5.3.3'
 end

data/package.json

@@ -1,10 +1,10 @@
 {
   "name": "administrate-bootstrap-theme",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "main": "index.js",
   "author": "Mattia Roccoberton <mat@blocknot.es>",
   "license": "MIT",
   "dependencies": {
-    "bootstrap": "^5.0.1"
+    "bootstrap": "^5.3.3"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-bootstrap-theme
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: 'A Bootstrap theme for Administrate: clean design, easy to install, customizable'
 email:
 - mat@blocknot.es
@@ -54,6 +68,7 @@ files:
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_helpers.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_images.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_list-group.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_maps.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_mixins.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_modal.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_nav.scss
@@ -72,6 +87,7 @@ files:
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_transitions.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_type.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_utilities.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_variables-dark.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/_variables.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/bootstrap-grid.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/bootstrap-reboot.scss
@@ -87,7 +103,10 @@ files:
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/forms/_labels.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/forms/_validation.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_clearfix.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_color-bg.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_colored-links.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_focus-ring.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_icon-link.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_position.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_ratio.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_stacks.scss
@@ -97,12 +116,14 @@ files:
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/helpers/_vr.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_alert.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_backdrop.scss
+- app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_banner.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_border-radius.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_box-shadow.scss
 - app/assets/stylesheets/administrate-bootstrap-theme/bootstrap/mixins/_breakpoints.scss
 - 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-mode.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
@@ -166,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Administrate Bootstrap Theme