From fe43330e7389746ef26c47a6e4d492b4e017f419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 13 Dec 2017 11:10:52 +0100
Subject: [PATCH] Datepicker design fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/css/header.scss |  9 ++++---
 core/css/styles.scss | 63 ++++++++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/core/css/header.scss b/core/css/header.scss
index b38c0bcb401..1b25e0c46c7 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -206,12 +206,15 @@ nav {
 	margin-left: -54px;
 }
 
-.header-left #navigation,
-.ui-datepicker,
-.ui-timepicker.ui-widget {
+.header-left #navigation {
 	position: relative;
 	left: -100%;
 	width: 160px;
+}
+
+.header-left #navigation,
+.ui-datepicker,
+.ui-timepicker.ui-widget {
 	background-color: $color-main-background;
 	filter: drop-shadow(0 1px 10px $color-box-shadow);
 	&:after {
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 1b76e3c68de..cd3c57bda4f 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -1030,15 +1030,6 @@ code {
 			background-color: inherit;
 		}
 		td {
-			> * {
-				border-radius: 50%;
-				text-align: center;
-				font-weight: normal;
-				color: $color-main-text;
-				padding: 6px;
-				line-height: 12px;
-			}
-
 			&.ui-datepicker-today a:not(.ui-state-hover) {
 				background-color: nc-lighten($color-main-text, 86%);
 			}
@@ -1051,7 +1042,7 @@ code {
 				font-weight: bold;
 			}
 
-			&.ui-datepicker-week-end :not(.ui-state-hover),
+			&.ui-datepicker-week-end:not(.ui-state-disabled) :not(.ui-state-hover),
 			.ui-priority-secondary:not(.ui-state-hover) {
 				color: nc-lighten($color-main-text, 33%);
 				opacity: .8;
@@ -1094,6 +1085,12 @@ code {
 			font-weight: 300;
 		}
 	}
+	/* AM/PM fix */
+	table.ui-timepicker tr th {
+		position: absolute;
+		margin-left: -24px;
+		top: calc(50% + 5px);
+	}
 	.ui-timepicker-table {
 		th {
 			font-weight: normal;
@@ -1104,16 +1101,6 @@ code {
 			background-color: inherit;
 		}
 		td {
-			> * {
-				border-radius: 50%;
-				text-align: center;
-				font-weight: normal;
-				color: $color-main-text;
-				padding: 8px 7px;
-				font-size: .9em;
-				line-height: 12px;
-			}
-
 			&.ui-timepicker-hour-cell a.ui-state-active,
 			&.ui-timepicker-minute-cell a.ui-state-active,
 			.ui-state-hover,
@@ -1129,6 +1116,42 @@ code {
 
 			&.ui-timepicker-hours {
 				border-right: 1px solid $color-border;
+				/* AM/PM fix */
+				.ui-timepicker tr {
+					position: relative;
+					margin-left: 25px;
+				}
+			}
+		}
+	}
+}
+
+/* ---- jQuery UI datepicker & timepicker global rules ---- */
+.ui-widget.ui-datepicker .ui-datepicker-calendar,
+.ui-widget.ui-timepicker table.ui-timepicker {
+	tr {
+		display: flex;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+		td {
+			display: block;
+			flex: 1 1;
+			margin: 0;
+			padding: 2px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			> * {
+				border-radius: 50%;
+				text-align: center;
+				font-weight: normal;
+				color: $color-main-text;
+				display: block;
+				line-height: 18px;
+				width: 18px;
+				height: 18px;
+				padding: 3px;
+				font-size: .9em;
 			}
 		}
 	}