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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 top: 4px; | 87 top: 4px; |
| 88 }; | 88 }; |
| 89 --paper-input-container-input-color: var(--settings-title-bar-color); | 89 --paper-input-container-input-color: var(--settings-title-bar-color); |
| 90 --paper-input-container-label: { | 90 --paper-input-container-label: { |
| 91 font-size: 81.25%; /* go to 13px from 16px */ | 91 font-size: 81.25%; /* go to 13px from 16px */ |
| 92 top: 3px; /* Special positioning needed for UX design. */ | 92 top: 3px; /* Special positioning needed for UX design. */ |
| 93 }; | 93 }; |
| 94 --paper-input-max-width: 200px; | 94 --paper-input-max-width: 200px; |
| 95 } | 95 } |
| 96 | 96 |
| 97 paper-header-panel { | |
| 98 --paper-header-panel-shadow: { | |
| 99 z-index: 100; | |
|
Dan Beam
2016/05/10 00:46:37
in a perfect world, we would not treat z-index as
michaelpg
2016/05/10 02:29:13
My next version is slightly perfecter.
Giving the
| |
| 100 }; | |
| 101 } | |
| 102 | |
| 97 paper-toolbar { | 103 paper-toolbar { |
| 98 --paper-toolbar-height: 56px; | 104 --paper-toolbar-height: 56px; |
| 99 --paper-toolbar-sm-height: 56px; | 105 --paper-toolbar-sm-height: 56px; |
| 100 --paper-toolbar-content: { | 106 --paper-toolbar-content: { |
| 101 font-size: 123.08%; /* go to 16px from 13px */ | 107 font-size: 123.08%; /* go to 16px from 13px */ |
| 102 } | 108 } |
| 103 --paper-toolbar: { | 109 --paper-toolbar: { |
| 104 background-color: var(--settings-title-bar-background-color); | 110 background-color: var(--settings-title-bar-background-color); |
| 105 }; | 111 }; |
| 112 z-index: 100; | |
| 106 } | 113 } |
| 107 | 114 |
| 108 /* Prevent paper-toolbar from setting the margin-right to 24px. */ | 115 /* Prevent paper-toolbar from setting the margin-right to 24px. */ |
| 109 paper-icon-button#menu-button { | 116 paper-icon-button#menu-button { |
| 110 flex-shrink: 0; | 117 flex-shrink: 0; |
| 111 /* TODO(dschuyler): this margin is on the right regardless of language | 118 /* TODO(dschuyler): this margin is on the right regardless of language |
| 112 * direction (e.g. rtl). Make a patch for paper-toolbar in Polymer. */ | 119 * direction (e.g. rtl). Make a patch for paper-toolbar in Polymer. */ |
| 113 margin-right: 0; | 120 margin-right: 0; |
| 114 } | 121 } |
| 115 | 122 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 </paper-input> | 168 </paper-input> |
| 162 </div> | 169 </div> |
| 163 </paper-toolbar> | 170 </paper-toolbar> |
| 164 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 171 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 165 </paper-icon-button> | 172 </paper-icon-button> |
| 166 </paper-header-panel> | 173 </paper-header-panel> |
| 167 </paper-drawer-panel> | 174 </paper-drawer-panel> |
| 168 </template> | 175 </template> |
| 169 <script src="settings_ui.js"></script> | 176 <script src="settings_ui.js"></script> |
| 170 </dom-module> | 177 </dom-module> |
| OLD | NEW |