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"