jenkins-bot has submitted this change and it was merged.
Change subject: Update reference drawer styling
......................................................................
Update reference drawer styling
Change-Id: I77bfc15ca3aa2c9b918b3061144bf98437b1eb3a
---
M javascripts/modules/references/ReferencesDrawerBeta.js
M less/icons.less
M less/iconsNew.less
M less/images/cancel-light.png
M less/images/cancel-light.svg
D less/images/cite.png
D less/images/cite.svg
A less/images/icons/cite.png
A less/images/icons/cite.svg
M less/modules/references.less
10 files changed, 191 insertions(+), 65 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/references/ReferencesDrawerBeta.js
b/javascripts/modules/references/ReferencesDrawerBeta.js
index a2dead2..acf9941 100644
--- a/javascripts/modules/references/ReferencesDrawerBeta.js
+++ b/javascripts/modules/references/ReferencesDrawerBeta.js
@@ -15,7 +15,7 @@
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).toHtmlString(),
citation: new Icon( {
- name: 'citation', additionalClassNames: 'text',
+ name: 'citation', additionalClassNames: 'text
icon-16px',
hasText: true,
label: mw.msg(
'mobile-frontend-references-citation' )
} ).toHtmlString()
diff --git a/less/icons.less b/less/icons.less
index 036fe63..0431be9 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -231,3 +231,7 @@
.icon-arrow-up {
.background-image('images/hide.png');
}
+
+.icon-citation {
+ .background-image-svg-quick( 'images/icons/cite' );
+}
diff --git a/less/iconsNew.less b/less/iconsNew.less
index 62950f3..e206998 100644
--- a/less/iconsNew.less
+++ b/less/iconsNew.less
@@ -167,6 +167,10 @@
.m-background-image-svg-quick( 'images/icons/editToggle' );
}
+.mw-ui-icon-citation {
+ .m-background-image-svg-quick( 'images/icons/cite' );
+}
+
// FIXME: Find better workaround for this
span.mw-ui-icon {
// a block inside an inline element is never a good idea - effects line
height of mobile diff bytesadded class
diff --git a/less/images/cancel-light.png b/less/images/cancel-light.png
index ccd3899..4ff2fc4 100644
--- a/less/images/cancel-light.png
+++ b/less/images/cancel-light.png
Binary files differ
diff --git a/less/images/cancel-light.svg b/less/images/cancel-light.svg
index 475bd73..f91bb96 100644
--- a/less/images/cancel-light.svg
+++ b/less/images/cancel-light.svg
@@ -1 +1,63 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg
xmlns="http://www.w3.org/2000/svg"; width="22.861" height="22.837"><path
d="M19.649.001c-.097.005-.203.047-.281.125l-8.031
8-7.844-7.844c-.157-.157-.39-.172-.531-.031l-2.687
2.688c-.141.141-.125.375.031.531l7.844 7.844-8.021
8.021c-.157.157-.172.421-.031.562l2.687
2.656c.141.141.375.125.531-.031l8.021-8.021 8.209
8.209c.157.157.39.172.531.031l2.688-2.688c.141-.141.125-.375-.031-.531l-8.209-8.209
8.031-8.031c.157-.157.172-.39.031-.531l-2.688-2.656c-.07-.07-.153-.099-.25-.094z"
fill-opacity=".533"/><path d="M19.649.657c-.077 0-.16.035-.219.094l-8.094
8.094-7.906-7.906c-.118-.118-.32-.118-.438 0l-1.687 1.688c-.118.118-.118.32 0
.437l7.906 7.906-8.094 8.094c-.118.118-.118.32 0 .437l1.719
1.688c.118.118.289.118.406 0l8.094-8.094 8.281 8.281c.118.118.32.118.438
0l1.688-1.719c.118-.118.118-.289 0-.406l-8.281-8.281
8.094-8.094c.118-.118.118-.32
0-.437l-1.688-1.688c-.059-.059-.142-.094-.219-.094z" fill="#fff"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="24"
+ height="23.975834"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="cancel-light.svg">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="751"
+ id="namedview8"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="14.614634"
+ inkscape:cx="8.9310032"
+ inkscape:cy="16.323301"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <path
+ d="M 20.627294,5.7568232e-4 C 20.525459,0.00582568 20.414175,0.04991868
20.332287,0.13180648 L 11.90097,8.530578 3.6659744,0.29558249 C
3.5011485,0.13075658 3.2565343,0.11500888 3.108506,0.26303725 L
0.28756856,3.0850245 C 0.13954021,3.2330529 0.15633776,3.4787169
0.3201138,3.642493 l 8.2349955,8.234996 -8.42081832,8.420818 c
-0.16482589,0.164826 -0.18057359,0.441986 -0.0325452,0.590014 l
2.82093732,2.788392 c 0.1480284,0.148028 0.3936925,0.131231 0.5574685,-0.03254
l 8.4208184,-8.420819 8.618189,8.61819 c 0.164826,0.164826 0.409441,0.180573
0.557469,0.03254 l 2.821987,-2.821987 c 0.148028,-0.148028 0.131231,-0.393693
-0.03254,-0.557469 l -8.61819,-8.618189 8.431317,-8.4313172 c
0.164826,-0.1648259 0.180574,-0.4094401 0.03255,-0.5574684 L
20.889755,0.09926118 c -0.07349,-0.073489 -0.160626,-0.1039348
-0.262461,-0.0986849977 z"
+ id="path4"
+ inkscape:connector-curvature="0"
+ style="fill-opacity:0.53299997" />
+ <path
+ d="m 20.627294,0.68927491 c -0.08084,0 -0.167976,0.0367446
-0.229917,0.0986856 L 11.89992,9.2854176 3.5998341,0.98533161 c
-0.1238819,-0.12388188 -0.3359509,-0.12388188 -0.4598327,0 L
1.3689104,2.7574724 c -0.1238819,0.1238819 -0.1238819,0.3359509 0,0.4587829 l
8.300086,8.3000867 -8.4974571,8.497457 c -0.1238819,0.123882
-0.1238819,0.335951 0,0.458783 l 1.804686,1.77214 c 0.1238819,0.123882
0.3034056,0.123882 0.4262377,0 l 8.497457,-8.497457 8.693779,8.693779 c
0.123881,0.123882 0.33595,0.123882 0.459832,0 l 1.772141,-1.804686 c
0.123882,-0.123882 0.123882,-0.303406 0,-0.426238 l -8.693778,-8.693778
8.497457,-8.4974578 c 0.123882,-0.1238819 0.123882,-0.3359509 0,-0.4587829 L
20.85721,0.78796047 c -0.06194,-0.0619409 -0.149078,-0.0986856
-0.229916,-0.0986856 z"
+ id="path6"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" />
+</svg>
diff --git a/less/images/cite.png b/less/images/cite.png
deleted file mode 100644
index 29d4f90..0000000
--- a/less/images/cite.png
+++ /dev/null
Binary files differ
diff --git a/less/images/cite.svg b/less/images/cite.svg
deleted file mode 100644
index e4218d4..0000000
--- a/less/images/cite.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 24 24" enable-background="new 0 0 24 24"
xml:space="preserve">
-<g>
- <path fill="none" d="M14,12l-2-2l-2,2V6H8v13h8c0,0,1,0,1-1V6h-3V12z"/>
- <path fill="#575757" d="M5,4v17h12c1,0,2-1,2-2V4H5z
M17,18c0,1-1,1-1,1H8V6h2v6l2-2l2,2V6h3V18z"/>
-</g>
-</svg>
diff --git a/less/images/icons/cite.png b/less/images/icons/cite.png
new file mode 100644
index 0000000..1e174ec
--- /dev/null
+++ b/less/images/icons/cite.png
Binary files differ
diff --git a/less/images/icons/cite.svg b/less/images/icons/cite.svg
new file mode 100644
index 0000000..ab3fedb
--- /dev/null
+++ b/less/images/icons/cite.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ width="24"
+ height="29.142857"
+ viewBox="0 0 12 14.571428"
+ enable-background="new 0 0 24 24"
+ xml:space="preserve"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="cite.svg"><metadata
+ id="metadata13"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
+ id="defs11" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="751"
+ id="namedview9"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="4.9166667"
+ inkscape:cx="14.20339"
+ inkscape:cy="17.59322"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" /><g
+ id="g3"
+ transform="matrix(0.85714286,0,0,0.85714286,-4.2857143,-3.4285714)"><path
+ d="m 14,12 -2,-2 -2,2 V 6 H 8 v 13 h 8 c 0,0 1,0 1,-1 V 6 h -3 v 6 z"
+ id="path5"
+ inkscape:connector-curvature="0"
+ style="fill:none" /><path
+ d="m 5,4 v 17 h 12 c 1,0 2,-1 2,-2 V 4 H 5 z m 12,14 c 0,1 -1,1 -1,1 H
8 V 6 h 2 v 6 l 2,-2 2,2 V 6 h 3 v 12 z"
+ id="path7"
+ inkscape:connector-curvature="0"
+ style="fill:#575757" /></g></svg>
\ No newline at end of file
diff --git a/less/modules/references.less b/less/modules/references.less
index 8d04fb2..074cfa0 100644
--- a/less/modules/references.less
+++ b/less/modules/references.less
@@ -1,26 +1,28 @@
@import "minerva.variables";
@import "minerva.mixins";
-.references {
- h3 {
- margin: 0;
- padding-right: 4px;
- display: inline;
- }
+.stable {
+ .references {
+ h3 {
+ margin: 0;
+ padding-right: 4px;
+ display: inline;
+ }
- .mw-cite-backlink {
- display: none;
- }
+ .mw-cite-backlink {
+ display: none;
+ }
- // FIXME: Remove when mw-ui-icon in stable
- .icon {
- float: right;
- margin-top: .7em;
- }
+ // FIXME: Remove when mw-ui-icon in stable
+ .icon {
+ float: right;
+ margin-top: .7em;
+ }
- .mw-ui-icon {
- float: right;
- line-height: normal;
+ .mw-ui-icon {
+ float: right;
+ line-height: normal;
+ }
}
}
@@ -35,48 +37,31 @@
font-size: 1em;
}
+ a {
+ background-image: none;
+ color: #5880C0;
+ }
+
.cite {
- clear: both;
padding-bottom: 20px;
- .icon {
- margin: 0;
- }
-
- .text {
- .background-image('../images/cite.svg');
- background-size: 24px 24px;
- background-repeat: no-repeat;
- color: @colorGray8;
- cursor: default;
- font-size: 0.75em;
- float: left;
- padding: 8px 0 0 24px;
- text-transform: uppercase;
- &.mw-ui-icon:before {
- margin-right: 0;
- width: 0;
- }
- }
- .cancel {
- background-size: 12px 12px;
- float: right;
- line-height: normal;
- height: 12px;
- width: 12px;
- &.mw-ui-icon {
- min-width: 12px;
- }
- &.mw-ui-icon:before {
- background-size: 12px 12px;
- margin: 0;
- min-height: 12px;
- }
- }
&:after {
content: "";
display: table;
clear: both;
+ }
+
+ .text {
+ color: @colorGray8;
+ cursor: default;
+ letter-spacing: .2em;
+ float: left;
+ font-size: 0.75em;
+ text-transform: uppercase;
+ }
+ .cancel {
+ float: right;
+ line-height: normal;
}
}
@@ -85,7 +70,29 @@
}
.reference-text {
- line-height: 1.2;
+ line-height: 1.4;
}
}
}
+
+.alpha {
+ .drawer.references {
+ .cite {
+ .text {
+ line-height: 2.5em;
+ height: 2em;
+ }
+ }
+ }
+}
+
+.beta {
+ .drawer.references {
+ .cite {
+ .text {
+ padding: .75em 0 0 2.5em;
+ }
+ }
+ }
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/171612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77bfc15ca3aa2c9b918b3061144bf98437b1eb3a
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Bmansurov <[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
