| Index: trunk/mockups/athena/athena.css |
| — | — | @@ -79,12 +79,22 @@ |
| 80 | 80 | background-color: blue; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | | -.stretch { |
| 84 | | - max-width: 99999px; |
| | 83 | +/* Magic sizing */ |
| | 84 | +.bar-wrapper { |
| | 85 | +} |
| | 86 | +.bar { |
| | 87 | + display: table; |
| | 88 | +} |
| | 89 | +.bar-stripe { |
| | 90 | + display: table-row; |
| | 91 | +} |
| | 92 | +.bar-stripe > span { |
| | 93 | + display: table-cell; |
| | 94 | + vertical-align: middle; |
| 85 | 95 | width: auto; |
| 86 | 96 | } |
| 87 | | - |
| 88 | | -input { |
| | 97 | +.stretch { |
| | 98 | + width: 100%; |
| 89 | 99 | } |
| 90 | 100 | |
| 91 | 101 | .search-box input { |
| — | — | @@ -93,14 +103,14 @@ |
| 94 | 104 | -moz-border-radius: 3px; |
| 95 | 105 | -webkit-border-radius: 3px; |
| 96 | 106 | font-size: 16px; |
| 97 | | - vertical-align: top; |
| 98 | | - margin-top: 10px; |
| 99 | 107 | padding: 4px; |
| 100 | 108 | padding-right: 16px; |
| 101 | 109 | |
| 102 | 110 | background-image: url(images/icons/athena_icon_999999_search.png); |
| 103 | 111 | background-position: center right; |
| 104 | 112 | background-repeat: no-repeat; |
| | 113 | + |
| | 114 | + width: 95%; |
| 105 | 115 | } |
| 106 | 116 | |
| 107 | 117 | .button-main { |
| — | — | @@ -147,12 +157,15 @@ |
| 148 | 158 | background: white; |
| 149 | 159 | } |
| 150 | 160 | |
| 151 | | -#personal-menu { |
| 152 | | - display: none; |
| | 161 | + |
| | 162 | +@media all and (max-width: 639px) { |
| | 163 | + #personal-menu { |
| | 164 | + display: none; |
| | 165 | + } |
| | 166 | + #master-menu { |
| | 167 | + display: none; |
| | 168 | + } |
| 153 | 169 | } |
| 154 | | -#master-menu { |
| 155 | | - display: none; |
| 156 | | -} |
| 157 | 170 | |
| 158 | 171 | @media all and (min-width: 640px) { |
| 159 | 172 | /* "Tablet mode" */ |
| — | — | @@ -179,8 +192,6 @@ |
| 180 | 193 | font-size: 13px; |
| 181 | 194 | } |
| 182 | 195 | #personal-menu, #master-menu { |
| 183 | | - display: block; |
| 184 | | - padding-left: 92px; |
| 185 | 196 | font-size: 12px; |
| 186 | 197 | } |
| 187 | 198 | #personal-menu { |
| Index: trunk/mockups/athena/index.html |
| — | — | @@ -13,28 +13,38 @@ |
| 14 | 14 | <body> |
| 15 | 15 | |
| 16 | 16 | <div id="top" class="bar-wrapper"> |
| 17 | | - <div id="personal-menu"> |
| 18 | | - <a href="#you">Your Username</a> |
| 19 | | - <a href="#notifications">Notifications</a> |
| 20 | | - <a href="#contributions">Contributions</a> |
| 21 | | - <a href="#preferences">Preferences</a> |
| 22 | | - <a href="#logout">Log out</a> |
| 23 | | - </div> |
| 24 | 17 | <div id="top-bar" class="bar bar-float"> |
| 25 | | - <button class="button-main">Main</button> |
| 26 | | - <span class="search-box" class="stretch"> |
| 27 | | - <input class="search" placeholder="Search Wikipedia"> |
| 28 | | - </span> |
| 29 | | - <button class="button-you">You</button> |
| | 18 | + <div id="personal-menu" class="bar-stripe"> |
| | 19 | + <span> </span> |
| | 20 | + <span class="stretch"> |
| | 21 | + <a href="#you">Your Username</a> |
| | 22 | + <a href="#notifications">Notifications</a> |
| | 23 | + <a href="#contributions">Contributions</a> |
| | 24 | + <a href="#preferences">Preferences</a> |
| | 25 | + </span> |
| | 26 | + <span> |
| | 27 | + <a href="#logout">Log out</a> |
| | 28 | + </span> |
| | 29 | + </div> |
| | 30 | + <div class="bar-stripe"> |
| | 31 | + <span><button class="button-main">Main</button></span> |
| | 32 | + <span class="search-box" class="stretch"> |
| | 33 | + <input class="search" placeholder="Search Wikipedia"> |
| | 34 | + </span> |
| | 35 | + <span><button class="button-you">You</button></span> |
| | 36 | + </div> |
| | 37 | + <div id="master-menu" class="bar-stripe"> |
| | 38 | + <span> </span> |
| | 39 | + <span> |
| | 40 | + <a href="#help">Help</a> - |
| | 41 | + <a href="#contents">Contents</a> - |
| | 42 | + <a href="#featured">Featured content</a> - |
| | 43 | + <a href="#current">Current events</a> - |
| | 44 | + <a href="#community">Community portal</a> - |
| | 45 | + <a href="#upload">Upload File</a> |
| | 46 | + </span> |
| | 47 | + </div> |
| 30 | 48 | </div> |
| 31 | | - <div id="master-menu"> |
| 32 | | - <a href="#help">Help</a> - |
| 33 | | - <a href="#contents">Contents</a> - |
| 34 | | - <a href="#featured">Featured content</a> - |
| 35 | | - <a href="#current">Current events</a> - |
| 36 | | - <a href="#community">Community portal</a> - |
| 37 | | - <a href="#upload">Upload File</a> |
| 38 | | - </div> |
| 39 | 49 | </div> |
| 40 | 50 | |
| 41 | 51 | <iframe id="embed" width="100%" height="100%" src="proxy.php?title=While_My_Guitar_Gently_Weeps"></iframe> |
| — | — | @@ -43,13 +53,15 @@ |
| 44 | 54 | |
| 45 | 55 | <div id="bottom" class="bar-wrapper"> |
| 46 | 56 | <div id="bottom-bar" class="bar bar-float"> |
| 47 | | - <button class="button-article">Article</button> |
| 48 | | - <span class="detail stretch"> |
| 49 | | - <button class="button-history">History</button> |
| 50 | | - <button class="button-more">More</button> |
| 51 | | - </span> |
| 52 | | - <button class="button-discuss">Discuss</button> |
| 53 | | - <button class="button-language">Language</button> |
| | 57 | + <div class="bar-stripe"> |
| | 58 | + <button class="button-article">Article</button> |
| | 59 | + <span class="detail stretch"> |
| | 60 | + <button class="button-history">History</button> |
| | 61 | + <button class="button-more">More</button> |
| | 62 | + </span> |
| | 63 | + <button class="button-discuss">Discuss</button> |
| | 64 | + <button class="button-language">Language</button> |
| | 65 | + </div> |
| 54 | 66 | </div> |
| 55 | 67 | </div> |
| 56 | 68 | <div id="footer" class="footer"> |