Merge pull request #37 from Wikia/REL1_39

Merge REL1_39 to master
Wikia · Jan 20, 2025 · b72b9e0 · b72b9e0
2 parents d9ca351 + db07bdd
commit b72b9e0
Show file tree

Hide file tree

Showing 11 changed files with 315 additions and 127 deletions.
diff --git a/ServiceWiring.php b/ServiceWiring.php
@@ -12,6 +12,7 @@
 
 use Fandom\Includes\Util\UrlUtilityService;
 use Fandom\WikiConfig\WikiVariablesDataService;
+use Fandom\WikiDomain\WikiConfigDataService;
 use MediaWiki\MediaWikiServices;
 use Reverb\Fixer\NotificationUserNoteAssetsUrlFixer;
 use Reverb\Identifier\IdentifierService;
@@ -21,7 +22,6 @@
 use Reverb\Notification\NotificationFactory;
 use Reverb\Notification\NotificationListService;
 use Reverb\Notification\NotificationService;
-use WikiDomain\WikiConfigDataService;
 
 return [
 	NotificationBroadcastFactory::class =>

diff --git a/resources/css/reverb.specialNotifications.fandomdesktop.css b/resources/css/reverb.specialNotifications.fandomdesktop.css
diff --git a/resources/css/reverb.specialNotifications.fandomdesktop.scss b/resources/css/reverb.specialNotifications.fandomdesktop.scss
@@ -39,7 +39,7 @@
 	&-icon {
 		width: 18px;
 		height: 18px;
-		@include svgAsBackground(url(/resources-ucp/v2/dist/svg/wds-icons-controls-small.svg), currentColor);
+		@include svgAsBackground(url(/resources-ucp/mw139/dist/svg/wds-icons-controls-small.svg), currentColor);
 	}
 
 	&-row {
@@ -75,11 +75,11 @@
 	}
 
 	&-checkbox--unchecked {
-		@include svgAsBackground(url(/resources-ucp/v2/dist/svg/wds-icons-checkbox-empty-small.svg), currentColor);
+		@include svgAsBackground(url(/resources-ucp/mw139/dist/svg/wds-icons-checkbox-empty-small.svg), currentColor);
 	}
 
 	&-checkbox--checked {
-		@include svgAsBackground(url(/resources-ucp/v2/dist/svg/wds-icons-checkbox-small.svg), var(--theme-link-color));
+		@include svgAsBackground(url(/resources-ucp/mw139/dist/svg/wds-icons-checkbox-small.svg), var(--theme-link-color));
 	}
 }
 
@@ -222,23 +222,23 @@
 }
 
 .fa-user, .fa-user-circle {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-user-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-user-small.svg);
 }
 .fa-user-cog {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-gear-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-gear-small.svg);
 }
 .fa-users {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-users-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-users-small.svg);
 }
 .fa-file {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-page-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-page-small.svg);
 }
 .fa-edit {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-pencil-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-pencil-small.svg);
 }
 .fa-history {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-clock-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-clock-small.svg);
 }
 .fa-thumbs-up {
-	--reverb-icon: url(/resources-ucp/v2/dist/svg/wds-icons-heart-small.svg);
+	--reverb-icon: url(/resources-ucp/mw139/dist/svg/wds-icons-heart-small.svg);
 }