Side by Side Diff: static/css/main-desktop.css
Issue 29551738:
Issue 5634 - Replaced logo and refactored navbar width and colors (Closed)
Base URL: https://hg.adblockplus.org/web.adblockplus.org
Patch Set: Removed merge artifact
Created Oct. 6, 2017, 4:19 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« static/css/main.css ('k')
|
static/css/main-mobile.css » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 html | 1 html |
| 2 { | 2 { |
| 3 position: relative; | 3 position: relative; |
| 4 min-height: 100%; | 4 min-height: 100%; |
| 5 } | 5 } |
| 6 | 6 |
| 7 header, #footer-content | 7 #content, |
| 8 #footer-content | |
| 8 { | 9 { |
| 9 margin-left: auto; | 10 margin-left: auto; |
| 10 margin-right: auto; | 11 margin-right: auto; |
| 11 } | 12 } |
| 12 | 13 |
| 13 header | 14 #content, #footer-content |
| 14 { | |
| 15 width: 1000px; | |
| 16 border-radius: 0 0 5px 5px; | |
| 17 } | |
| 18 | |
| 19 header nav | |
| 20 { | |
| 21 padding: 40px 12px 10px 140px; | |
| 22 line-height: 1; | |
| 23 } | |
| 24 | |
| 25 html[dir="rtl"] header nav | |
| 26 { | |
| 27 padding: 40px 140px 10px 12px; | |
| 28 } | |
| 29 | |
| 30 header nav ul, | |
| 31 html[dir="rtl"] header nav ul * | |
| 32 { | |
| 33 text-align: right; | |
| 34 white-space: nowrap; | |
| 35 } | |
| 36 | |
| 37 header nav ul *, | |
| 38 html[dir="rtl"] header nav ul | |
| 39 { | |
| 40 text-align: left; | |
| 41 } | |
| 42 | |
| 43 header nav li | |
| 44 { | |
| 45 display: inline-block; | |
| 46 vertical-align: middle; | |
| 47 } | |
| 48 | |
| 49 header nav li | |
| 50 { | |
| 51 height: 18px; | |
| 52 border-left: 1px dotted #848484; | |
| 53 border-right-width: 0; | |
| 54 margin-left: 8px; | |
| 55 margin-right: 0; | |
| 56 padding: 2px 0 2px 12px; | |
| 57 } | |
| 58 | |
| 59 html[dir="rtl"] header nav li | |
| 60 { | |
| 61 border-right: 1px dotted #848484; | |
| 62 border-left-width: 0; | |
| 63 margin-right: 8px; | |
| 64 margin-left: 0; | |
| 65 padding: 2px 12px 2px 0; | |
| 66 } | |
| 67 | |
| 68 html[dir] header nav li.first, html[dir] .language-entry | |
| 69 { | |
| 70 border-left-width: 0; | |
| 71 border-right-width: 0; | |
| 72 margin-left: 0; | |
| 73 margin-right: 0; | |
| 74 padding-left: 0; | |
| 75 padding-right: 0; | |
| 76 } | |
| 77 | |
| 78 /* Needs to be duplicated because IE6 ignores the above rule */ | |
| 79 header nav li.first, .language-entry | |
| 80 { | |
| 81 border-left-width: 0; | |
| 82 border-right-width: 0; | |
| 83 margin-left: 0; | |
| 84 margin-right: 0; | |
| 85 padding-left: 0; | |
| 86 padding-right: 0; | |
| 87 } | |
| 88 | |
| 89 #language | |
| 90 { | |
| 91 position: relative; | |
| 92 cursor: pointer; | |
| 93 } | |
| 94 | |
| 95 #language-arrow | |
| 96 { | |
| 97 width: 16px; | |
| 98 height: 9px; | |
| 99 background-position: -31px -190px; | |
| 100 } | |
| 101 | |
| 102 #language-selector | |
| 103 { | |
| 104 display: none; | |
| 105 position: absolute; | |
| 106 right: -12px; | |
| 107 left: auto; | |
| 108 margin-top: 2px; | |
| 109 min-width: 100%; | |
| 110 padding: 5px 5px 5px 5px; | |
| 111 background: white; | |
| 112 border: 1px solid #D9D9D9; | |
| 113 border-radius: 5px; | |
| 114 } | |
| 115 | |
| 116 html[dir="rtl"] #language-selector | |
| 117 { | |
| 118 left: -12px; | |
| 119 right: auto; | |
| 120 } | |
| 121 | |
| 122 #language-selector.visible | |
| 123 { | |
| 124 display: block; | |
| 125 } | |
| 126 | |
| 127 .language-entry | |
| 128 { | |
| 129 display: block; | |
| 130 margin: 4px; | |
| 131 white-space: nowrap; | |
| 132 } | |
| 133 | |
| 134 #logo | |
| 135 { | |
| 136 top: -5px; | |
| 137 left: 10px; | |
| 138 right: auto; | |
| 139 } | |
| 140 | |
| 141 html[dir="rtl"] #logo | |
| 142 { | |
| 143 right: 25px; | |
| 144 left: auto; | |
| 145 } | |
| 146 | |
| 147 #footer-content | |
| 148 { | 15 { |
| 149 margin-top: 15px; | 16 margin-top: 15px; |
| 150 padding-left: 10px; | 17 padding-left: 10px; |
| 151 padding-right: 10px; | 18 padding-right: 10px; |
| 152 } | 19 } |
| 153 | 20 |
| 154 #content | 21 #content |
| 155 { | 22 { |
| 156 margin-top: 71px; | 23 margin-top: 71px; |
| 157 margin-bottom: 280px; | 24 margin-bottom: 280px; |
| 158 } | 25 } |
| 159 | 26 |
| 160 #footer-main | 27 #footer-main |
| 161 { | 28 { |
| 162 position: absolute; | 29 position: absolute; |
| 163 left: 0; | 30 left: 0; |
| 164 right: auto; | 31 right: auto; |
| 165 bottom: 0; | 32 bottom: 0; |
| 166 width: 100%; | 33 width: 100%; |
| 167 height: 220px; | 34 height: 220px; |
| 168 | |
| 169 /* Disable the sticky footer in IE6/7 */ | |
| 170 .position: relative; | |
| 171 .bottom: 220px; | |
| 172 } | 35 } |
| 173 | 36 |
| 174 html[dir="rtl"] #footer-main | 37 html[dir="rtl"] #footer-main |
| 175 { | 38 { |
| 176 right: 0; | 39 right: 0; |
| 177 left: auto; | 40 left: auto; |
| 178 } | 41 } |
| 179 | 42 |
| 180 #footer-main nav | 43 #footer-main nav |
| 181 { | 44 { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 253 margin-left: -150px; | 116 margin-left: -150px; |
| 254 margin-right: -150px; | 117 margin-right: -150px; |
| 255 width: 980px; | 118 width: 980px; |
| 256 } | 119 } |
| 257 | 120 |
| 258 #globalnav | 121 #globalnav |
| 259 { | 122 { |
| 260 margin-top: 5px; | 123 margin-top: 5px; |
| 261 margin-bottom: 5px; | 124 margin-bottom: 5px; |
| 262 } | 125 } |
| OLD | NEW |
« no previous file with comments
|
« static/css/main.css ('k')
|
static/css/main-mobile.css » ('j')
|
no next file with comments »
