Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> | 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 6 <link rel="import" href="/about_page/about_page.html"> | 6 <link rel="import" href="/about_page/about_page.html"> |
| 7 <link rel="import" href="/advanced_page/advanced_page.html"> | 7 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 8 <link rel="import" href="/basic_page/basic_page.html"> | 8 <link rel="import" href="/basic_page/basic_page.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_page/main_page_behavior.html"> | 10 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 padding: 0 12px; | 26 padding: 0 12px; |
| 27 } | 27 } |
| 28 | 28 |
| 29 #overscroll { | 29 #overscroll { |
| 30 margin-top: 64px; | 30 margin-top: 64px; |
| 31 } | 31 } |
| 32 | 32 |
| 33 #toggleContainer { | 33 #toggleContainer { |
| 34 align-items: center; | 34 align-items: center; |
| 35 display: flex; | 35 display: flex; |
| 36 font-size: inherit; | |
| 37 font-weight: inherit; | |
|
Dan Beam
2016/10/04 16:43:59
does font: inherit; work?
should we do this more
hcarmona
2016/10/04 17:01:31
font: inherit works here. Updated.
This is a spec
| |
| 36 justify-content: center; | 38 justify-content: center; |
| 39 margin-bottom: 0; | |
| 40 margin-top: 0; | |
| 37 } | 41 } |
| 38 | 42 |
| 39 #toggleSpacer { | 43 #toggleSpacer { |
| 40 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 44 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 41 } | 45 } |
| 42 | 46 |
| 43 iron-icon { | 47 iron-icon { |
| 44 -webkit-margin-start: 16px; | 48 -webkit-margin-start: 16px; |
| 45 } | 49 } |
| 46 | 50 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 66 <settings-basic-page route="BASIC" prefs="{{prefs}}" | 70 <settings-basic-page route="BASIC" prefs="{{prefs}}" |
| 67 page-visibility="[[pageVisibility]]" | 71 page-visibility="[[pageVisibility]]" |
| 68 on-subpage-expand="onSubpageExpand_"> | 72 on-subpage-expand="onSubpageExpand_"> |
| 69 </settings-basic-page> | 73 </settings-basic-page> |
| 70 </template> | 74 </template> |
| 71 <template is="dom-if" | 75 <template is="dom-if" |
| 72 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 76 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
| 73 <template is="dom-if" if="[[showAdvancedToggle_( | 77 <template is="dom-if" if="[[showAdvancedToggle_( |
| 74 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> | 78 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> |
| 75 <div id="toggleSpacer"></div> | 79 <div id="toggleSpacer"></div> |
| 76 <div id="toggleContainer"> | 80 <h2 id="toggleContainer"> |
| 77 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> | 81 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> |
| 78 <span>$i18n{advancedPageTitle}</span> | 82 <span>$i18n{advancedPageTitle}</span> |
| 79 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> | 83 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> |
| 80 </iron-icon> | 84 </iron-icon> |
| 81 </paper-button> | 85 </paper-button> |
| 82 </div> | 86 </h2> |
| 83 </template> | 87 </template> |
| 84 <template is="dom-if" if="[[showAdvancedPage_( | 88 <template is="dom-if" if="[[showAdvancedPage_( |
| 85 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> | 89 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> |
| 86 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" | 90 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" |
| 87 page-visibility="[[pageVisibility]]" | 91 page-visibility="[[pageVisibility]]" |
| 88 on-subpage-expand="onSubpageExpand_"> | 92 on-subpage-expand="onSubpageExpand_"> |
| 89 </settings-advanced-page> | 93 </settings-advanced-page> |
| 90 </template> | 94 </template> |
| 91 </template> | 95 </template> |
| 92 <template is="dom-if" if="[[showPages_.about]]"> | 96 <template is="dom-if" if="[[showPages_.about]]"> |
| 93 <settings-about-page route="ABOUT"></settings-about-page> | 97 <settings-about-page route="ABOUT"></settings-about-page> |
| 94 </template> | 98 </template> |
| 95 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 99 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
| 96 </template> | 100 </template> |
| 97 <script src="settings_main.js"></script> | 101 <script src="settings_main.js"></script> |
| 98 <script src="/search_settings.js"></script> | 102 <script src="/search_settings.js"></script> |
| 99 </dom-module> | 103 </dom-module> |
| OLD | NEW |