active_material 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0befeef9159040b47e03da4f2d258451c580a0d9ab33b2e0c10e249e8a7ac556
-  data.tar.gz: 550bc54c62434b4c81b1156a7d402283f22e497051b4d47a660ae5631be40790
+  metadata.gz: 913aad7bacde055046b86a4c9a367a210be9691a0cea4f49cfd31c607bbca61c
+  data.tar.gz: 554042092bc2aac01c813bd5c33b404f4d5a3464793cd982b0040f82905c272c
 SHA512:
-  metadata.gz: d0d4ed26ce6857b0837e759b8113e3a6f598a80b6880b79669d9303fdf3f8d320366f2618048ebead4452c0c27cf09490c704c3a0d7fa89edce07c93bcf3a2d6
-  data.tar.gz: 9174bfa663d0b9ae7718de7558883adc9ff8df4c82dc7195e1fa0ee7c1b5fa5dfd3e95e42c25cf872d2a75092ac4f9594614b856b067798291c3ef9d46b999e3
+  metadata.gz: 9efb49ee22c6d4be69bf446e1ff9ac308b7fef4b6f63a9c57584ddebbfa2d2f43043edde9dc1f7cb5ce21f7533e3a1466a98acbd10e695f64e8165b71c47fcfd
+  data.tar.gz: 25829e8b755101d24805a4d94174d300e636c7b0acd790fa03ce786a433e8ef720e93b23d107a664b178f9248d7c8f9183daf8ec7cde5b4430812b0f973f0e81

data/app/assets/stylesheets/active_material/components/dropdown.scss

@@ -27,7 +27,7 @@
   }
 
   li a {
-    @include am-menu-link;
     @include am-menu-item-open;
+    @include am-menu-link;
   }
 }

data/app/assets/stylesheets/active_material/components/header.scss

@@ -11,9 +11,10 @@
 }
 
 .site_title {
-  @include am-toolbar-title;
-  @include am-color(text-light);
   text-shadow: 0 1px 2px rgba(#000, 0.15);
+
+  @include am-color(text-light);
+  @include am-toolbar-title;
 }
 
 #tabs {

data/app/assets/stylesheets/active_material/components/title_bar.scss

@@ -3,13 +3,14 @@
  */
 
 .title_bar {
-  @include am-toolbar-title;
-  @include am-fill(white);
   box-shadow: 0 1px 2px rgba(#000, 0.24);
   align-items: center;
   display: flex;
   position: relative;
   z-index: 1;
+
+  @include am-fill(white);
+  @include am-toolbar-title;
 }
 
 #titlebar_left {

data/app/assets/stylesheets/active_material/generators/functions.scss

@@ -1,3 +1,6 @@
+@use "sass:color";
+@use "sass:map";
+
 /// Emulates letter tracking in Adobe Photoshop, which is used for
 /// adjusting the space between letters in text.
 ///
@@ -51,8 +54,8 @@
 /// @param {any} $key - The desired key in $am-colors.
 /// @return {color} A color value from $am-colors.
 @function am-color ($key) {
-  @if map-has-key($am-colors, $key) {
-    @return map-get($am-colors, $key);
+  @if map.has-key($am-colors, $key) {
+    @return map.get($am-colors, $key);
   }
 
   @error "Unknown color value '#{$key}'";
@@ -66,7 +69,7 @@
 /// @param {number} $amount - The degree of lightness.
 /// @return {color} A lightened color value from $am-colors.
 @function am-lighten ($color, $amount) {
-  @return lighten(am-color($color), $amount);
+  @return color.adjust(am-color($color), $lightness: $amount, $space: hsl);
 }
 
 
@@ -76,7 +79,7 @@
 /// @param {number} $amount - The degree of darkness.
 /// @return {color} A darkened color value from $am-colors.
 @function am-darken ($color, $amount) {
-  @return darken(am-color($color), $amount);
+  @return color.adjust(am-color($color), $lightness: -$amount, $space: hsl);
 }
 
 /// Extracts a font family out of the $am-fonts map. Throws an error if that key is not defined.
@@ -84,8 +87,8 @@
 /// @param {any} $key - The desired key in $am-colors.
 /// @return {font} A font family from $am-colors.
 @function am-font-family ($key) {
-  @if map-has-key($am-fonts, $key) {
-    @return map-get($am-fonts, $key);
+  @if map.has-key($am-fonts, $key) {
+    @return map.get($am-fonts, $key);
   }
 
   @error "Unknown font value '#{$key}'";

data/app/assets/stylesheets/active_material/prototypes/table.scss

@@ -1,3 +1,5 @@
+@use "sass:color";
+
 /**
  * Tables
  */
@@ -69,7 +71,7 @@ $am-table-border-color: am-color(divider);
   td,
   th {
     box-shadow: 0 -1px 0 rgba(#000, 0.05);
-    border-bottom: 1px solid darken($am-table-border-color, 5%);
+    border-bottom: 1px solid color.adjust($am-table-border-color, $lightness: -5%, $space: hsl);
   }
 }
 
@@ -79,7 +81,7 @@ $am-table-border-color: am-color(divider);
   td,
   th {
     box-shadow: 0 -1px 0 rgba(#000, 0.15);
-    border-bottom: 1px solid darken($am-table-border-color, 15%);
+    border-bottom: 1px solid color.adjust($am-table-border-color, $lightness: -15%, $space: hsl);
   }
 }
 

data/app/assets/stylesheets/active_material/values/colors.scss

@@ -1,3 +1,5 @@
+@use "sass:color";
+
 ////
 /// @group colors
 ////
@@ -83,8 +85,8 @@ $theme-error: $am-theme-error !default;
 
 $am-colors: (
   accent               : $am-theme-accent,
-  accent-active        : lighten($am-theme-accent, 2%),
-  accent-hover         : lighten($am-theme-accent, 5%),
+  accent-active        : color.adjust($am-theme-accent, $lightness: 2%, $space: hsl),
+  accent-hover         : color.adjust($am-theme-accent, $lightness: 5%, $space: hsl),
   backdrop             : $am-theme-backdrop,
   black                : black,
   divider              : $am-theme-divider,

data/lib/active_material/version.rb

@@ -1,3 +1,3 @@
 module ActiveMaterial
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "active_material",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "ActiveAdmin skin based on Google's Material Design.",
   "main": "src/javascripts/active_material.js",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_material
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Derek Kniffin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: ActiveAdmin skin based on Google's Material Design.