From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 29 Sep 2015 12:24:00 +0000 (+0000)
Subject: Merge "Remove blue border from DateInputWidget calendar"
X-Git-Tag: 1.31.0-rc.0~9682
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=9c90b64b7d45f734f7c8c7561689c63d3ae5eab8;hp=440667519e12d9ac8ecbb209cef5f702239e2bcf;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove blue border from DateInputWidget calendar"
---

diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less
index 702eb808fe..9d30eb8a1f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less
@@ -148,7 +148,7 @@
 	// 7x7 grid
 	width: @calendarWidth / 7;
 	line-height: @calendarHeight / 7;
-	// Don't overlap the hacked-up fake box-shadow border we get inside DateInputWidget when focussed
+	// Don't overlap the hacked-up fake box-shadow border we get when focussed
 	&:nth-child(7n) {
 		width: @calendarWidth / 7 - 0.2em;
 		margin-right: 0.2em;
@@ -167,7 +167,7 @@
 	// 2x6 grid
 	width: @calendarWidth / 2;
 	line-height: @calendarHeight / 6;
-	// Don't overlap the hacked-up fake box-shadow border we get inside DateInputWidget when focussed
+	// Don't overlap the hacked-up fake box-shadow border we get when focussed
 	&:nth-child(2n) {
 		width: @calendarWidth / 2 - 0.2em;
 		margin-right: 0.2em;
@@ -186,7 +186,7 @@
 	// 5x4 grid
 	width: @calendarWidth / 5;
 	line-height: @calendarHeight / 4;
-	// Don't overlap the hacked-up fake box-shadow border we get inside DateInputWidget when focussed
+	// Don't overlap the hacked-up fake box-shadow border we get when focussed
 	&:nth-child(5n) {
 		width: @calendarWidth / 5 - 0.2em;
 		margin-right: 0.2em;
@@ -206,6 +206,15 @@
 }
 
 /* Theme-specific */
+.mw-widget-calendarWidget {
+	box-shadow: inset 0 0 0 1px #ccc;
+}
+
+.mw-widget-calendarWidget:focus {
+	outline: none;
+	box-shadow: inset 0 0 0 2px #347bff;
+}
+
 .mw-widget-calendarWidget-day {
 	color: #444;
 	border-radius: 0.1em;
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index f78a18d9e5..8c1d2a0016 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -66,26 +66,16 @@
 		padding-left: 1em;
 	}
 
-	> .mw-widget-calendarWidget {
-		background-color: white;
+	> .oo-ui-textInputWidget {
+		z-index: 2;
 	}
 
-	&-active > .mw-widget-calendarWidget {
+	> .mw-widget-calendarWidget {
+		background-color: white;
 		margin-top: -2px;
-		// Immitate focussed input styles
-		// First shadow generates bottom and right "border", second shadow generates bottom and left,
-		// resulting in no "border" at the top. Note that this generates a 2px-wide "border", not 1px.
-		// It makes sense when you think about it long enough and look up what each value means. Enjoy.
-		// (This is symmetrical anyway, and CSSJanus can't flip it correctly. T62805)
-		/* @noflip */
-		box-shadow: inset -1px -1px 0 1px #347bff, inset 1px -1px 0 1px #347bff;
-		border-top: 1px solid #ccc;
 
 		&:focus {
-			outline: none;
-			// Add border at the top on focus
-			margin-top: -3px;
-			border-top: 2px solid #347bff;
+			z-index: 3;
 		}
 	}