T196759: add support for the echo MW extension

lingua-libre · Jun 1, 2020 · 9757eb8 · 9757eb8
1 parent a5257ae
commit 9757eb8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/BlueLL.skin.php b/BlueLL.skin.php
@@ -74,6 +74,12 @@ public function execute() {
 							<?php echo $this->makeLink( "RecordWizard", [ "msg" => "Record", "href" => $recordwizardTitle->getFullURL(), "accesskey" => "r" ] ); ?></a>
 						</li>
 
+						<!-- If user is logged in output echo location -->
+						<?php if ($wgUser->isLoggedIn()): ?>
+							<div id="echo-notifications-alerts"></div>
+							<div id="echo-notifications-notice"></div>
+						<?php endif; ?>
+
 						<!-- Personal menu dropdown -->
 						<li id="personal-menu" class="dropdown mobile-menu">
 							<input id="personal-input" type="checkbox" role="button" aria-labelledby="personal-button" autocomplete="off" class="dropdown-input mobile-menu-input">
@@ -148,15 +154,7 @@ public function execute() {
 		</header>
 
 		<section id="page-content">
-			<aside style="display: none;"> <!-- TODO: temporary hidden, how should it be styled ?
-				<!-- If user is logged in output echo location -->
-				<?php if ($wgUser->isLoggedIn()): ?>
-					<div id="echo-notifications">
-						<div id="echo-notifications-alerts"></div>
-						<div id="echo-notifications-messages"></div>
-						<div id="echo-notifications-notice"></div>
-					</div>
-				<?php endif; ?>
+			<aside style="display: none;"> <!-- TODO: temporary hidden, how should it be styled ? -->
 
 				<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice"><?php $this->html( 'sitenotice' ); ?></div><?php } ?>
 				<?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk"><?php $this->html( 'newtalk' ); ?></div><?php } ?>

diff --git a/assets/stylesheets/content.css b/assets/stylesheets/content.css
@@ -56,13 +56,6 @@
 	color: white;
 }
 
-#contentHeading h1,
-#contentHeading h2,
-#contentHeading h4 {
-	z-index: 5;
-	position: relative;
-}
-
 #contentHeading h4 {
 	display: none;
 }
@@ -78,7 +71,6 @@
 	background-position: bottom right;
 	background-repeat: no-repeat;
 	background-size: auto 100%;
-	z-index: 2
 }
 #mw-indicator-mw-helplink {
 	display: none;

diff --git a/assets/stylesheets/ext.echo.css b/assets/stylesheets/ext.echo.css
@@ -0,0 +1,20 @@
+#echo-notifications-alerts,
+#echo-notifications-notice {
+	width: 24px;
+	margin-right: 10px;
+}
+
+#pt-notifications-alert,
+#pt-notifications-notice {
+	position: relative;
+	top: 12px;
+}
+
+#pt-notifications-alert .mw-echo-notifications-badge.oo-ui-flaggedElement-unseen::after,
+#pt-notifications-alert .mw-echo-notifications-badge.mw-echo-unseen-notifications::after {
+    background-color: #dd3333;
+}
+#pt-notifications-notice .mw-echo-notifications-badge.oo-ui-flaggedElement-unseen::after,
+#pt-notifications-notice .mw-echo-notifications-badge.mw-echo-unseen-notifications::after {
+    background-color: #3366cc;
+}
diff --git a/skin.json b/skin.json
@@ -31,7 +31,8 @@
 				"assets/stylesheets/content.css",
 				"assets/stylesheets/footer.css",
 				"assets/stylesheets/static.css",
-				"assets/stylesheets/print.css"
+				"assets/stylesheets/print.css",
+				"assets/stylesheets/ext.echo.css"
 			]
 		},
 		"skins.bluell.js": {