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/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 paper-header-panel { | |
| 123 --paper-header-panel-shadow: { | |
| 124 z-index: 1; | |
| 125 }; | |
| 126 --paper-header-panel-standard-container: { | |
| 127 z-index: 0; | |
| 128 }; | |
| 129 } | |
| 130 | |
| 131 paper-toolbar { | 122 paper-toolbar { |
| 132 --paper-toolbar-height: 56px; | 123 --paper-toolbar-height: 56px; |
| 133 --paper-toolbar-sm-height: 56px; | 124 --paper-toolbar-sm-height: 56px; |
| 134 --paper-toolbar-content: { | 125 --paper-toolbar-content: { |
| 135 font-size: 123.08%; /* go to 16px from 13px */ | 126 font-size: 123.08%; /* go to 16px from 13px */ |
| 136 }; | 127 } |
|
Dan Beam
2016/05/11 22:45:49
can you leave this?
michaelpg
2016/05/11 23:02:33
Done.
| |
| 137 --paper-toolbar: { | 128 --paper-toolbar: { |
| 138 background-color: var(--settings-title-bar-background-color); | 129 background-color: var(--settings-title-bar-background-color); |
| 139 }; | 130 }; |
| 140 } | 131 } |
| 141 | 132 |
| 142 /* Prevent paper-toolbar from setting the margin-right to 24px. */ | 133 /* Prevent paper-toolbar from setting the margin-right to 24px. */ |
| 143 paper-icon-button#menu-button { | 134 paper-icon-button#menu-button { |
| 144 flex-shrink: 0; | 135 flex-shrink: 0; |
| 145 /* TODO(dschuyler): this margin is on the right regardless of language | 136 /* TODO(dschuyler): this margin is on the right regardless of language |
| 146 * direction (e.g. rtl). Make a patch for paper-toolbar in Polymer. */ | 137 * direction (e.g. rtl). Make a patch for paper-toolbar in Polymer. */ |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 </paper-input> | 187 </paper-input> |
| 197 </div> | 188 </div> |
| 198 </paper-toolbar> | 189 </paper-toolbar> |
| 199 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 190 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 200 </settings-main> | 191 </settings-main> |
| 201 </paper-header-panel> | 192 </paper-header-panel> |
| 202 </paper-drawer-panel> | 193 </paper-drawer-panel> |
| 203 </template> | 194 </template> |
| 204 <script src="settings_ui.js"></script> | 195 <script src="settings_ui.js"></script> |
| 205 </dom-module> | 196 </dom-module> |
| OLD | NEW |