r103221 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103220‎ | r103221 | r103222 >
Date:20:52, 15 November 2011
Author:brion
Status:deferred
Tags:
Comment:
footer & floaty bits (click-to-toggle not working on iPhone or Android browsers atm tho)
Modified paths:
  • /trunk/mockups/athena/athena.css (modified) (history)
  • /trunk/mockups/athena/athena.js (modified) (history)
  • /trunk/mockups/athena/frame-inner.js (modified) (history)
  • /trunk/mockups/athena/index.html (modified) (history)

Diff [purge]

Index: trunk/mockups/athena/athena.css
@@ -5,12 +5,37 @@
66 padding: 0;
77 color: white;
88 background: black;
 9+
 10+ font-family: "Helvetica", sans-serif;
911 }
1012
 13+a {
 14+ font-weight: bold;
 15+ text-decoration: none;
 16+}
 17+a:link {
 18+ color: #d9d9d9;
 19+ text-decoration: none;
 20+}
 21+a:active {
 22+ color: white;
 23+ text-decoration: none;
 24+}
 25+a:visited {
 26+ color: #999999;
 27+ text-decoration: none;
 28+}
 29+
 30+.bar-wrapper {
 31+ height: 48px;
 32+}
 33+
1134 .bar {
1235 width: 100%;
1336 height: 48px;
1437
 38+ color: white;
 39+ background: black;
1540 z-index: 9999;
1641 }
1742
@@ -18,11 +43,11 @@
1944 position: fixed;
2045 }
2146
22 -#top-bar .bar-float {
 47+#top-bar.bar-float {
2348 top: 0;
2449 }
2550
26 -#bottom-bar .bar-float {
 51+#bottom-bar.bar-float {
2752 bottom: 0;
2853 }
2954
@@ -50,12 +75,13 @@
5176
5277 .stretch {
5378 max-width: 99999px;
 79+ width: auto;
5480 }
5581
5682 input {
5783 }
5884
59 -#search-box input {
 85+.search-box input {
6086 border: none;
6187 border-radius: 3px;
6288 -moz-border-radius: 3px;
@@ -94,6 +120,10 @@
95121 }
96122
97123
 124+.footer > div {
 125+ padding: 4px 8px;
 126+ font-size: 10px;
 127+}
98128
99129 #embed {
100130 /*
Index: trunk/mockups/athena/index.html
@@ -12,26 +12,58 @@
1313
1414 <body>
1515
16 -<div id="top-bar" class="bar">
17 - <button class="button-main">Main</button>
18 - <span id="search-box" class="stretch">
19 - <input id="search" placeholder="Search Wikipedia">
20 - </span>
21 - <button class="button-you">You</button>
 16+<div class="bar-wrapper">
 17+ <div id="top-bar" class="bar">
 18+ <button class="button-main">Main</button>
 19+ <span class="search-box" class="stretch">
 20+ <input class="search" placeholder="Search Wikipedia">
 21+ </span>
 22+ <button class="button-you">You</button>
 23+ </div>
2224 </div>
2325
2426 <iframe id="embed" width="100%" height="100%" src="proxy.php?title=While_My_Guitar_Gently_Weeps"></iframe>
2527
2628 <div id="page-content"></div>
2729
28 -<div id="bottom-bar" class="bar">
29 - <button class="button-article">Article</button>
30 - <span class="detail stretch">
31 - <button class="button-history">History</button>
32 - <button class="button-more">More</button>
33 - </span>
34 - <button class="button-discuss">Discuss</button>
35 - <button class="button-language">Language</button>
 30+<div class="bar-wrapper">
 31+ <div id="bottom-bar" class="bar">
 32+ <button class="button-article">Article</button>
 33+ <span class="detail stretch">
 34+ <button class="button-history">History</button>
 35+ <button class="button-more">More</button>
 36+ </span>
 37+ <button class="button-discuss">Discuss</button>
 38+ <button class="button-language">Language</button>
 39+ </div>
 40+ <div class="footer">
 41+ <div>
 42+ <span class="search-box" class="stretch">
 43+ <input class="search" placeholder="Search Wikipedia">
 44+ </span>
 45+ </div>
 46+ <div>
 47+ <a href="#recentchanges">Recent Changes</a> -
 48+ <a href="#special">Special Pages</a> -
 49+ <a href="#random">Random Article</a> -
 50+ <a href="#donate">Donate to Wikipedia</a>
 51+ </div>
 52+ <div>
 53+ <a href="#about">About Wikipedia</a> -
 54+ <a href="#contact">Contact Wikipedia</a> -
 55+ <a href="#privacy">Privacy policy</a> -
 56+ <a href="#disclaimers">Disclaiimers</a>
 57+ </div>
 58+ <div>
 59+ Text is available under the <a href="#cc">Creative Commons Attribution-ShareAlike License</a>, additional terms may apply.
 60+ See <a href="#terms">Terms of Use</a> for details.
 61+ Wikipedia is a registered trademark of the <a href="#wmf">Wikimedia Foundation, Inc.</a>, a non-profit organization.
 62+ </div>
 63+ <div class="poweredby-logos">
 64+ <img src="https://bits.wikimedia.org/images/wikimedia-button.png">
 65+ <img src="https://bits.wikimedia.org/skins-1.18/common/images/poweredby_mediawiki_88x31.png">
 66+ </div>
 67+ </div>
3668 </div>
3769
3870 </body>
Index: trunk/mockups/athena/athena.js
@@ -84,6 +84,10 @@
8585 $embed.bind('embed:resize', function(event, data) {
8686 $embed.height(data.height);
8787 });
 88+ $embed.bind('embed:click', function(event, data) {
 89+ // toggle the floating state
 90+ $('.bar').toggleClass('bar-float');
 91+ });
8892 },
8993
9094 /**
Index: trunk/mockups/athena/frame-inner.js
@@ -73,5 +73,14 @@
7474 sendSize();
7575 };
7676
 77+
 78+// Send generic unhandled taps up to parent
 79+// May need to show/hide toolbars etc
 80+document.addEventListener('click', function(event) {
 81+ messageParent({
 82+ event: 'click'
 83+ });
 84+}, false);
 85+
7786 })();
7887

Status & tagging log