| Index: trunk/extensions/MobileFrontend2/MobileFrontend2_Hooks.php |
| — | — | @@ -51,10 +51,10 @@ |
| 52 | 52 | |
| 53 | 53 | $section = "<div section_id=\"$i\" id=\"section-$i\" class=\"mf2-section-container\">" |
| 54 | 54 | . substr( $section, 0, $headerLength ) |
| 55 | | - . '<div class="content_block">' |
| 56 | | - . substr( $section, $headerLength ) |
| 57 | | - . '<div class="section_anchors">' |
| 58 | | - . '<a href="#section-' . $i . '" class="back_to_top">' |
| | 55 | + . '<div class="mf2-content-block">' |
| | 56 | + . substr( $section, $headerLength ) . "\n\n" |
| | 57 | + . '<div class="mf2-section-anchor">' |
| | 58 | + . '<a href="#section-' . $i . '">' |
| 59 | 59 | . wfMessage( 'mobile-frontend2-back-to-top-of-section' )->escaped() |
| 60 | 60 | . '</a></div></div></div>'; |
| 61 | 61 | |
| Index: trunk/extensions/MobileFrontend2/skins/Mobile.php |
| — | — | @@ -169,9 +169,9 @@ |
| 170 | 170 | <div id="header"> |
| 171 | 171 | <div id="searchbox"> |
| 172 | 172 | <?php if ( !MobileFrontend2_Options::getHideLogo() ): ?> |
| 173 | | - <img src="<?php $this->text( 'mobilelogopath' ) ?>" alt="Logo" id="logo" width="35" height="22" /> |
| | 173 | + <img src="<?php $this->text( 'mobilelogopath' ) ?>" alt="Logo" id="mf2-logo" width="35" height="22" /> |
| 174 | 174 | <?php endif ?> |
| 175 | | - <form action="<?php $this->text( 'wgScript' ) ?>" class="search_bar" method="get"> |
| | 175 | + <form action="<?php $this->text( 'wgScript' ) ?>" class="mf2-search-bar" method="get"> |
| 176 | 176 | <input type="hidden" name="title" value="Special:Search" /> |
| 177 | 177 | |
| 178 | 178 | <div id="sq" class="divclearable"> |
| — | — | @@ -206,18 +206,16 @@ |
| 207 | 207 | <?php if ( !MobileFrontend2_Options::getHideFooter() ): ?> |
| 208 | 208 | <!-- footer --> |
| 209 | 209 | <div id="footer"> |
| 210 | | - <div class="nav" id="footmenu"> |
| 211 | | - <div class="mwm-notice"> |
| 212 | | - <a href="#"><?php $this->msg( 'mobile-frontend2-regular-site' ) ?></a> | <a href="#"><?php $this->msg( 'mobile-frontend2-disable-images' ) ?></a> |
| | 210 | + <div id="innerFooter"> |
| | 211 | + <a href="#"><?php $this->msg( 'mobile-frontend2-regular-site' ) ?></a> | <a href="#"><?php $this->msg( 'mobile-frontend2-disable-images' ) ?></a> |
| 213 | 212 | |
| 214 | | - <div id="perm"> |
| 215 | | - <a href="#"><?php $this->msg( 'mobile-frontend2-perm-stop-redirect' ) ?></a> |
| 216 | | - </div> |
| | 213 | + <div id="perm"> |
| | 214 | + <a href="#"><?php $this->msg( 'mobile-frontend2-perm-stop-redirect' ) ?></a> |
| 217 | 215 | </div> |
| 218 | | - <div id="copyright"> |
| 219 | | - <?php $this->msg( 'mobile-frontend2-copyright' ) ?> |
| 220 | | - </div> |
| 221 | 216 | </div> |
| | 217 | + <div id="copyright"> |
| | 218 | + <?php $this->msg( 'mobile-frontend2-copyright' ) ?> |
| | 219 | + </div> |
| 222 | 220 | </div> |
| 223 | 221 | <?php endif ?> |
| 224 | 222 | |
| Index: trunk/extensions/MobileFrontend2/modules/zepto/zepto.mw.js |
| — | — | @@ -3,6 +3,35 @@ |
| 4 | 4 | |
| 5 | 5 | // Add a few things missing from jQuery |
| 6 | 6 | (function ( $ ){ |
| | 7 | + // [[Class]] -> type pairs |
| | 8 | + var class2type = {}; |
| | 9 | + |
| | 10 | + $.type = function( obj ) { |
| | 11 | + return obj == null ? |
| | 12 | + String( obj ) : |
| | 13 | + class2type[ toString.call(obj) ] || "object"; |
| | 14 | + }; |
| | 15 | + |
| | 16 | + $.merge = function( first, second ) { |
| | 17 | + var i = first.length, |
| | 18 | + j = 0; |
| | 19 | + |
| | 20 | + if ( typeof second.length === "number" ) { |
| | 21 | + for ( var l = second.length; j < l; j++ ) { |
| | 22 | + first[ i++ ] = second[ j ]; |
| | 23 | + } |
| | 24 | + |
| | 25 | + } else { |
| | 26 | + while ( second[j] !== undefined ) { |
| | 27 | + first[ i++ ] = second[ j++ ]; |
| | 28 | + } |
| | 29 | + } |
| | 30 | + |
| | 31 | + first.length = i; |
| | 32 | + |
| | 33 | + return first; |
| | 34 | + }; |
| | 35 | + |
| 7 | 36 | $.isPlainObject = function( obj ) { |
| 8 | 37 | // Must be an Object. |
| 9 | 38 | // Because of IE, we also have to check the presence of the constructor property. |
| — | — | @@ -43,4 +72,22 @@ |
| 44 | 73 | } |
| 45 | 74 | return true; |
| 46 | 75 | }; |
| | 76 | + |
| | 77 | + $.makeArray = function( array, results ) { |
| | 78 | + var ret = results || []; |
| | 79 | + |
| | 80 | + if ( array != null ) { |
| | 81 | + // The window, strings (and functions) also have 'length' |
| | 82 | + // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 |
| | 83 | + var type = jQuery.type( array ); |
| | 84 | + |
| | 85 | + if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { |
| | 86 | + push.call( ret, array ); |
| | 87 | + } else { |
| | 88 | + jQuery.merge( ret, array ); |
| | 89 | + } |
| | 90 | + } |
| | 91 | + |
| | 92 | + return ret; |
| | 93 | + }; |
| 47 | 94 | })( Zepto ); |
| \ No newline at end of file |
| Index: trunk/extensions/MobileFrontend2/modules/ext.mobileFrontend2/ext.mobileFrontend2.css |
| — | — | @@ -1,376 +1,6 @@ |
| 2 | | -.clearlink { |
| 3 | | - /* @embed */ |
| 4 | | - background: url(images/close-button.png) no-repeat scroll 0 0 transparent; |
| 5 | | - background-position: center center; |
| 6 | | - cursor: pointer; |
| 7 | | - zoom: 1; |
| 8 | | - position: absolute; |
| 9 | | - right: 0.25em; |
| 10 | | - top: 50%; |
| 11 | | - margin: 1px; |
| 12 | | - height: 12px; |
| 13 | | - width: 12px; |
| 14 | | - margin-top: -6px; |
| 15 | | - z-index: 2; |
| 16 | | - border: 0px solid; |
| 17 | | - display: none; |
| 18 | | -} |
| | 2 | +/* CSS For MobileFrontend2 */ |
| 19 | 3 | |
| 20 | | -#zero-rated-banner { |
| 21 | | - position: relative; |
| 22 | | - height: 20px; |
| 23 | | - width: 100%; |
| 24 | | - z-index: 99; |
| 25 | | - background: #F4A83D; |
| 26 | | - display: block; |
| 27 | | - border-bottom: 1px solid #D6800C; |
| 28 | | - padding: 7px 0; |
| 29 | | - font-size: 130%; |
| 30 | | - font-weight: bold; |
| 31 | | - text-align: center; |
| 32 | | - color: #735005; |
| 33 | | -} |
| 34 | | - |
| 35 | | -#zero-rated-banner a { |
| 36 | | - text-decoration: underline; |
| 37 | | - color: #735005; |
| 38 | | -} |
| 39 | | - |
| 40 | | -#zero-rated-banner-red { |
| 41 | | - position: relative; |
| 42 | | - height: 20px; |
| 43 | | - width: 100%; |
| 44 | | - z-index: 99; |
| 45 | | - background: #FF0000; |
| 46 | | - display: block; |
| 47 | | - border-bottom: 1px solid #D6800C; |
| 48 | | - padding: 7px 0; |
| 49 | | - font-size: 130%; |
| 50 | | - font-weight: bold; |
| 51 | | - text-align: center; |
| 52 | | - color: #735005; |
| 53 | | -} |
| 54 | | - |
| 55 | | -#zero-rated-banner span.notify-close { |
| 56 | | - background-color: #FAD163; |
| 57 | | - float: right; |
| 58 | | - margin-right: 20px; |
| 59 | | - border: 2px solid #735005; |
| 60 | | - padding-left: 4px; |
| 61 | | - padding-right: 4px; |
| 62 | | - text-decoration: none; |
| 63 | | - display: block; |
| 64 | | - cursor: pointer; |
| 65 | | - height: 18px; |
| 66 | | - display: table-cell; |
| 67 | | - vertical-align: middle; |
| 68 | | - text-align: center; |
| 69 | | -} |
| 70 | | - |
| 71 | | -#zero-rated-banner span.notify-close a { |
| 72 | | - text-decoration: none; |
| 73 | | -} |
| 74 | | - |
| 75 | | -#zero-rated-banner-red #zero-rated-banner-text { |
| 76 | | - margin: 0px; |
| 77 | | - color: #ffffff; |
| 78 | | - font-weight: bold; |
| 79 | | - text-align: center; |
| 80 | | -} |
| 81 | | - |
| 82 | | -#zero-rated-banner-red a { |
| 83 | | - text-decoration: underline; |
| 84 | | - color: #ffffff; |
| 85 | | -} |
| 86 | | - |
| 87 | | -#zero-rated-banner-text { |
| 88 | | - margin: 0px; |
| 89 | | - color: #735005; |
| 90 | | - font-weight: bold; |
| 91 | | - text-align: center; |
| 92 | | -} |
| 93 | | - |
| 94 | | -.suggestions-results { |
| 95 | | - font-size: 1.2em; |
| 96 | | - cursor: pointer; |
| 97 | | -} |
| 98 | | - |
| 99 | | -.suggestions-result { |
| 100 | | - color: black; |
| 101 | | - color: WindowText; |
| 102 | | - margin: 0; |
| 103 | | - line-height: 1.8em; |
| 104 | | - padding: 0.01em 0.25em; |
| 105 | | - text-align: left; |
| 106 | | - postion: relative; |
| 107 | | - border-bottom: solid 1px #999999; |
| 108 | | -} |
| 109 | | - |
| 110 | | -.suggestions-result a { |
| 111 | | - text-decoration: none; |
| 112 | | - color: #000000; |
| 113 | | -} |
| 114 | | -.suggestions-result a:link { |
| 115 | | - text-decoration: none; |
| 116 | | - color:#000000; |
| 117 | | -} |
| 118 | | -.suggestions-result a:visited { |
| 119 | | - text-decoration: none; |
| 120 | | - color:#000000; |
| 121 | | -} |
| 122 | | -.suggestions-result a:hover { |
| 123 | | - text-decoration: none; |
| 124 | | - color:#000000; |
| 125 | | -} |
| 126 | | -.suggestions-result a:active { |
| 127 | | - text-decoration: none; |
| 128 | | - color:#000000; |
| 129 | | -} |
| 130 | | -.suggestions-result:hover { |
| 131 | | - background-color: #ACD1E9; |
| 132 | | -} |
| 133 | | -a.sq-val-update { |
| 134 | | - font-size: 1.3em; |
| 135 | | - display: block; |
| 136 | | - font-weight: normal; |
| 137 | | - text-decoration: none; |
| 138 | | - color: #000000; |
| 139 | | - position: absolute; |
| 140 | | - right: 0; |
| 141 | | - width: 1.5em; |
| 142 | | - text-align: center; |
| 143 | | -} |
| 144 | | -a.sq-val-update:link { |
| 145 | | - text-decoration: none; |
| 146 | | - color:#000000; |
| 147 | | -} |
| 148 | | -a.sq-val-update:visited { |
| 149 | | - text-decoration: none; |
| 150 | | - color:#000000; |
| 151 | | -} |
| 152 | | -a.sq-val-update:hover { |
| 153 | | - text-decoration: none; |
| 154 | | - color:#000000; |
| 155 | | -} |
| 156 | | -a.sq-val-update:active { |
| 157 | | - text-decoration: none; |
| 158 | | - color:#000000; |
| 159 | | -} |
| 160 | | - |
| 161 | | -a.search-result-item { |
| 162 | | - display: block; |
| 163 | | - margin-right: 2em; |
| 164 | | -} |
| 165 | | - |
| 166 | | -#results { |
| 167 | | - display: none; |
| 168 | | - background-color: #ffffff; |
| 169 | | - border-top: none; |
| 170 | | - border-left: 1px solid #888; |
| 171 | | - border-right: 1px solid #888; |
| 172 | | - border-bottom: 1px solid #888; |
| 173 | | - z-index: 2; |
| 174 | | - position: absolute; |
| 175 | | -} |
| 176 | | - |
| 177 | | -#search { |
| 178 | | - -webkit-appearance: none; |
| 179 | | - border-top-width: 0px; |
| 180 | | - border-right-width: 0px; |
| 181 | | - border-bottom-width: 0px; |
| 182 | | - border-left-width: 0px; |
| 183 | | - outline-style: none; |
| 184 | | - outline-width: initial; |
| 185 | | - outline-color: initial; |
| 186 | | - height: 1.4em; |
| 187 | | -} |
| 188 | | - |
| 189 | | -ul#footer-info { |
| 190 | | - list-style: none; |
| 191 | | - list-style-image: none; |
| 192 | | - list-style-type: none; |
| 193 | | - margin: 0; |
| 194 | | - padding: 0; |
| 195 | | -} |
| 196 | | - |
| 197 | | -.divclearable { |
| 198 | | - border: 1px solid #888; |
| 199 | | - display: -moz-inline-stack; |
| 200 | | - display: inline-block; |
| 201 | | - zoom: 1; |
| 202 | | - *display: inline; |
| 203 | | - vertical-align: middle; |
| 204 | | - height: 1.5em; |
| 205 | | - position: relative; |
| 206 | | -} |
| 207 | | - |
| 208 | | -#userloginForm table, #userloginForm .user-login tr, #userloginForm .user-login th, #userloginForm .user-login td { |
| 209 | | - width: 200px; |
| 210 | | - border: 0px; |
| 211 | | -} |
| 212 | | - |
| 213 | | -table { |
| 214 | | - border-spacing: 0 !important; |
| 215 | | - width: 100%; |
| 216 | | - border-collapse: collapse !important; |
| 217 | | - border: 1px solid #cccccc; |
| 218 | | - padding: 3px; |
| 219 | | - margin-bottom: 15px; |
| 220 | | -} |
| 221 | | - |
| 222 | | -table.gallery .thumb[style] { |
| 223 | | - border: 0; |
| 224 | | - padding: 0 !important; |
| 225 | | - width: auto !important; |
| 226 | | - margin: 0 auto; |
| 227 | | -} |
| 228 | | - |
| 229 | | -table.geography[style] td[style*="text-align"], table.geography[style] td[colspan="2"] { |
| 230 | | - text-align: left !important; |
| 231 | | - margin-left: 0 !important; |
| 232 | | - margin-right: 0 !important; |
| 233 | | -} |
| 234 | | - |
| 235 | | -table.toc h2 { |
| 236 | | - border: 0; |
| 237 | | - padding: 0; |
| 238 | | - margin-top: 5px; |
| 239 | | -} |
| 240 | | - |
| 241 | | -table.gallery th, table.gallery td { |
| 242 | | - display: block; |
| 243 | | - border: 0; |
| 244 | | - border-bottom: 1px solid #cccccc; |
| 245 | | -} |
| 246 | | - |
| 247 | | -table[style] { |
| 248 | | - width: 100% !important; |
| 249 | | - float: none !important; |
| 250 | | - margin-left: 0 !important; |
| 251 | | -} |
| 252 | | - |
| 253 | | -table.navbox td.navbox-group { |
| 254 | | - background: #ddddff; |
| 255 | | - width: 25%; |
| 256 | | - padding: 3px; |
| 257 | | -} |
| 258 | | - |
| 259 | | -table.gallery { |
| 260 | | - background: #f9f9f9; |
| 261 | | - border-bottom: 0; |
| 262 | | -} |
| 263 | | - |
| 264 | | -table.navbox { |
| 265 | | - font-size: 0.9em; |
| 266 | | - width: 100% !important; |
| 267 | | -} |
| 268 | | - |
| 269 | | -table.gallery .gallerytext { |
| 270 | | - margin-top: -12px; |
| 271 | | - text-align: center; |
| 272 | | -} |
| 273 | | - |
| 274 | | -table.navbox th.navbox-title { |
| 275 | | - background: #ccccff; |
| 276 | | - padding: 5px; |
| 277 | | -} |
| 278 | | - |
| 279 | | -table.navbox div[style*="padding"] { |
| 280 | | - padding-left: 0 !important; |
| 281 | | - padding-right: 0 !important; |
| 282 | | -} |
| 283 | | - |
| 284 | | -table.gallery .gallerybox[style] { |
| 285 | | - width: auto !important; |
| 286 | | - margin-bottom: -16px; |
| 287 | | -} |
| 288 | | - |
| 289 | | -table td, table th { |
| 290 | | - border: 1px solid #cccccc; |
| 291 | | - padding: 3px; |
| 292 | | -} |
| 293 | | - |
| 294 | | -.mwm-message.mwm-notice { |
| 295 | | - background: #FFFFFF; |
| 296 | | - font-size: 1.1em; |
| 297 | | - color: #000000; |
| 298 | | -} |
| 299 | | -.mwm-message.mwm-notice a { |
| 300 | | - text-decoration: underline; |
| 301 | | - font-weight: bold; |
| 302 | | - color: #000000; |
| 303 | | -} |
| 304 | | - |
| 305 | | -h3#sopa-notice { |
| 306 | | - color: #000000; |
| 307 | | - -webkit-margin-after: 0.5em; |
| 308 | | - margin: 0px; |
| 309 | | -} |
| 310 | | - |
| 311 | | -table table { |
| 312 | | - border: 0; |
| 313 | | -} |
| 314 | | - |
| 315 | | -table table td, table table th { |
| 316 | | - border: 0; |
| 317 | | -} |
| 318 | | - |
| 319 | | -table.toc { |
| 320 | | - background: #f9f9f9; |
| 321 | | -} |
| 322 | | - |
| 323 | | -table.navbox td.navbox-abovebelow { |
| 324 | | - padding: 3px; |
| 325 | | -} |
| 326 | | - |
| 327 | | -table.navbox td.navbox-group + td { |
| 328 | | - padding: 3px; |
| 329 | | -} |
| 330 | | - |
| 331 | | -table.navbox div[style*="padding"] a { |
| 332 | | - white-space: pre-wrap; |
| 333 | | -} |
| 334 | | - |
| 335 | | -table.navbox span[style*="white"] { |
| 336 | | - white-space: pre-wrap !important; |
| 337 | | -} |
| 338 | | - |
| 339 | | -table.navbox td, table.navbox th { |
| 340 | | - padding: 0; |
| 341 | | -} |
| 342 | | - |
| 343 | | -table.navbox table { |
| 344 | | - margin-bottom: 0; |
| 345 | | -} |
| 346 | | - |
| 347 | | -table.wikitable th { |
| 348 | | - background: #f3f3f3; |
| 349 | | -} |
| 350 | | - |
| 351 | | -table.infobox { |
| 352 | | - background: #f9f9f9; |
| 353 | | -} |
| 354 | | - |
| 355 | | -table.infobox th, table.infobox td { |
| 356 | | - border: 0; |
| 357 | | -} |
| 358 | | - |
| 359 | | -table.infobox td[colspan="3"], table.infobox th[colspan="3"] { |
| 360 | | - border: 1px solid #cccccc; |
| 361 | | -} |
| 362 | | - |
| 363 | | -table.geography[style] th { |
| 364 | | - text-align: left; |
| 365 | | -} |
| 366 | | - |
| 367 | | -table.geography[style] td[style*="text-align"] div[style], table.geography[style] td[colspan="2"] div[style] { |
| 368 | | - text-align: left !important; |
| 369 | | -} |
| 370 | | - |
| 371 | | -table.admin { |
| 372 | | - width: 300px; |
| 373 | | -} |
| 374 | | - |
| | 4 | +/* Basic styling */ |
| 375 | 5 | html { |
| 376 | 6 | font-size: 0.8em; |
| 377 | 7 | } |
| — | — | @@ -381,9 +11,10 @@ |
| 382 | 12 | background: white; |
| 383 | 13 | font-family: sans-serif; |
| 384 | 14 | -webkit-text-size-adjust: none; |
| | 15 | + margin: 0; |
| 385 | 16 | } |
| 386 | 17 | |
| 387 | | -p, li, dl, #featured_article { |
| | 18 | +p, li, dl { |
| 388 | 19 | line-height: 1.65; |
| 389 | 20 | } |
| 390 | 21 | |
| — | — | @@ -394,8 +25,10 @@ |
| 395 | 26 | h2 { |
| 396 | 27 | border-bottom: 1px solid #aaaaaa; |
| 397 | 28 | padding-top: 0.3em; |
| | 29 | + font-size: 1.3em; |
| 398 | 30 | } |
| 399 | 31 | |
| | 32 | +/* Links */ |
| 400 | 33 | a { |
| 401 | 34 | text-decoration: none; |
| 402 | 35 | color: #002bb8; |
| — | — | @@ -417,76 +50,19 @@ |
| 418 | 51 | color: red; |
| 419 | 52 | } |
| 420 | 53 | |
| 421 | | -a.back_to_top, a.back_to_top:visited { |
| 422 | | - margin-top: 7px; |
| 423 | | - color: blue; |
| 424 | | -} |
| 425 | | - |
| 426 | | -.links { |
| 427 | | - float: left; |
| 428 | | - padding: 10px; |
| 429 | | -} |
| 430 | | - |
| 431 | | -#contentSub, .dablink { |
| 432 | | - margin-bottom: 10px; |
| 433 | | -} |
| 434 | | - |
| | 54 | +/* Page Title */ |
| 435 | 55 | #firstHeading { |
| 436 | 56 | font-size: 1.7em; |
| 437 | 57 | } |
| 438 | 58 | |
| 439 | | -h2 { |
| 440 | | - font-size: 1.3em; |
| | 59 | +/* Jump back a section links */ |
| | 60 | +.mf2-section-anchor a, |
| | 61 | +.mf2-section-anchor a:visited { |
| | 62 | + margin-top: 7px; |
| | 63 | + color:blue; |
| 441 | 64 | } |
| 442 | 65 | |
| 443 | | -.section_anchors a { |
| 444 | | - display: block; |
| 445 | | -} |
| 446 | | - |
| 447 | | -.section_anchor { |
| 448 | | - height: 1px; |
| 449 | | - width: 1px; |
| 450 | | -} |
| 451 | | - |
| 452 | | -.printonly, .geo-multi-punct, .geo-nondefault { |
| 453 | | - display: none; |
| 454 | | -} |
| 455 | | - |
| 456 | | -#featured_article .noprint, .today .noprint { |
| 457 | | - display: none; |
| 458 | | -} |
| 459 | | - |
| 460 | | -.thumb { |
| 461 | | - border: 1px solid #cccccc; |
| 462 | | - -webkit-border-radius: 5px; |
| 463 | | - -moz-border-radius: 5px; |
| 464 | | - background: #f9f9f9; |
| 465 | | - margin-bottom: 10px; |
| 466 | | -} |
| 467 | | - |
| 468 | | -.thumb .thumbinner[style] { |
| 469 | | - margin: 5px auto; |
| 470 | | -} |
| 471 | | - |
| 472 | | -.thumb .thumbcaption { |
| 473 | | - width: 100%; |
| 474 | | - margin: 5px 10px 0; |
| 475 | | - text-align: center; |
| 476 | | - width: auto !important; |
| 477 | | -} |
| 478 | | - |
| 479 | | -img.thumbborder { |
| 480 | | - border: 1px solid #cccccc; |
| 481 | | -} |
| 482 | | - |
| 483 | | -.floatright { |
| 484 | | - float: right; |
| 485 | | -} |
| 486 | | - |
| 487 | | -body { |
| 488 | | - margin: 0; |
| 489 | | -} |
| 490 | | - |
| | 66 | +/* All the main content divs should be 8px from the side */ |
| 491 | 67 | #header { |
| 492 | 68 | margin: 8px 8px 0 8px; |
| 493 | 69 | } |
| — | — | @@ -498,89 +74,20 @@ |
| 499 | 75 | |
| 500 | 76 | #footer { |
| 501 | 77 | margin: 0 8px; |
| | 78 | + padding: 1em 0 5px; |
| 502 | 79 | } |
| 503 | 80 | |
| 504 | | -#header img, #header form, #header input, #header button { |
| 505 | | - vertical-align: middle; |
| 506 | | - display: inline-block; |
| 507 | | -} |
| 508 | | - |
| 509 | | -#searchbox { |
| 510 | | - width: auto; |
| | 81 | +#footer #innerFooter { |
| 511 | 82 | padding: 5px; |
| 512 | | - border: 1px solid #cccccc; |
| 513 | | - -webkit-border-radius: 2px; |
| 514 | | - -moz-border-radius: 2px; |
| 515 | | -} |
| 516 | | - |
| 517 | | -#searchbox a, #searchbox img { |
| 518 | | - border: 0px; |
| 519 | | - vertical-align: middle; |
| 520 | | -} |
| 521 | | - |
| 522 | | -#searchbox #goButton { |
| 523 | | - border: 0; |
| 524 | | - /* @embed */ |
| 525 | | - background: url(images/s.gif) no-repeat top left; |
| 526 | | - background-size: 27px 25px; |
| 527 | | - height: 25px; |
| 528 | | - width: 27px; |
| 529 | | -} |
| 530 | | - |
| 531 | | -#searchbox #searchField { |
| 532 | | - width: auto; |
| 533 | | -} |
| 534 | | - |
| 535 | | -#nav { |
| 536 | | - -webkit-border-radius: 2px; |
| 537 | | - -moz-border-radius: 2px; |
| 538 | | - clear: both; |
| 539 | | - padding: 5px 0; |
| 540 | | -} |
| 541 | | - |
| 542 | | -#nav form, #nav button { |
| 543 | | - display: inline-block; |
| 544 | | -} |
| 545 | | - |
| 546 | | -#nav button, |
| 547 | | -#disableButtons button { |
| 548 | | - /* @embed */ |
| 549 | | - background: url(images/buttonbg.gif) no-repeat center; |
| 550 | | - border: 0; |
| 551 | | - height: 23px; |
| 552 | | - width: 83px; |
| 553 | | -} |
| 554 | | - |
| 555 | | -#disableButtons { |
| 556 | | - text-align: center; |
| 557 | | -} |
| 558 | | - |
| 559 | | -#disableButtons #backButton { |
| 560 | | - margin-top: 5em; |
| 561 | | -} |
| 562 | | - |
| 563 | | -.mwm-notice { |
| 564 | | - padding: 5px; |
| 565 | 83 | background: #dddddd; |
| 566 | 84 | -webkit-border-radius: 5px; |
| 567 | 85 | margin-top: 5px; |
| 568 | 86 | text-align: center; |
| 569 | 87 | border: 1px solid grey; |
| 570 | | -} |
| 571 | | - |
| 572 | | -.mwm-message.mwm-notice { |
| 573 | 88 | font-size: 1.1em; |
| 574 | 89 | } |
| 575 | 90 | |
| 576 | | -#image_wrapper { |
| 577 | | - margin: 8px 0 8px -3px; |
| 578 | | -} |
| 579 | | - |
| 580 | | -#footer { |
| 581 | | - padding-top: 1em; |
| 582 | | -} |
| 583 | | - |
| 584 | | -#footer #perm { |
| | 91 | +#footer #innerFooter #perm { |
| 585 | 92 | padding-top: 2em; |
| 586 | 93 | font-size: 90%; |
| 587 | 94 | } |
| — | — | @@ -590,28 +97,17 @@ |
| 591 | 98 | font-size: 80%; |
| 592 | 99 | } |
| 593 | 100 | |
| 594 | | -ol.references > li:target, |
| 595 | | -sup.reference:target, |
| 596 | | -span.citation:target, cite:target { |
| 597 | | - background-color: #ddeeff; |
| 598 | | -} |
| 599 | | - |
| 600 | | -.content_block, |
| 601 | | -/*.section_anchors,*/ |
| 602 | | -button.section_heading.hide { |
| | 101 | +/* Hide the content block */ |
| | 102 | +.mf2-content-block { |
| 603 | 103 | display: none; |
| 604 | 104 | } |
| 605 | 105 | |
| 606 | | -#search:focus { |
| 607 | | - outline: none; |
| 608 | | -} |
| 609 | | - |
| 610 | 106 | /* Disable content folding on the main page */ |
| 611 | | -body.mainPage .section_anchors, |
| | 107 | +body.mainPage .mf2-section-anchor, |
| 612 | 108 | body.mainPage button.mf2-section-toggle { |
| 613 | 109 | display: none; |
| 614 | 110 | } |
| 615 | 111 | |
| 616 | | -body.mainPage .content_block { |
| | 112 | +body.mainPage .mf2-content-block { |
| 617 | 113 | display: block; |
| 618 | 114 | } |
| \ No newline at end of file |
| Index: trunk/extensions/MobileFrontend2/modules/ext.mobileFrontend2/ext.mobileFrontend2.js |
| — | — | @@ -90,14 +90,14 @@ |
| 91 | 91 | return; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | | - $r = $( '<div class="suggestions-results">' ); |
| | 94 | + $r = $( '<div class="suggestions">' ); |
| 95 | 95 | |
| 96 | 96 | $.each( results, function( i, title ) { |
| 97 | 97 | $( '<div class="suggestions-result">' ) |
| 98 | 98 | .attr( 'title', title ) |
| 99 | 99 | .attr( 'rel', i + 1 ) // ? |
| 100 | 100 | .append( |
| 101 | | - $( '<a class="sq-val-update">' ) |
| | 101 | + $( '<a class="suggestions-result-update">' ) |
| 102 | 102 | .text( '+' ) // Translate? |
| 103 | 103 | .click( mf2.updateSearchValue ) |
| 104 | 104 | ) |
| Index: trunk/extensions/MobileFrontend2/modules/ext.mobileFrontend2/ext.mobileFrontend2.search.css |
| — | — | @@ -0,0 +1,138 @@ |
| | 2 | +/* SEARCH */ |
| | 3 | +#search { |
| | 4 | + -webkit-appearance: none; |
| | 5 | + border-top-width: 0px; |
| | 6 | + border-right-width: 0px; |
| | 7 | + border-bottom-width: 0px; |
| | 8 | + border-left-width: 0px; |
| | 9 | + outline-style: none; |
| | 10 | + outline-width: initial; |
| | 11 | + outline-color: initial; |
| | 12 | + height: 1.4em; |
| | 13 | +} |
| | 14 | + |
| | 15 | +#search:focus { |
| | 16 | + outline: none; |
| | 17 | +} |
| | 18 | + |
| | 19 | +#searchbox img, |
| | 20 | +#searchbox form, |
| | 21 | +#searchbox input, |
| | 22 | +#searchbox button { |
| | 23 | + vertical-align: middle; |
| | 24 | + display: inline-block; |
| | 25 | +} |
| | 26 | + |
| | 27 | +#searchbox { |
| | 28 | + width: auto; |
| | 29 | + padding: 5px; |
| | 30 | + border: 1px solid #cccccc; |
| | 31 | + -webkit-border-radius: 2px; |
| | 32 | + -moz-border-radius: 2px; |
| | 33 | +} |
| | 34 | + |
| | 35 | +#searchbox a, #searchbox img { |
| | 36 | + border: 0px; |
| | 37 | + vertical-align: middle; |
| | 38 | +} |
| | 39 | + |
| | 40 | +#searchbox #goButton { |
| | 41 | + border: 0; |
| | 42 | + /* @embed */ |
| | 43 | + background: url(images/s.gif) no-repeat top left; |
| | 44 | + background-size: 27px 25px; |
| | 45 | + height: 25px; |
| | 46 | + width: 27px; |
| | 47 | +} |
| | 48 | + |
| | 49 | +#searchbox #searchField { |
| | 50 | + width: auto; |
| | 51 | +} |
| | 52 | + |
| | 53 | +/*TODO: This might need to go in the main one*/ |
| | 54 | +.clearlink { |
| | 55 | + /* @embed */ |
| | 56 | + background: url(images/close-button.png) no-repeat scroll 0 0 transparent; |
| | 57 | + background-position: center center; |
| | 58 | + cursor: pointer; |
| | 59 | + zoom: 1; |
| | 60 | + position: absolute; |
| | 61 | + right: 0.25em; |
| | 62 | + top: 50%; |
| | 63 | + margin: 1px; |
| | 64 | + height: 12px; |
| | 65 | + width: 12px; |
| | 66 | + margin-top: -6px; |
| | 67 | + z-index: 2; |
| | 68 | + border: 0px solid; |
| | 69 | + display: none; |
| | 70 | +} |
| | 71 | + |
| | 72 | +.divclearable { |
| | 73 | + border: 1px solid #888; |
| | 74 | + display: -moz-inline-stack; |
| | 75 | + display: inline-block; |
| | 76 | + zoom: 1; |
| | 77 | + *display: inline; |
| | 78 | + vertical-align: middle; |
| | 79 | + height: 1.5em; |
| | 80 | + position: relative; |
| | 81 | +} |
| | 82 | + |
| | 83 | +/* Search Suggestions */ |
| | 84 | +#results { |
| | 85 | + display: none; |
| | 86 | + background-color: #ffffff; |
| | 87 | + border-top: none; |
| | 88 | + border-left: 1px solid #888; |
| | 89 | + border-right: 1px solid #888; |
| | 90 | + border-bottom: 1px solid #888; |
| | 91 | + z-index: 2; |
| | 92 | + position: absolute; |
| | 93 | +} |
| | 94 | + |
| | 95 | +.suggestions { |
| | 96 | + font-size: 1.2em; |
| | 97 | + cursor: pointer; |
| | 98 | +} |
| | 99 | + |
| | 100 | +.suggestions-result { |
| | 101 | + color: black; |
| | 102 | + color: WindowText; |
| | 103 | + margin: 0; |
| | 104 | + line-height: 1.8em; |
| | 105 | + padding: 0.01em 0.25em; |
| | 106 | + text-align: left; |
| | 107 | + postion: relative; |
| | 108 | + border-bottom: solid 1px #999999; |
| | 109 | +} |
| | 110 | + |
| | 111 | +.suggestions-result:hover { |
| | 112 | + background-color: #ACD1E9; |
| | 113 | +} |
| | 114 | + |
| | 115 | +.suggestions-result a, |
| | 116 | +.suggestions-result a:link, |
| | 117 | +.suggestions-result a:visited, |
| | 118 | +.suggestions-result a:hover, |
| | 119 | +.suggestions-result a:active { |
| | 120 | + text-decoration: none; |
| | 121 | + color: #000000; |
| | 122 | +} |
| | 123 | + |
| | 124 | +a.suggestions-result-update { |
| | 125 | + font-size: 1.3em; |
| | 126 | + display: block; |
| | 127 | + font-weight: normal; |
| | 128 | + text-decoration: none; |
| | 129 | + color: #000000; |
| | 130 | + position: absolute; |
| | 131 | + right: 0; |
| | 132 | + width: 1.5em; |
| | 133 | + text-align: center; |
| | 134 | +} |
| | 135 | + |
| | 136 | +a.search-result-item { |
| | 137 | + display: block; |
| | 138 | + margin-right: 2em; |
| | 139 | +} |
| \ No newline at end of file |
| Property changes on: trunk/extensions/MobileFrontend2/modules/ext.mobileFrontend2/ext.mobileFrontend2.search.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 140 | + native |
| Index: trunk/extensions/MobileFrontend2/MobileFrontend2.i18n.php |
| — | — | @@ -10,6 +10,12 @@ |
| 11 | 11 | |
| 12 | 12 | $messages['en'] = array( |
| 13 | 13 | 'mobile-frontend2-desc' => 'Mobile Frontend', |
| | 14 | + 'mobile-frontend2-back-to-top-of-section' => '↑ Jump back a section', |
| | 15 | + 'mobile-frontend2-show-button' => 'Show', |
| | 16 | + 'mobile-frontend2-hide-button' => 'Hide', |
| | 17 | + 'mobile-frontend2-regular-site' => 'View this page on regular {{SITENAME}}', |
| | 18 | + 'mobile-frontend2-perm-stop-redirect' => 'Permanently disable mobile site', |
| | 19 | + 'mobile-frontend2-disable-images' => 'Disable images on mobile site', |
| 14 | 20 | |
| 15 | 21 | 'mainpage-mobile' => '{{int:mainpage}}', |
| 16 | 22 | ); |
| Index: trunk/extensions/MobileFrontend2/MobileFrontend2.php |
| — | — | @@ -62,7 +62,10 @@ |
| 63 | 63 | ) + $commonModuleInfo; |
| 64 | 64 | |
| 65 | 65 | $wgResourceModules['ext.mobileFrontend2.common'] = array( |
| 66 | | - 'styles' => 'ext.mobileFrontend2/ext.mobileFrontend2.css', |
| | 66 | + 'styles' => array( |
| | 67 | + 'ext.mobileFrontend2/ext.mobileFrontend2.css', |
| | 68 | + 'ext.mobileFrontend2/ext.mobileFrontend2.search.css', |
| | 69 | + ), |
| 67 | 70 | ) + $commonModuleInfo; |
| 68 | 71 | |
| 69 | 72 | $wgResourceModules['zepto'] = array( |