Index: trunk/mockups/athena/athena.css |
— | — | @@ -5,12 +5,37 @@ |
6 | 6 | padding: 0; |
7 | 7 | color: white; |
8 | 8 | background: black; |
| 9 | + |
| 10 | + font-family: "Helvetica", sans-serif; |
9 | 11 | } |
10 | 12 | |
| 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 | + |
11 | 34 | .bar { |
12 | 35 | width: 100%; |
13 | 36 | height: 48px; |
14 | 37 | |
| 38 | + color: white; |
| 39 | + background: black; |
15 | 40 | z-index: 9999; |
16 | 41 | } |
17 | 42 | |
— | — | @@ -18,11 +43,11 @@ |
19 | 44 | position: fixed; |
20 | 45 | } |
21 | 46 | |
22 | | -#top-bar .bar-float { |
| 47 | +#top-bar.bar-float { |
23 | 48 | top: 0; |
24 | 49 | } |
25 | 50 | |
26 | | -#bottom-bar .bar-float { |
| 51 | +#bottom-bar.bar-float { |
27 | 52 | bottom: 0; |
28 | 53 | } |
29 | 54 | |
— | — | @@ -50,12 +75,13 @@ |
51 | 76 | |
52 | 77 | .stretch { |
53 | 78 | max-width: 99999px; |
| 79 | + width: auto; |
54 | 80 | } |
55 | 81 | |
56 | 82 | input { |
57 | 83 | } |
58 | 84 | |
59 | | -#search-box input { |
| 85 | +.search-box input { |
60 | 86 | border: none; |
61 | 87 | border-radius: 3px; |
62 | 88 | -moz-border-radius: 3px; |
— | — | @@ -94,6 +120,10 @@ |
95 | 121 | } |
96 | 122 | |
97 | 123 | |
| 124 | +.footer > div { |
| 125 | + padding: 4px 8px; |
| 126 | + font-size: 10px; |
| 127 | +} |
98 | 128 | |
99 | 129 | #embed { |
100 | 130 | /* |
Index: trunk/mockups/athena/index.html |
— | — | @@ -12,26 +12,58 @@ |
13 | 13 | |
14 | 14 | <body> |
15 | 15 | |
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> |
22 | 24 | </div> |
23 | 25 | |
24 | 26 | <iframe id="embed" width="100%" height="100%" src="proxy.php?title=While_My_Guitar_Gently_Weeps"></iframe> |
25 | 27 | |
26 | 28 | <div id="page-content"></div> |
27 | 29 | |
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> |
36 | 68 | </div> |
37 | 69 | |
38 | 70 | </body> |
Index: trunk/mockups/athena/athena.js |
— | — | @@ -84,6 +84,10 @@ |
85 | 85 | $embed.bind('embed:resize', function(event, data) { |
86 | 86 | $embed.height(data.height); |
87 | 87 | }); |
| 88 | + $embed.bind('embed:click', function(event, data) { |
| 89 | + // toggle the floating state |
| 90 | + $('.bar').toggleClass('bar-float'); |
| 91 | + }); |
88 | 92 | }, |
89 | 93 | |
90 | 94 | /** |
Index: trunk/mockups/athena/frame-inner.js |
— | — | @@ -73,5 +73,14 @@ |
74 | 74 | sendSize(); |
75 | 75 | }; |
76 | 76 | |
| 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 | + |
77 | 86 | })(); |
78 | 87 | |