| OLD | NEW |
|---|
| 1 <!DOCTYPE HTML> | 1 <!DOCTYPE HTML> |
| 2 <html i18n-values="dir:textdirection;"> | 2 <html i18n-values="dir:textdirection;"> |
| 3 <head> | 3 <head> |
| 4 <meta charset="utf-8"> | 4 <meta charset="utf-8"> |
| 5 <style> | 5 <style> |
| 6 body { | 6 body { |
| 7 margin: 10px; | 7 margin: 10px; |
| 8 min-width: 47em; | 8 min-width: 47em; |
| 9 } | 9 } |
| 10 | 10 |
| 11 a { | 11 a { |
| 12 color: blue; | 12 color: blue; |
| 13 font-size: 103%; | 13 font-size: 103%; |
| 14 } | 14 } |
| 15 | 15 |
| 16 div#header { | 16 div#header { |
| 17 margin-bottom: 1.05em; | 17 margin-bottom: 1.05em; |
| 18 /* 67px is the height of the header's background image. */ | 18 /* 67px is the height of the header's background image. */ |
| 19 min-height: 67px; | 19 min-height: 67px; |
| 20 overflow: hidden; | 20 overflow: hidden; |
| 21 padding-bottom: 20px; | 21 padding-bottom: 20px; |
| 22 -webkit-padding-start: 0; | 22 -webkit-padding-start: 0; |
| 23 padding-top: 20px; | 23 padding-top: 20px; |
| 24 position: relative; | 24 position: relative; |
| 25 box-sizing: border-box; | 25 box-sizing: border-box; |
| 26 } | 26 } |
| 27 | 27 |
| 28 #header h1 { | 28 #header h1 { |
| 29 background: url('../../app/theme/about_conflicts.png') 0px 20px no-repeat; | 29 background: url('../../app/theme/default_100_percent/about_conflicts.png') 0px
20px no-repeat; |
| 30 display: inline; | 30 display: inline; |
| 31 margin: 0; | 31 margin: 0; |
| 32 padding-bottom: 43px; | 32 padding-bottom: 43px; |
| 33 padding-left: 75px; | 33 padding-left: 75px; |
| 34 padding-top: 40px; | 34 padding-top: 40px; |
| 35 } | 35 } |
| 36 | 36 |
| 37 html[dir=rtl] #header h1 { | 37 html[dir=rtl] #header h1 { |
| 38 background: url('../../app/theme/about_conflicts.png') right no-repeat; | 38 background: url('../../app/theme/default_100_percent/about_conflicts.png') rig
ht no-repeat; |
| 39 padding-right: 95px; | 39 padding-right: 95px; |
| 40 padding-left: 0; | 40 padding-left: 0; |
| 41 } | 41 } |
| 42 | 42 |
| 43 h1 { | 43 h1 { |
| 44 font-size: 156%; | 44 font-size: 156%; |
| 45 font-weight: bold; | 45 font-weight: bold; |
| 46 padding: 0; | 46 padding: 0; |
| 47 margin: 0; | 47 margin: 0; |
| 48 } | 48 } |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 </div> | 247 </div> |
| 248 </div> | 248 </div> |
| 249 </div> | 249 </div> |
| 250 <script src="chrome://conflicts/strings.js"></script> | 250 <script src="chrome://conflicts/strings.js"></script> |
| 251 <script src="chrome://conflicts/conflicts.js"></script> | 251 <script src="chrome://conflicts/conflicts.js"></script> |
| 252 <script src="chrome://resources/js/i18n_template.js"></script> | 252 <script src="chrome://resources/js/i18n_template.js"></script> |
| 253 <script src="chrome://resources/js/i18n_process.js"></script> | 253 <script src="chrome://resources/js/i18n_process.js"></script> |
| 254 <script src="chrome://resources/js/jstemplate_compiled.js"></script> | 254 <script src="chrome://resources/js/jstemplate_compiled.js"></script> |
| 255 </body> | 255 </body> |
| 256 </html> | 256 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10658012:
Merge 143482 - Build fix after r143476 (Closed)
Base URL: svn://svn.chromium.org/chrome/branches/1180/src/