jenkins-bot has submitted this change and it was merged.
Change subject: Strengthen .tutorial selector
......................................................................
Strengthen .tutorial selector
In certain circumstances the tutorials.less file loads after
overlays.less - this means the tutorial overlay gets a white
background - account for this
* Add slider-button class to avoid specificity wars
* Limit styling to .button class to avoid conflicts with tutorial
Bug: 57192
Change-Id: I70f2a610d441db9d8665a3ae6c37d17d033443a6
---
M less/modules/tutorials.less
M less/modules/uploads/UploadTutorial.less
M templates/modules/tutorials/PageActionOverlay.html
M templates/uploads/UploadTutorial.html
4 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Awjrichards: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/modules/tutorials.less b/less/modules/tutorials.less
index 2129296..af8e892 100644
--- a/less/modules/tutorials.less
+++ b/less/modules/tutorials.less
@@ -1,7 +1,9 @@
@import "../mixins.less";
/* Tutorial overlay styling */
-.tutorial {
+.tutorial,
+// Use two selectors to ensure this is more specific then .mw-mf-overlay in
cases of load order differences
+.mw-mf-overlay.tutorial {
padding: 1em @contentMargin;
line-height: 1.4;
font-size: .9em;
@@ -15,7 +17,6 @@
margin: 0 0 1em;
}
- button,
.button {
// FIXME: without this the cloaked input seems to interfere
making cancel button start upload
position: relative;
diff --git a/less/modules/uploads/UploadTutorial.less
b/less/modules/uploads/UploadTutorial.less
index 2197175..2ba763e 100644
--- a/less/modules/uploads/UploadTutorial.less
+++ b/less/modules/uploads/UploadTutorial.less
@@ -16,11 +16,10 @@
.carousel {
@buttonWidth: 40px;
- position: relative;
.box-sizing(border-box);
overflow: hidden;
- > button {
+ .slider-button {
text-indent: -9999px;
overflow: hidden;
position: absolute;
diff --git a/templates/modules/tutorials/PageActionOverlay.html
b/templates/modules/tutorials/PageActionOverlay.html
index d3b290e..6773155 100644
--- a/templates/modules/tutorials/PageActionOverlay.html
+++ b/templates/modules/tutorials/PageActionOverlay.html
@@ -1,7 +1,7 @@
<div class="tutorial">
<p>{{summary}}</p>
<div class="button-bar-centered">
- <button class="cancel inline">{{cancelMsg}}</button>
- <button class="actionable">{{confirmMsg}}</button>
+ <button class="button cancel inline">{{cancelMsg}}</button>
+ <button class="button actionable">{{confirmMsg}}</button>
</div>
</div>
diff --git a/templates/uploads/UploadTutorial.html
b/templates/uploads/UploadTutorial.html
index 5f2ac5a..b18a699 100644
--- a/templates/uploads/UploadTutorial.html
+++ b/templates/uploads/UploadTutorial.html
@@ -1,4 +1,4 @@
-<button class="prev"></button>
+<button class="slider-button prev"></button>
<ul>
{{#pages}}
<li class="slide slide-image">
@@ -11,10 +11,10 @@
</div>
{{/fileButton}}
{{^fileButton}}
- <button class="cancel">{{button}}</button>
+ <button class="cancel button">{{button}}</button>
{{/fileButton}}
{{/button}}
</li>
{{/pages}}
</ul>
-<button class="next"></button>
+<button class="slider-button next"></button>
--
To view, visit https://gerrit.wikimedia.org/r/95636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70f2a610d441db9d8665a3ae6c37d17d033443a6
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
