jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336905 )
Change subject: Make attributions more visible on static snapshot
......................................................................
Make attributions more visible on static snapshot
* And fix inconsistencies between static and interactive modes
Bug: T157720
Change-Id: I8bd66db6f4dbdf9d42b315226eb3c30ea47eb5eb
---
M styles/control-attribution.less
M styles/leaflet-overrides.less
2 files changed, 29 insertions(+), 12 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/styles/control-attribution.less b/styles/control-attribution.less
index 75e5233..8e0facd 100644
--- a/styles/control-attribution.less
+++ b/styles/control-attribution.less
@@ -1,10 +1,8 @@
/* == Attribution control == */
@import '../lib/wmui-base.less';
+/* Static snapshot */
.mw-kartographer-attribution {
- background-color: rgba( 255, 255, 255, 0.5 );
- color: @color-base;
-
position: absolute;
right: 0;
bottom: 0;
@@ -14,14 +12,22 @@
box-shadow: none;
}
-/** Override initial properties */
+/* Static + Interactive */
+.mw-kartographer-attribution,
.leaflet-right.leaflet-bottom {
- .leaflet-control.leaflet-control-attribution {
- float: none;
- clear: none;
- }
+ background-color: rgba( 255, 255, 255, 0.8 );
+ color: @color-base;
}
+/* Interactive */
+.leaflet-right.leaflet-bottom .leaflet-control.leaflet-control-attribution {
+ /** Override initial properties */
+ background-color: transparent;
+ float: none;
+ clear: none;
+}
+
+/* Static + Interactive */
.mw-kartographer-attribution,
.leaflet-right.leaflet-bottom .leaflet-control.leaflet-control-attribution {
font-size: 10px;
@@ -36,5 +42,20 @@
overflow: hidden;
text-overflow: clip;
white-space: normal;
+
+ }
+
+ a {
+ color: @color-base;
+ }
+}
+
+/* Static + Interactive */
+.mw-kartographer-map:hover .mw-kartographer-attribution,
+.mw-kartographer-interactive:hover .leaflet-right.leaflet-bottom {
+ background-color: rgba( 255, 255, 255, 0.9 );
+
+ a { /* stylelint-disable-line no-descending-specificity */
+ color: @color-primary;
}
}
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index 9faac22..06f26a4 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -38,10 +38,6 @@
}
}
}
-
- &:hover .leaflet-control-attribution a {
- color: @color-primary;
- }
}
/* Leaflet Popups */
--
To view, visit https://gerrit.wikimedia.org/r/336905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bd66db6f4dbdf9d42b315226eb3c30ea47eb5eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
