From 5dcad78f53ab80fb663933c7bb69aadfe69b2bdc Mon Sep 17 00:00:00 2001 From: yixian Date: Mon, 28 Sep 2020 18:32:53 +1000 Subject: [PATCH] holiday config ui update --- .../ui/static/analysis/templates/holiday_directive.html | 2 +- src/main/ui/static/commons/css/royal-calendar.css | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/analysis/templates/holiday_directive.html b/src/main/ui/static/analysis/templates/holiday_directive.html index 8d23c3882..9216ad4f4 100644 --- a/src/main/ui/static/analysis/templates/holiday_directive.html +++ b/src/main/ui/static/analysis/templates/holiday_directive.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/main/ui/static/commons/css/royal-calendar.css b/src/main/ui/static/commons/css/royal-calendar.css index a3134ec55..4f0420abf 100644 --- a/src/main/ui/static/commons/css/royal-calendar.css +++ b/src/main/ui/static/commons/css/royal-calendar.css @@ -33,13 +33,13 @@ float: left; text-align: center; position: relative; - height: 90px; + min-height: 90px; background: #fff; color: #000; } .rc-box .week.week-label .day { - height: 30px; + min-height: 30px; } .rc-box .week .day.weekend { @@ -87,8 +87,9 @@ .rc-box .week .day .datecontent { position: relative; margin-top: 25px; - height: 65px; + min-height: 65px; width: 100%; + padding-bottom: 6px; display: block; }