jenkins-bot has submitted this change and it was merged.
Change subject: Nag overlay fixes
......................................................................
Nag overlay fixes
Fixes a regression causing the image preview not to be shown. Updates in
colors, copy text order from design.
Change-Id: I0e8507b9311f83d1ac99fd4541a1d62028a2aa05
---
M javascripts/modules/mf-photo.js
M less/common/overlays.less
M less/modules/mf-photo.less
M stylesheets/common/overlays.css
A stylesheets/modules/images/confirmChecked.png
M stylesheets/modules/mf-photo.css
6 files changed, 12 insertions(+), 9 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/mf-photo.js b/javascripts/modules/mf-photo.js
index f1aee9a..09c81e7 100644
--- a/javascripts/modules/mf-photo.js
+++ b/javascripts/modules/mf-photo.js
@@ -582,7 +582,7 @@
switch ( nagCount ) {
case 0:
- nagMessages = $.map( [1, 2], function(
val ) {
+ nagMessages = $.map( [2, 1], function(
val ) {
// Give grep a chance to find
the usages:
//
mobile-frontend-photo-nag-1-bullet-1-heading,
mobile-frontend-photo-nag-1-bullet-2-heading,
//
mobile-frontend-photo-nag-1-bullet-1-text,
mobile-frontend-photo-nag-1-bullet-2-text
diff --git a/less/common/overlays.less b/less/common/overlays.less
index 3233ecd..7500b2a 100644
--- a/less/common/overlays.less
+++ b/less/common/overlays.less
@@ -42,9 +42,10 @@
top: 0;
left: 0;
right: 0;
- // use min-height instead of bottom 0 so that overlay expands when
there's
- // more content
- min-height: 100%;
+ // use height instead of bottom 0 so that overlay expands when there's
+ // more content, don't use min-height because of
+ //
http://stackoverflow.com/questions/3808512/the-inherited-height-of-a-child-div-from-a-parent-with-a-min-height-attribute
+ height: 100%;
background-color: white;
z-index: 4;
diff --git a/less/modules/mf-photo.less b/less/modules/mf-photo.less
index 2ccff39..da1e51a 100644
--- a/less/modules/mf-photo.less
+++ b/less/modules/mf-photo.less
@@ -127,8 +127,9 @@
.background-size( 24px, 24px );
&.checked {
- background-color: #8cc63e;
- border-color: #d6df23;
+ background-color: #006398;
+ background-image: url(images/confirmChecked.png);
+ border-color: #006398;
}
}
diff --git a/stylesheets/common/overlays.css b/stylesheets/common/overlays.css
index dd677f6..e5a68ba 100644
--- a/stylesheets/common/overlays.css
+++ b/stylesheets/common/overlays.css
@@ -32,7 +32,7 @@
top: 0;
left: 0;
right: 0;
- min-height: 100%;
+ height: 100%;
background-color: white;
z-index: 4;
}
diff --git a/stylesheets/modules/images/confirmChecked.png
b/stylesheets/modules/images/confirmChecked.png
new file mode 100644
index 0000000..3bab09d
--- /dev/null
+++ b/stylesheets/modules/images/confirmChecked.png
Binary files differ
diff --git a/stylesheets/modules/mf-photo.css b/stylesheets/modules/mf-photo.css
index f1047da..7dcea74 100644
--- a/stylesheets/modules/mf-photo.css
+++ b/stylesheets/modules/mf-photo.css
@@ -136,8 +136,9 @@
display: none;
}
.photo-nag label div.checked {
- background-color: #8cc63e;
- border-color: #d6df23;
+ background-color: #006398;
+ background-image: url(images/confirmChecked.png);
+ border-color: #006398;
}
.photo-nag strong {
padding: .3em 0;
--
To view, visit https://gerrit.wikimedia.org/r/68038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e8507b9311f83d1ac99fd4541a1d62028a2aa05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
