Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://md-settings/about_page/about_page_browser_prox y.html"> | 2 <link rel="import" href="chrome://md-settings/about_page/about_page_browser_prox y.html"> |
| 3 <link rel="import" href="chrome://md-settings/i18n_setup.html"> | 3 <link rel="import" href="chrome://md-settings/i18n_setup.html"> |
| 4 <link rel="import" href="chrome://md-settings/icons.html"> | 4 <link rel="import" href="chrome://md-settings/icons.html"> |
| 5 <link rel="import" href="chrome://md-settings/settings_page/main_page_behavior.h tml"> | 5 <link rel="import" href="chrome://md-settings/settings_page/main_page_behavior.h tml"> |
| 6 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> | 6 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> |
| 7 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l"> | 7 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l"> |
| 8 <link rel="import" href="chrome://md-settings/settings_page_css.html"> | |
| 8 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 9 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 9 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 10 <link rel="import" href="chrome://resources/html/assert.html"> | 11 <link rel="import" href="chrome://resources/html/assert.html"> |
| 11 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 12 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 12 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 13 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 13 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 14 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 14 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 15 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 16 | 17 |
| 17 <if expr="chromeos"> | 18 <if expr="chromeos"> |
| 18 <link rel="import" href="chrome://md-settings/about_page/detailed_build_info.htm l"> | 19 <link rel="import" href="chrome://md-settings/about_page/detailed_build_info.htm l"> |
| 19 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> | 20 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> |
| 20 </if> | 21 </if> |
| 21 | 22 |
| 22 <dom-module id="settings-about-page"> | 23 <dom-module id="settings-about-page"> |
| 23 <link rel="import" type="css" href="chrome://md-settings/settings_page.css"> | 24 <link rel="import" type="css" href="chrome://md-settings/settings_page.css"> |
|
michaelpg
2016/05/25 18:27:47
kill
dschuyler
2016/05/25 21:16:17
Done.
| |
| 24 <template> | 25 <template> |
| 25 <style include="settings-shared main-page-styles"> | 26 <style include="settings-shared settings-page-styles"> |
| 26 span { | 27 span { |
| 27 font-size: 20px; | 28 font-size: 20px; |
| 28 margin-top: auto; | 29 margin-top: auto; |
| 29 margin-bottom: auto; | 30 margin-bottom: auto; |
| 30 } | 31 } |
| 31 | 32 |
| 32 img { | 33 img { |
| 33 -webkit-margin-end: 10px; | 34 -webkit-margin-end: 10px; |
| 34 } | 35 } |
| 35 | 36 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 107 <settings-subpage page-title="Detailed build information"> | 108 <settings-subpage page-title="Detailed build information"> |
| 108 <settings-detailed-build-info></settings-detailed-build-info> | 109 <settings-detailed-build-info></settings-detailed-build-info> |
| 109 </settings-subpage> | 110 </settings-subpage> |
| 110 </template> | 111 </template> |
| 111 </if> | 112 </if> |
| 112 </settings-animated-pages> | 113 </settings-animated-pages> |
| 113 </settings-section> | 114 </settings-section> |
| 114 </template> | 115 </template> |
| 115 <script src="about_page.js"></script> | 116 <script src="about_page.js"></script> |
| 116 </dom-module> | 117 </dom-module> |
| OLD | NEW |