From 183d9190ded346c7081f54c7394ca2717524b738 Mon Sep 17 00:00:00 2001 From: Igor Fedoronchuk Date: Tue, 13 Oct 2026 14:22:28 +0200 Subject: [PATCH] Flatten prepare_src layout and keep today-selected text readable cp -R app/assets/stylesheets/ src is non-deterministic across platforms (flat on macOS, nested under src/stylesheets/ on Linux), so a git-installed package built on Linux had its scss at an unexpected path and broke consumers importing src/active_admin_datetimepicker. Copy directory contents (dir/.) into an existing src/ so the layout is flat and consistent everywhere. Also keep the number visible when today is the selected cell: its accent fill now gets light text instead of the accent-coloured today text on an accent background. --- app/assets/stylesheets/active_admin_datetimepicker.scss | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/active_admin_datetimepicker.scss b/app/assets/stylesheets/active_admin_datetimepicker.scss index 6ef1214..09cb503 100644 --- a/app/assets/stylesheets/active_admin_datetimepicker.scss +++ b/app/assets/stylesheets/active_admin_datetimepicker.scss @@ -88,6 +88,12 @@ div.xdsoft_datetimepicker { color: $-aa-dtp-accent; } + // When today is also the selected cell, its accent fill needs light text + // (otherwise accent-on-accent hides the number). + .xdsoft_calendar td.xdsoft_today.xdsoft_current { + color: #fff; + } + .xdsoft_calendar td.xdsoft_current.xdsoft_disabled:hover, .xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_current.xdsoft_disabled:hover { background: $-aa-dtp-accent !important; diff --git a/package.json b/package.json index f0ef781..3117981 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "!src/*.bak" ], "scripts": { - "prepare_src": "rm -rf src && cp -R app/assets/javascripts/ src && cp -R app/assets/stylesheets/ src", + "prepare_src": "rm -rf src && mkdir -p src && cp -R app/assets/javascripts/. src/ && cp -R app/assets/stylesheets/. src/", "prepare_import": "sed -i.bak 1s/'\\/\\/\\= require vendor\\/jquery.datetimepicker.full'/\"import '.\\/vendor\\/jquery.datetimepicker.full';\"/ src/active_admin_datetimepicker.js", "prepare": "npm run prepare_src && npm run prepare_import", "prepublishOnly": "npm run prepare_src && npm run prepare_import"