r113773 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113772‎ | r113773 | r113774 >
Date:22:33, 13 March 2012
Author:awjrichards
Status:ok
Tags:
Comment:
Revert r113768, merge included bad rev r113463
Modified paths:
  • /branches/wmf/1.19wmf1/extensions/MobileFrontend (modified) (history)
  • /branches/wmf/1.19wmf1/extensions/MobileFrontend/api/ApiQueryExcerpts.php (modified) (history)
  • /branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/beta_common.css (modified) (history)
  • /branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/common.css (modified) (history)
  • /branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/extensions/MobileFrontend/api/ApiQueryExcerpts.php
@@ -197,7 +197,7 @@
198198
199199 public function getExamples() {
200200 return array(
201 - 'api.php?action=query&prop=excerpts&exlength=175&titles=Therion' => 'Get a 175-character excerpt',
 201+ 'api.php?action=query&prop=excerpt&length=175&titles=Therion' => 'Get a 175-character excerpt',
202202 );
203203 }
204204
Index: branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/common.css
@@ -526,7 +526,6 @@
527527 -moz-border-radius: 5px;
528528 background: #f9f9f9;
529529 margin-bottom: 10px;
530 - text-align: center;
531530 }
532531
533532 .thumb .thumbinner[style] {
@@ -626,7 +625,7 @@
627626 height: 25px;
628627 width: 27px;
629628 padding-bottom: 0;
630 - text-indent: -999px;
 629+ text-indent: 999px;
631630 }
632631
633632 html[dir="rtl"] .goButton {
Index: branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/beta_common.css
@@ -1,8 +1,8 @@
22 html,
3 -body {
4 - margin: 0;
5 - padding: 0;
6 - height: 100%;
 3+body {
 4+ margin: 0;
 5+ padding: 0;
 6+ height: 100%;
77 }
88
99 html {
@@ -106,16 +106,38 @@
107107 text-align: center;
108108 }
109109
 110+.suggestions-results {
 111+ font-size: 1.4em;
 112+ cursor: pointer;
 113+ margin: 0;
 114+ padding: 0;
 115+}
 116+
 117+.suggestions-results hr {
 118+ margin: 0;
 119+}
 120+
 121+.suggestions-result {
 122+ color: black;
 123+ margin: 0;
 124+ line-height: 2.6em;
 125+ padding: 0.01em 0.25em;
 126+ postion: relative;
 127+ border-bottom: solid 1px #999999;
 128+}
 129+
110130 .suggestions-result a {
111131 text-decoration: none;
112132 color: #666;
113133 }
114 -
 134+.suggestions-result a:link {
 135+ text-decoration: none;
 136+ color:#666;
 137+}
115138 .suggestions-result a:visited {
116139 text-decoration: none;
117140 color:#666;
118141 }
119 -
120142 .suggestions-result a:hover {
121143 text-decoration: none;
122144 color:#666;
@@ -124,11 +146,9 @@
125147 text-decoration: none;
126148 color:#666;
127149 }
128 -
129150 .suggestions-result:hover {
130151 background-color: #ACD1E9;
131152 }
132 -
133153 a.sq-val-update {
134154 font-size: 1.3em;
135155 display: block;
@@ -140,15 +160,15 @@
141161 width: 1.5em;
142162 text-align: center;
143163 }
144 -
 164+a.sq-val-update:link {
 165+ text-decoration: none;
 166+}
145167 a.sq-val-update:visited {
146168 text-decoration: none;
147169 }
148 -
149170 a.sq-val-update:hover {
150171 text-decoration: none;
151172 }
152 -
153173 a.sq-val-update:active {
154174 text-decoration: none;
155175 }
@@ -498,7 +518,6 @@
499519 -moz-border-radius: 5px;
500520 background: #f9f9f9;
501521 margin-bottom: 10px;
502 - text-align: center;
503522 }
504523
505524 .thumb .thumbinner[style] {
@@ -591,7 +610,7 @@
592611 height: 25px;
593612 width: 27px;
594613 padding-bottom: 0;
595 - text-indent: -999px;
 614+ text-indent: 999px;
596615 }
597616
598617 html[dir="rtl"] .goButton {
@@ -766,19 +785,11 @@
767786 position: relative;
768787 border-bottom: solid 1px #999;
769788 font-size: 1.4em;
770 - cursor: pointer;
771 - margin: 0;
772789 }
773790
774791 .full-screen-search .suggestions-result {
775792 line-height: 2.6em;
776793 border: none;
777 - color: black;
778 - margin: 0;
779 - line-height: 2.6em;
780 - padding: 0.01em 0.25em;
781 - position: relative;
782 - border-bottom: solid 1px #999999;
783794 }
784795
785796 .full-screen-search .suggestions-result a:visited {
@@ -830,3 +841,13 @@
831842 .full-screen-search #nav {
832843 display: none !important;
833844 }
 845+
 846+#placeholder {
 847+ position: absolute;
 848+ left: 38px;
 849+ z-index: 2;
 850+ top: 0;
 851+ color: #666;
 852+ font-size: 16px;
 853+ padding-top: 10px;
 854+}
Index: branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php
@@ -51,10 +51,10 @@
5252 <head>
5353 <title>{$this->data['htmlTitle']}</title>
5454 <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
55 - <link href='{$this->data['wgExtensionAssetsPath']}/MobileFrontend/stylesheets/{$betaPrefix}common.css?version=1331257310' media='all' rel='Stylesheet' type='text/css' />
56 - <link href='{$this->data['wgExtensionAssetsPath']}/MobileFrontend/stylesheets/{$cssFileName}.css?version=1331257310' media='all' rel='Stylesheet' type='text/css' />
 55+ <link href='{$this->data['wgExtensionAssetsPath']}/MobileFrontend/stylesheets/{$betaPrefix}common.css?version=1331676342' media='all' rel='Stylesheet' type='text/css' />
 56+ <link href='{$this->data['wgExtensionAssetsPath']}/MobileFrontend/stylesheets/{$cssFileName}.css?version=1331676342' media='all' rel='Stylesheet' type='text/css' />
5757 {$filePageStyle}
58 - <meta name="viewport" content="max-width=device-width, initial-scale=1.0">
 58+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
5959 {$appleTouchIconTag}
6060 {$jQueryScript}
6161 <script type='text/javascript'>
Property changes on: branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php
___________________________________________________________________
Modified: svn:mergeinfo
6262 Reverse-merged /trunk/extensions/MobileFrontend/templates/ApplicationTemplate.php:r113463,113471-113472,113486,113512,113553
6363 Merged /trunk/extensions/MobileFrontend/templates/ApplicationTemplate.php:r113771
Property changes on: branches/wmf/1.19wmf1/extensions/MobileFrontend
___________________________________________________________________
Modified: svn:mergeinfo
6464 Reverse-merged /trunk/extensions/MobileFrontend:r113463,113471-113472,113486,113512,113553

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r113463use max-width for viewport not width...jdlrobson11:03, 9 March 2012
r113768MFT r113463, r113471, r113472, r113486, r113512, r113553awjrichards22:01, 13 March 2012

Status & tagging log