| 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/polymer/v1_0/paper-drawer-panel/pape
r-drawer-panel.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape
r-drawer-panel.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too
lbar.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too
lbar.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 10 <link rel="import" href="chrome://md-settings/direction_delegate.html"> | 10 <link rel="import" href="chrome://md-settings/direction_delegate.html"> |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 top: 4px; | 112 top: 4px; |
| 113 }; | 113 }; |
| 114 --paper-input-container-input-color: var(--settings-title-bar-color); | 114 --paper-input-container-input-color: var(--settings-title-bar-color); |
| 115 --paper-input-container-label: { | 115 --paper-input-container-label: { |
| 116 font-size: 81.25%; /* go to 13px from 16px */ | 116 font-size: 81.25%; /* go to 13px from 16px */ |
| 117 top: 3px; /* Special positioning needed for UX design. */ | 117 top: 3px; /* Special positioning needed for UX design. */ |
| 118 }; | 118 }; |
| 119 --paper-input-max-width: 200px; | 119 --paper-input-max-width: 200px; |
| 120 } | 120 } |
| 121 | 121 |
| 122 /* These header elements must create stacking contexts when a section is |
| 123 * expanding to show a sub-page. (It's simpler for them to always create |
| 124 * these stacking contexts, so we do.) But for the overlay to work, the |
| 125 * paper-header-panel's other descendents (rooted at settings-main) must |
| 126 * never create stacking contexts while a dialog is showing. This means |
| 127 * we cannot animate a section expanding/collapsing while a dialog is |
| 128 * shown (which makes good UX sense anyway.) I have discovered a truly |
| 129 * non-marvellous proof of this, which this comment cannot contain: |
| 130 * https://goo.gl/CCzijE */ |
| 131 paper-header-panel[main] paper-toolbar { |
| 132 z-index: 2; |
| 133 } |
| 134 |
| 135 paper-header-panel[main] { |
| 136 --paper-header-panel-shadow: { |
| 137 z-index: 2; |
| 138 }; |
| 139 } |
| 140 |
| 141 /* The paper-drawer-panel implementation gives the drawer a stacking |
| 142 * context, so its z-index should at least equal the main panel's. */ |
| 143 paper-drawer-panel[narrow] { |
| 144 --paper-drawer-panel-drawer-container: { |
| 145 z-index: 2; |
| 146 }; |
| 147 } |
| 148 |
| 122 paper-toolbar { | 149 paper-toolbar { |
| 123 --paper-toolbar-height: 56px; | 150 --paper-toolbar-height: 56px; |
| 124 --paper-toolbar-sm-height: 56px; | 151 --paper-toolbar-sm-height: 56px; |
| 125 --paper-toolbar-content: { | 152 --paper-toolbar-content: { |
| 126 font-size: 123.08%; /* go to 16px from 13px */ | 153 font-size: 123.08%; /* go to 16px from 13px */ |
| 127 }; | 154 }; |
| 128 --paper-toolbar: { | 155 --paper-toolbar: { |
| 129 background-color: var(--settings-title-bar-background-color); | 156 background-color: var(--settings-title-bar-background-color); |
| 130 }; | 157 }; |
| 131 } | 158 } |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 </paper-input> | 214 </paper-input> |
| 188 </div> | 215 </div> |
| 189 </paper-toolbar> | 216 </paper-toolbar> |
| 190 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 217 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 191 </settings-main> | 218 </settings-main> |
| 192 </paper-header-panel> | 219 </paper-header-panel> |
| 193 </paper-drawer-panel> | 220 </paper-drawer-panel> |
| 194 </template> | 221 </template> |
| 195 <script src="settings_ui.js"></script> | 222 <script src="settings_ui.js"></script> |
| 196 </dom-module> | 223 </dom-module> |
| OLD | NEW |