awjrichards has submitted this change and it was merged.
Change subject: QA Design Tweaks to copyright dialog
......................................................................
QA Design Tweaks to copyright dialog
change button to blue
allow buttons with class .confirm to close overlay
fix margins on list in copyright dialog
Change-Id: Ic1397b6e893eab54a23f43f644559d198e5e6cb5
---
M javascripts/common/mf-navigation.js
M less/common/mf-navigation.less
M stylesheets/common/mf-navigation.css
M templates/overlays/photoCopyrightDialog.html
4 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
awjrichards: Verified; Looks good to me, approved
diff --git a/javascripts/common/mf-navigation.js
b/javascripts/common/mf-navigation.js
index 6a0efdb..1daff43 100644
--- a/javascripts/common/mf-navigation.js
+++ b/javascripts/common/mf-navigation.js
@@ -71,7 +71,7 @@
var self = this;
this.parent = options.parent;
this.isOpened = false;
- this.$( '.cancel' ).click( function( ev ) {
+ this.$( '.cancel,.confirm' ).click( function( ev ) {
ev.preventDefault();
self.hide();
} );
diff --git a/less/common/mf-navigation.less b/less/common/mf-navigation.less
index 5e5d4d9..504bb76 100644
--- a/less/common/mf-navigation.less
+++ b/less/common/mf-navigation.less
@@ -104,6 +104,7 @@
.content {
margin-top: @headingMarginTop;
+ .confirm,
.cancel {
display: block;
margin: auto;
@@ -204,8 +205,13 @@
list-style: none;
&.informative {
- list-style: inside square;
- margin-bottom: 8px;
+ margin-left: 16px;
+ list-style: outside square;
+ margin-bottom: 16px;
+
+ li {
+ margin-bottom: 8px;
+ }
}
}
diff --git a/stylesheets/common/mf-navigation.css
b/stylesheets/common/mf-navigation.css
index 0010751..3ce7068 100644
--- a/stylesheets/common/mf-navigation.css
+++ b/stylesheets/common/mf-navigation.css
@@ -97,6 +97,7 @@
.mw-mf-overlay .content {
margin-top: 14pt;
}
+.mw-mf-overlay .content .confirm,
.mw-mf-overlay .content .cancel {
display: block;
margin: auto;
@@ -176,7 +177,11 @@
list-style: none;
}
.overlay ul.informative {
- list-style: inside square;
+ margin-left: 16px;
+ list-style: outside square;
+ margin-bottom: 16px;
+}
+.overlay ul.informative li {
margin-bottom: 8px;
}
a.escapeOverlay,
diff --git a/templates/overlays/photoCopyrightDialog.html
b/templates/overlays/photoCopyrightDialog.html
index e1f5e4b..b67b942 100644
--- a/templates/overlays/photoCopyrightDialog.html
+++ b/templates/overlays/photoCopyrightDialog.html
@@ -9,5 +9,5 @@
<li>{{text}}</li>
{{/bulletPoints}}
</ul>
- <button class="cancel">{{closeText}}</button>
+ <button class="confirm">{{closeText}}</button>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/57093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1397b6e893eab54a23f43f644559d198e5e6cb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
