| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -572,7 +572,7 @@ |
| 573 | 573 | <!-- /personal --> |
| 574 | 574 | <div id="left-navigation"> |
| 575 | 575 | <!-- namespaces --> |
| 576 | | - <div id="namespaces"> |
| | 576 | + <div id="namespaces" class="vectorTabs"> |
| 577 | 577 | <h5><?php $this->msg('namespaces') ?></h5> |
| 578 | 578 | <ul <?php $this->html('userlangattributes') ?>> |
| 579 | 579 | <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?> |
| — | — | @@ -583,7 +583,7 @@ |
| 584 | 584 | <!-- /namespaces --> |
| 585 | 585 | <!-- variants --> |
| 586 | 586 | <?php if ( count( $this->data['variant_urls'] ) > 0 ): ?> |
| 587 | | - <div id="variants"> |
| | 587 | + <div id="variants" class="vectorMenu"> |
| 588 | 588 | <h5><span><?php $this->msg('variants') ?></span><a href="#"> </a></h5> |
| 589 | 589 | <div class="menu"> |
| 590 | 590 | <ul <?php $this->html('userlangattributes') ?>> |
| — | — | @@ -599,7 +599,7 @@ |
| 600 | 600 | <div id="right-navigation"> |
| 601 | 601 | <!-- views --> |
| 602 | 602 | <?php if ( count( $this->data['view_urls'] ) > 0 ): ?> |
| 603 | | - <div id="views"> |
| | 603 | + <div id="views" class="vectorTabs"> |
| 604 | 604 | <h5><?php $this->msg('views') ?></h5> |
| 605 | 605 | <ul <?php $this->html('userlangattributes') ?>> |
| 606 | 606 | <?php foreach ($this->data['view_urls'] as $key => $link ): ?> |
| — | — | @@ -611,7 +611,7 @@ |
| 612 | 612 | <!-- /views --> |
| 613 | 613 | <!-- actions --> |
| 614 | 614 | <?php if ( count( $this->data['action_urls'] ) > 0 ): ?> |
| 615 | | - <div id="actions"> |
| | 615 | + <div id="actions" class="vectorMenu"> |
| 616 | 616 | <h5><span><?php $this->msg('actions') ?></span><a href="#"> </a></h5> |
| 617 | 617 | <div class="menu"> |
| 618 | 618 | <ul <?php $this->html('userlangattributes') ?>> |
| — | — | @@ -624,7 +624,7 @@ |
| 625 | 625 | <?php endif; ?> |
| 626 | 626 | <!-- /actions --> |
| 627 | 627 | <!-- search --> |
| 628 | | - <div id="search"> |
| | 628 | + <div id="p-search"> |
| 629 | 629 | <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5> |
| 630 | 630 | <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform"> |
| 631 | 631 | <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/> |
| Index: trunk/phase3/skins/vector/main-ltr.css |
| — | — | @@ -41,12 +41,6 @@ |
| 42 | 42 | right: 0; |
| 43 | 43 | width: 100%; |
| 44 | 44 | } |
| 45 | | -div#head ul, |
| 46 | | -div#head li { |
| 47 | | - list-style: none; |
| 48 | | - margin: 0; |
| 49 | | - padding: 0; |
| 50 | | -} |
| 51 | 45 | div#head h5 { |
| 52 | 46 | margin: 0; |
| 53 | 47 | padding: 0; |
| — | — | @@ -60,6 +54,11 @@ |
| 61 | 55 | div#p-personal h5 { |
| 62 | 56 | display: none; |
| 63 | 57 | } |
| | 58 | + div#p-personal ul { |
| | 59 | + list-style: none; |
| | 60 | + margin: 0; |
| | 61 | + padding: 0; |
| | 62 | + } |
| 64 | 63 | div#p-personal li { |
| 65 | 64 | float: left; |
| 66 | 65 | margin-left: 0.75em; |
| — | — | @@ -77,49 +76,45 @@ |
| 78 | 77 | margin-top: 3em; |
| 79 | 78 | } |
| 80 | 79 | /* Navigation Labels */ |
| 81 | | - div#namespaces h5, |
| 82 | | - div#variants h5 span, |
| 83 | | - div#views h5, |
| 84 | | - div#actions h5 span, |
| 85 | | - div#search h5 { |
| | 80 | + div.vectorTabs h5, |
| | 81 | + div.vectorMenu h5 span { |
| 86 | 82 | display: none; |
| 87 | 83 | } |
| 88 | 84 | /* Namespaces and Views */ |
| 89 | | - div#namespaces, |
| 90 | | - div#views { |
| | 85 | + div.vectorTabs { |
| 91 | 86 | float: left; |
| 92 | 87 | background-image: url(images/tab-break.png); |
| 93 | 88 | background-position: bottom left; |
| 94 | 89 | background-repeat: no-repeat; |
| 95 | 90 | padding-left: 1px; |
| 96 | 91 | } |
| 97 | | - div#namespaces ul, |
| 98 | | - div#views ul { |
| | 92 | + div.vectorTabs ul { |
| 99 | 93 | float: left; |
| 100 | 94 | height: 100%; |
| | 95 | + list-style: none; |
| | 96 | + margin: 0; |
| | 97 | + padding: 0; |
| 101 | 98 | } |
| 102 | 99 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 103 | | - div#namespaces ul li, |
| 104 | | - div#views ul li { |
| | 100 | + div.vectorTabs ul li { |
| 105 | 101 | display: inline-block; |
| 106 | 102 | float: left; |
| 107 | 103 | height: 100%; |
| | 104 | + margin: 0; |
| | 105 | + padding: 0; |
| 108 | 106 | background-image: url(images/tab-normal-fade.png); |
| 109 | 107 | background-position: bottom left; |
| 110 | 108 | background-repeat: repeat-x; |
| 111 | 109 | } |
| 112 | 110 | /* IGNORED BY IE6 */ |
| 113 | | - div#namespaces ul > li, |
| 114 | | - div#views ul > li { |
| | 111 | + div.vectorTabs ul > li { |
| 115 | 112 | display: block; |
| 116 | 113 | } |
| 117 | | - div#namespaces li.selected, |
| 118 | | - div#views li.selected { |
| | 114 | + div.vectorTabs li.selected { |
| 119 | 115 | background-image: url(images/tab-current-fade.png); |
| 120 | 116 | } |
| 121 | 117 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 122 | | - div#namespaces li a, |
| 123 | | - div#views li a { |
| | 118 | + div.vectorTabs li a { |
| 124 | 119 | display: inline-block; |
| 125 | 120 | height: 3em; |
| 126 | 121 | padding-left: 0.5em; |
| — | — | @@ -129,49 +124,43 @@ |
| 130 | 125 | background-repeat: no-repeat; |
| 131 | 126 | } |
| 132 | 127 | /* IGNORED BY IE6 */ |
| 133 | | - div#namespaces li > a, |
| 134 | | - div#views li > a { |
| | 128 | + div.vectorTabs li > a { |
| 135 | 129 | display: block; |
| 136 | 130 | } |
| 137 | 131 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 138 | | - div#namespaces a span, |
| 139 | | - div#views a span { |
| | 132 | + div.vectorTabs a span { |
| 140 | 133 | color: #0645ad; |
| 141 | 134 | display: inline-block; |
| 142 | 135 | padding-top: 1.25em; |
| 143 | 136 | cursor: pointer; |
| 144 | 137 | } |
| 145 | 138 | /* IGNORED BY IE6 */ |
| 146 | | - div#namespaces a > span, |
| 147 | | - div#views a > span { |
| | 139 | + div.vectorTabs a > span { |
| 148 | 140 | float: left; |
| 149 | 141 | display: block; |
| 150 | 142 | } |
| 151 | | - div#namespaces li.selected a span, |
| 152 | | - div#views li.selected a:visited span { |
| | 143 | + div.vectorTabs li.selected a span, |
| | 144 | + div.vectorTabs li.selected a:visited span { |
| 153 | 145 | color: #333333; |
| 154 | 146 | cursor: default; |
| 155 | 147 | text-decoration: none; |
| 156 | 148 | } |
| 157 | | - div#namespaces li.new a span, |
| 158 | | - div#namespaces li.new a:visited span{ |
| | 149 | + div.vectorTabs li.new a span, |
| | 150 | + div.vectorTabs li.new a:visited span { |
| 159 | 151 | color: #a55858; |
| 160 | 152 | } |
| 161 | 153 | /* Variants and Actions */ |
| 162 | | - div#variants, |
| 163 | | - div#actions { |
| | 154 | + div.vectorMenu { |
| 164 | 155 | float: left; |
| 165 | 156 | background-image: url(images/arrow-down-icon.png); |
| 166 | 157 | background-position: center center; |
| 167 | 158 | background-repeat: no-repeat; |
| 168 | 159 | } |
| 169 | | - div#variants h5, |
| 170 | | - div#actions h5 { |
| | 160 | + div.vectorMenu h5 { |
| 171 | 161 | float: left; |
| 172 | 162 | } |
| 173 | 163 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 174 | | - div#variants h5 a, |
| 175 | | - div#actions h5 a { |
| | 164 | + div.vectorMenu h5 a { |
| 176 | 165 | display: inline-block; |
| 177 | 166 | width: 24px; |
| 178 | 167 | height: 3em; |
| — | — | @@ -181,47 +170,49 @@ |
| 182 | 171 | background-repeat: no-repeat; |
| 183 | 172 | } |
| 184 | 173 | /* IGNORED BY IE6 */ |
| 185 | | - div#variants h5 > a, |
| 186 | | - div#actions h5 > a { |
| | 174 | + div.vectorMenu h5 > a { |
| 187 | 175 | display: block; |
| 188 | 176 | } |
| 189 | | - div#variants div.menu, |
| 190 | | - div#actions div.menu { |
| | 177 | + div.vectorMenu div.menu { |
| 191 | 178 | display: none; |
| 192 | 179 | clear: both; |
| 193 | 180 | } |
| 194 | | - div#variants:hover div.menu, |
| 195 | | - div#actions:hover div.menu { |
| | 181 | + div.vectorMenu:hover div.menu { |
| 196 | 182 | display: block; |
| 197 | 183 | } |
| 198 | | - div#variants ul, |
| 199 | | - div#actions ul { |
| | 184 | + div.vectorMenu ul { |
| 200 | 185 | position: absolute; |
| 201 | 186 | background-color: white; |
| 202 | 187 | border: solid 1px silver; |
| 203 | 188 | border-top-width: 0; |
| | 189 | + list-style: none; |
| 204 | 190 | padding: 0; |
| 205 | 191 | margin: 0; |
| 206 | 192 | margin-left: -1px; |
| 207 | 193 | } |
| | 194 | + div.vectorMenu li { |
| | 195 | + padding: 0; |
| | 196 | + margin: 0; |
| | 197 | + } |
| 208 | 198 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 209 | | - div#variants:hover li a, |
| 210 | | - div#actions li a { |
| | 199 | + div.vectorMenu li a { |
| 211 | 200 | display: inline-block; |
| 212 | 201 | padding: 0.5em; |
| 213 | 202 | } |
| 214 | 203 | /* IGNORED BY IE6 */ |
| 215 | | - div#variants:hover li > a, |
| 216 | | - div#actions li > a { |
| | 204 | + div.vectorMenu li > a { |
| 217 | 205 | display: block; |
| 218 | 206 | } |
| 219 | 207 | /* Search */ |
| 220 | | - div#search { |
| | 208 | + div#p-search h5 { |
| | 209 | + display: none; |
| | 210 | + } |
| | 211 | + div#p-search { |
| 221 | 212 | float: left; |
| 222 | 213 | margin-right: 0.75em; |
| 223 | 214 | } |
| 224 | | - div#search form, |
| 225 | | - div#search input { |
| | 215 | + div#p-search form, |
| | 216 | + div#p-search input { |
| 226 | 217 | float: left; |
| 227 | 218 | margin-top: 0.4em; |
| 228 | 219 | margin-left: 0.25em; |
| Index: trunk/phase3/skins/vector/main-rtl.css |
| — | — | @@ -54,12 +54,6 @@ |
| 55 | 55 | left: 0; |
| 56 | 56 | width: 100%; |
| 57 | 57 | } |
| 58 | | -div#head ul, |
| 59 | | -div#head li { |
| 60 | | - list-style: none; |
| 61 | | - margin: 0; |
| 62 | | - padding: 0; |
| 63 | | -} |
| 64 | 58 | div#head h5 { |
| 65 | 59 | margin: 0; |
| 66 | 60 | padding: 0; |
| — | — | @@ -73,6 +67,11 @@ |
| 74 | 68 | div#p-personal h5 { |
| 75 | 69 | display: none; |
| 76 | 70 | } |
| | 71 | + div#p-personal ul { |
| | 72 | + list-style: none; |
| | 73 | + margin: 0; |
| | 74 | + padding: 0; |
| | 75 | + } |
| 77 | 76 | div#p-personal li { |
| 78 | 77 | float: right; |
| 79 | 78 | margin-right: 0.75em; |
| — | — | @@ -90,49 +89,45 @@ |
| 91 | 90 | margin-top: 3em; |
| 92 | 91 | } |
| 93 | 92 | /* Navigation Labels */ |
| 94 | | - div#namespaces h5, |
| 95 | | - div#variants h5 span, |
| 96 | | - div#views h5, |
| 97 | | - div#actions h5 span, |
| 98 | | - div#search h5 { |
| | 93 | + div.vectorTabs h5, |
| | 94 | + div.vectorMenu h5 span { |
| 99 | 95 | display: none; |
| 100 | 96 | } |
| 101 | 97 | /* Namespaces and Views */ |
| 102 | | - div#namespaces, |
| 103 | | - div#views { |
| | 98 | + div.vectorTabs { |
| 104 | 99 | float: right; |
| 105 | 100 | background-image: url(images/tab-break.png); |
| 106 | 101 | background-position: bottom right; |
| 107 | 102 | background-repeat: no-repeat; |
| 108 | 103 | padding-right: 1px; |
| 109 | 104 | } |
| 110 | | - div#namespaces ul, |
| 111 | | - div#views ul { |
| | 105 | + div.vectorTabs ul { |
| 112 | 106 | float: right; |
| 113 | 107 | height: 100%; |
| | 108 | + list-style: none; |
| | 109 | + margin: 0; |
| | 110 | + padding: 0; |
| 114 | 111 | } |
| 115 | 112 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 116 | | - div#namespaces ul li, |
| 117 | | - div#views ul li { |
| | 113 | + div.vectorTabs ul li { |
| 118 | 114 | display: inline-block; |
| 119 | 115 | float: right; |
| 120 | 116 | height: 100%; |
| | 117 | + margin: 0; |
| | 118 | + padding: 0; |
| 121 | 119 | background-image: url(images/tab-normal-fade.png); |
| 122 | 120 | background-position: bottom right; |
| 123 | 121 | background-repeat: repeat-x; |
| 124 | 122 | } |
| 125 | 123 | /* IGNORED BY IE6 */ |
| 126 | | - div#namespaces ul > li, |
| 127 | | - div#views ul > li { |
| | 124 | + div.vectorTabs ul > li { |
| 128 | 125 | display: block; |
| 129 | 126 | } |
| 130 | | - div#namespaces li.selected, |
| 131 | | - div#views li.selected { |
| | 127 | + div.vectorTabs li.selected { |
| 132 | 128 | background-image: url(images/tab-current-fade.png); |
| 133 | 129 | } |
| 134 | 130 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 135 | | - div#namespaces li a, |
| 136 | | - div#views li a { |
| | 131 | + div.vectorTabs li a { |
| 137 | 132 | display: inline-block; |
| 138 | 133 | height: 3em; |
| 139 | 134 | padding-right: 0.5em; |
| — | — | @@ -142,49 +137,44 @@ |
| 143 | 138 | background-repeat: no-repeat; |
| 144 | 139 | } |
| 145 | 140 | /* IGNORED BY IE6 */ |
| 146 | | - div#namespaces li > a, |
| 147 | | - div#views li > a { |
| | 141 | + div.vectorTabs li > a { |
| 148 | 142 | display: block; |
| 149 | 143 | } |
| 150 | 144 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 151 | | - div#namespaces a span, |
| 152 | | - div#views a span { |
| | 145 | + div.vectorTabs a span { |
| 153 | 146 | color: #0645ad; |
| 154 | 147 | display: inline-block; |
| 155 | 148 | padding-top: 1.25em; |
| 156 | 149 | cursor: pointer; |
| 157 | 150 | } |
| 158 | 151 | /* IGNORED BY IE6 */ |
| 159 | | - div#namespaces a > span, |
| 160 | | - div#views a > span { |
| | 152 | + div.vectorTabs a > span { |
| 161 | 153 | float: right; |
| 162 | 154 | display: block; |
| 163 | 155 | } |
| 164 | | - div#namespaces li.selected a span, |
| 165 | | - div#views li.selected a:visited span { |
| | 156 | + div.vectorTabs li.selected a span, |
| | 157 | + div.vectorTabs li.selected a:visited span { |
| 166 | 158 | color: #333333; |
| 167 | 159 | cursor: default; |
| 168 | 160 | text-decoration: none; |
| 169 | 161 | } |
| 170 | | - div#namespaces li.new a span, |
| 171 | | - div#namespaces li.new a:visited span{ |
| | 162 | + div.vectorTabs li.new a span, |
| | 163 | + div.vectorTabs li.new a:visited span{ |
| 172 | 164 | color: #a55858; |
| 173 | 165 | } |
| | 166 | + |
| 174 | 167 | /* Variants and Actions */ |
| 175 | | - div#variants, |
| 176 | | - div#actions { |
| | 168 | + div.vectorMenu { |
| 177 | 169 | float: right; |
| 178 | 170 | background-image: url(images/arrow-down-icon.png); |
| 179 | 171 | background-position: center center; |
| 180 | 172 | background-repeat: no-repeat; |
| 181 | 173 | } |
| 182 | | - div#variants h5, |
| 183 | | - div#actions h5 { |
| | 174 | + div.vectorMenu h5 { |
| 184 | 175 | float: right; |
| 185 | 176 | } |
| 186 | 177 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 187 | | - div#variants h5 a, |
| 188 | | - div#actions h5 a { |
| | 178 | + div.vectorMenu h5 a { |
| 189 | 179 | display: inline-block; |
| 190 | 180 | width: 24px; |
| 191 | 181 | height: 3em; |
| — | — | @@ -194,47 +184,49 @@ |
| 195 | 185 | background-repeat: no-repeat; |
| 196 | 186 | } |
| 197 | 187 | /* IGNORED BY IE6 */ |
| 198 | | - div#variants h5 > a, |
| 199 | | - div#actions h5 > a { |
| | 188 | + div.vectorMenu h5 > a { |
| 200 | 189 | display: block; |
| 201 | 190 | } |
| 202 | | - div#variants div.menu, |
| 203 | | - div#actions div.menu { |
| | 191 | + div.vectorMenu div.menu { |
| 204 | 192 | display: none; |
| 205 | 193 | clear: both; |
| 206 | 194 | } |
| 207 | | - div#variants:hover div.menu, |
| 208 | | - div#actions:hover div.menu { |
| | 195 | + div.vectorMenu:hover div.menu { |
| 209 | 196 | display: block; |
| 210 | 197 | } |
| 211 | | - div#variants ul, |
| 212 | | - div#actions ul { |
| | 198 | + div.vectorMenu ul { |
| 213 | 199 | position: absolute; |
| 214 | 200 | background-color: white; |
| 215 | 201 | border: solid 1px silver; |
| 216 | 202 | border-top-width: 0; |
| | 203 | + list-style: none; |
| 217 | 204 | padding: 0; |
| 218 | 205 | margin: 0; |
| 219 | 206 | margin-right: -1px; |
| 220 | 207 | } |
| | 208 | + div.vectorMenu li { |
| | 209 | + padding: 0; |
| | 210 | + margin: 0; |
| | 211 | + } |
| 221 | 212 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 222 | | - div#variants:hover li a, |
| 223 | | - div#actions li a { |
| | 213 | + div.vectorMenu li a { |
| 224 | 214 | display: inline-block; |
| 225 | 215 | padding: 0.5em; |
| 226 | 216 | } |
| 227 | 217 | /* IGNORED BY IE6 */ |
| 228 | | - div#variants:hover li > a, |
| 229 | | - div#actions li > a { |
| | 218 | + div.vectorMenu li > a { |
| 230 | 219 | display: block; |
| 231 | 220 | } |
| 232 | 221 | /* Search */ |
| 233 | | - div#search { |
| | 222 | + div#p-search h5 { |
| | 223 | + display: none; |
| | 224 | + } |
| | 225 | + div#p-search { |
| 234 | 226 | float: right; |
| 235 | 227 | margin-left: 0.75em; |
| 236 | 228 | } |
| 237 | | - div#search form, |
| 238 | | - div#search input { |
| | 229 | + div#p-search form, |
| | 230 | + div#p-search input { |
| 239 | 231 | float: right; |
| 240 | 232 | margin-top: 0.4em; |
| 241 | 233 | margin-right: 0.25em; |