active_admin_theme 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1993fdd8d2c135f02b1dfe4cd689c4422c3ff1b8b3b17d5b1365c8d5001a188
-  data.tar.gz: 4e5fc48944ad78ad1684b7631537c59efc2c1b8973d10b867c7c6ca330c3e935
+  metadata.gz: 9acbb41d69f18ef3ba70a6b4da01ab1a85328e033f7479db96196205908b769a
+  data.tar.gz: 6bb46419bd8a22379b18f25911e0a6265f362cee313b5b0ec6ea8c1e6c66e900
 SHA512:
-  metadata.gz: 9cdc504b3d55ec896fbfb0db1667b07d411be5b90b4ec6531731728d0152f4bda13ae645b3afd3f95c8429c820c9bc49bc3dc12cfafe40913e89cebe6b1c0e4d
-  data.tar.gz: 4f9c30bb187b18ed8f7d9d180b7d50ed03e3150b3ecdcdd3470d6318609118e5189781a952975ed261f68b18ed587dcb985380c78e8162b6af83cfe65bbd6b66
+  metadata.gz: 4111c99001eeb83c4e40ae480e30f4e04e40b91385308dc1fba03e55a9f1c2eec848543de51c0cfe716a0780a3c5d9cfa70aa9c379b85f18b24298755b252276
+  data.tar.gz: 2637d37a333a34362e022f2e97090384150fc2d38de4131c3b6b322e999f375ab82dd0fdeb9a671f84b2870c77c6e18fb2e683fc75db8b59fa7bf4c804818359

data/README.md

@@ -35,7 +35,7 @@ Or add manually to `package.json`:
 
 ```
 "dependencies": {
-  "@activeadmin-plugins/active_admin_theme": "^3.1.0"
+  "@activeadmin-plugins/active_admin_theme": "^3.1.1"
 }
 ```
 and execute:
@@ -273,7 +273,7 @@ Three things changed shape and are worth knowing if you already set variables:
 | `$skinTabInactiveColor` / `$skinTabInactiveColorDark` | `#f7f9fb` / `#161a1e` | inactive tab fill |
 | `$skinActiveTabTextColor` / `$skinActiveTabTextColorDark` | `$skinMainSecondColor` / `#7cc0ec` | selected tab label |
 | `$skinInactiveTabTextColor` / `$skinInactiveTabTextColorDark` | `#5e6469` / `#b0b8c2` | inactive tab label |
-| `$skinTableHeaderTextColor` / `$skinTableHeaderTextColorDark` | `$skinTextColor` / `#dde2e8` | index-table column header text; the body text colour, so headings read as strongly as the rows |
+| `$skinTableHeaderTextColor` / `$skinTableHeaderTextColorDark` | `$skinTextColor` / `$skinTextColorDark` | index-table column header text; the body text colour, so headings read as strongly as the rows |
 | `$skinStatusTagTextColor` | `#ffffff` | label inside a filled status tag; `empty` / `unknown` / `none` have no fill and keep `$skinTextMutedColor` |
 | `$skinStatusTagNeutralColor` | `#707681` | unclassified tags: `No`, protocol tags |
 | `$skinStatusTagOkColor` | `#5e7e63` | `ok` `published` `complete` `completed` `green` `yes` |

data/app/assets/stylesheets/wigu/active_admin_theme.scss

@@ -130,7 +130,7 @@ $skinInactiveTabTextColor: #5e6469!default;
 $skinInactiveTabTextColorDark: #b0b8c2!default;
 // Index-table column header text, one colour for sortable and plain headers.
 $skinTableHeaderTextColor: $skinTextColor!default;
-$skinTableHeaderTextColorDark: #dde2e8!default;
+$skinTableHeaderTextColorDark: $skinTextColorDark!default;
 
 // Status tags. The label is the same on every filled tag in both modes. The
 // fills below are dark enough to carry a white one: every one of the five is
@@ -233,9 +233,18 @@ html[data-theme="dark"]  { @include aa-dark-palette; }
   html[data-theme="dark"] { @content; }
 }
 
-// Иконки переключателя тем. Инлайном, потому что гем не возит картинок, и
-// маской, а не цветным SVG: маска красится currentColor и сама идёт за
-// $skinMenuTextColor. Половинка круга — auto, солнце — light, месяц — dark.
+// Sort markers. Three shapes rather than one at two opacities: ActiveAdmin's
+// sprite draws a double arrow for sortable-but-unsorted, and reusing the
+// descending triangle for it leaves the two states indistinguishable on a
+// freshly loaded index. Masked, like the theme switch icons, so they take
+// currentColor and follow the heading into dark mode.
+$sort-icon-none: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 9 12'%3E%3Cpath d='M4.5 0 9 5H0z'/%3E%3Cpath d='M4.5 12 0 7h9z'/%3E%3C/svg%3E")!default;
+$sort-icon-asc: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 9 12'%3E%3Cpath d='M4.5 2 9 8H0z'/%3E%3C/svg%3E")!default;
+$sort-icon-desc: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 9 12'%3E%3Cpath d='M4.5 10 0 4h9z'/%3E%3C/svg%3E")!default;
+
+// Theme switch icons. Inline, because the gem ships no image files, and as a
+// mask rather than a coloured SVG: a mask takes currentColor and so follows
+// $skinMenuTextColor on its own. Half circle = auto, sun = light, moon = dark.
 $theme-icon-auto: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='6.6' fill='none' stroke='black' stroke-width='1.4'/%3E%3Cpath d='M8 2.6a5.4 5.4 0 0 1 0 10.8z'/%3E%3C/svg%3E")!default;
 $theme-icon-light: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.4' stroke-linecap='round'%3E%3Ccircle cx='8' cy='8' r='3.1'/%3E%3Cpath d='M8 .9v1.8M8 13.3v1.8M.9 8h1.8M13.3 8h1.8M2.9 2.9l1.3 1.3M11.8 11.8l1.3 1.3M13.1 2.9l-1.3 1.3M4.2 11.8l-1.3 1.3'/%3E%3C/svg%3E")!default;
 $theme-icon-dark: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M13.4 9.6A5.9 5.9 0 0 1 6.4 2.6a5.9 5.9 0 1 0 7 7z'/%3E%3C/svg%3E")!default;
@@ -337,11 +346,11 @@ $theme-icon-dark: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
     @error "$#{$name} must be a color or a CSS custom property (e.g. var(--aa-page-bg)), got `#{$value}`.";
   }
 }
-// Радиус внутреннего угла ячейки — на 1px меньше внешнего, чтобы не торчал
-// из-под рамки таблицы. Вычитать px напрямую нельзя: $skinBorderRadius задаёт
-// проект, и 0.25rem роняет всю компиляцию с «Incompatible units». calc()
-// откладывает вычитание до браузера, а безразмерный 0 обрабатываем отдельно —
-// calc(0 - 1px) невалиден.
+// A cell's inner corner is 1px tighter than the outer one, so it does not
+// show from under the table border. Subtracting px directly will not do: the
+// radius is a project's to set, and 0.25rem fails the whole compile with
+// "Incompatible units". calc() defers the subtraction to the browser, and a
+// unitless 0 is handled separately because calc(0 - 1px) is invalid.
 @function inner-radius($radius) {
   @if unitless($radius) { @return 0; }
   @return calc(#{$radius} - 1px);
@@ -905,27 +914,27 @@ body.active_admin {
     // link keeps its full width so the whole cell stays clickable, and the
     // marker takes currentColor — the stock sprite is a fixed grey PNG that
     // cannot follow the text into dark mode.
-    // `a[href*="order="]`, not every anchor in the header: an application can
-    // put its own link in there — yeti-web adds a persistent-sort toggle — and
-    // it would otherwise get a sort marker of its own. ActiveAdmin's heading
-    // link always carries the order parameter.
-    th.sortable > a[href*="order="] {
+    // The sprite goes from every anchor in a sortable heading, because
+    // ActiveAdmin sets it on every one — an application link in there would
+    // otherwise keep the low-res PNG and the 13px indent it needs.
+    th.sortable a {
       padding-left: 0;
       background-image: none;
+    }
+    // The marker, though, only on ActiveAdmin's own heading link, which always
+    // carries the order parameter: an application's link is its own business.
+    th.sortable > a[href*="order="] {
 
       &:after {
         content: "";
         display: inline-block;
+        width: 9px;
+        height: 12px;
         margin-left: 6px;
         vertical-align: middle;
-        // The unused side has no width rather than a transparent one, so the
-        // box is exactly as tall as the triangle in it. Keeping all four sides
-        // and nudging with a margin instead puts the two states at different
-        // heights, because `vertical-align: middle` centres the box and the
-        // visible half then sits off-centre within it.
-        border: 4px solid transparent;
-        border-bottom-width: 0;
-        border-top-color: currentColor;
+        background-color: currentColor;
+        -webkit-mask: #{$sort-icon-none} center / contain no-repeat;
+        mask: #{$sort-icon-none} center / contain no-repeat;
         // 0.6, not lower: the marker is the only thing separating a sortable
         // heading from a plain one, so WCAG 1.4.11 asks 3:1 of it. Against the
         // header fill it gives 3.40 light and 4.22 dark; at 0.4 it was 2.13
@@ -934,13 +943,15 @@ body.active_admin {
       }
     }
     th.sorted-asc > a[href*="order="]:after {
-      border-top-width: 0;
-      border-bottom-width: 4px;
-      border-top-color: transparent;
-      border-bottom-color: currentColor;
+      -webkit-mask-image: $sort-icon-asc;
+      mask-image: $sort-icon-asc;
+      opacity: 1;
+    }
+    th.sorted-desc > a[href*="order="]:after {
+      -webkit-mask-image: $sort-icon-desc;
+      mask-image: $sort-icon-desc;
       opacity: 1;
     }
-    th.sorted-desc > a[href*="order="]:after { opacity: 1; }
     // Right edge = a single 1px line on the last-column cells (header th, body
     // td, footer cells) coloured like the table border, since the table itself
     // no longer draws a right border.

data/lib/active_admin_theme/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminTheme
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_theme
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Igor Fedoronchuk