| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
| 7 <link rel="import" href="/direction_delegate.html"> | 7 <link rel="import" href="/direction_delegate.html"> |
| 8 <link rel="import" href="/i18n_setup.html"> | 8 <link rel="import" href="/i18n_setup.html"> |
| 9 <link rel="import" href="/icons.html"> | 9 <link rel="import" href="/icons.html"> |
| 10 <link rel="import" href="/settings_main/settings_main.html"> | 10 <link rel="import" href="/settings_main/settings_main.html"> |
| 11 <link rel="import" href="/settings_menu/settings_menu.html"> | 11 <link rel="import" href="/settings_menu/settings_menu.html"> |
| 12 <link rel="import" href="/settings_shared_css.html"> | 12 <link rel="import" href="/settings_shared_css.html"> |
| 13 | 13 |
| 14 <dom-module id="settings-ui"> | 14 <dom-module id="settings-ui"> |
| 15 <template> | 15 <template> |
| 16 <style include="settings-shared"> | 16 <style include="settings-shared"> |
| 17 :host { | 17 :host { |
| 18 @apply(--layout-fit); | 18 @apply(--layout-fit); |
| 19 --paper-header-panel-waterfall-container: { | 19 --paper-header-panel-waterfall-container: { |
| 20 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ | 20 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ |
| 21 }; | 21 }; |
| 22 -webkit-user-select: none; | 22 -webkit-user-select: none; |
| 23 background-color: var(--settings-background-color); | 23 background-color: var(--settings-background-color); |
| 24 display: flex; | 24 display: flex; |
| 25 flex-direction: column; | 25 flex-direction: column; |
| 26 } | 26 } |
| 27 | 27 |
| 28 paper-header-panel { | 28 paper-header-panel { |
| 29 --paper-header-panel-shadow: { | 29 --paper-header-panel-shadow: { |
| 30 z-index: 2; | 30 z-index: 3; |
| 31 }; | 31 }; |
| 32 flex: 1; | 32 flex: 1; |
| 33 } | 33 } |
| 34 | 34 |
| 35 .heading { | 35 .heading { |
| 36 -webkit-margin-start: 8px; | 36 -webkit-margin-start: 8px; |
| 37 } | 37 } |
| 38 | 38 |
| 39 .paper-header { | 39 .paper-header { |
| 40 -webkit-padding-start: 24px; | 40 -webkit-padding-start: 24px; |
| 41 align-items: center; | 41 align-items: center; |
| 42 border-bottom: var(--settings-separator-line); | 42 border-bottom: var(--settings-separator-line); |
| 43 display: flex; | 43 display: flex; |
| 44 font-size: 123.08%; /* go to 16px from 13px */ | 44 font-size: 123.08%; /* go to 16px from 13px */ |
| 45 min-height: 56px; | 45 min-height: 56px; |
| 46 } | 46 } |
| 47 | 47 |
| 48 .last { | 48 .last { |
| 49 display: flex; | 49 display: flex; |
| 50 justify-content: flex-end; | 50 justify-content: flex-end; |
| 51 width: 100%; | 51 width: 100%; |
| 52 } | 52 } |
| 53 | 53 |
| 54 app-drawer { | 54 app-drawer { |
| 55 z-index: 1; | 55 z-index: 2; |
| 56 } | 56 } |
| 57 | 57 |
| 58 app-drawer .drawer-header { | 58 app-drawer .drawer-header { |
| 59 align-items: center; | 59 align-items: center; |
| 60 display: flex; | 60 display: flex; |
| 61 font-size: 123.08%; /* go to 16px from 13px */ | 61 font-size: 123.08%; /* go to 16px from 13px */ |
| 62 min-height: 56px; | 62 min-height: 56px; |
| 63 } | 63 } |
| 64 | 64 |
| 65 cr-toolbar { | 65 cr-toolbar { |
| 66 @apply(--layout-center); | 66 @apply(--layout-center); |
| 67 background-color: var(--settings-title-bar-background-color); | 67 background-color: var(--settings-title-bar-background-color); |
| 68 color: white; | 68 color: white; |
| 69 min-height: 56px; | 69 min-height: 56px; |
| 70 z-index: 2; |
| 70 } | 71 } |
| 71 | 72 |
| 72 cr-toolbar { | 73 cr-toolbar { |
| 73 --iron-icon-fill-color: white; | 74 --iron-icon-fill-color: white; |
| 74 } | 75 } |
| 75 | 76 |
| 76 app-drawer .drawer-header { | 77 app-drawer .drawer-header { |
| 77 -webkit-padding-start: 24px; | 78 -webkit-padding-start: 24px; |
| 78 border-bottom: var(--settings-separator-line); | 79 border-bottom: var(--settings-separator-line); |
| 79 } | 80 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 96 </app-drawer> | 97 </app-drawer> |
| 97 <paper-header-panel mode="waterfall"> | 98 <paper-header-panel mode="waterfall"> |
| 98 <settings-main prefs="{{prefs}}" | 99 <settings-main prefs="{{prefs}}" |
| 99 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 100 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 100 page-visibility="[[pageVisibility_]]"> | 101 page-visibility="[[pageVisibility_]]"> |
| 101 </settings-main> | 102 </settings-main> |
| 102 </paper-header-panel> | 103 </paper-header-panel> |
| 103 </template> | 104 </template> |
| 104 <script src="settings_ui.js"></script> | 105 <script src="settings_ui.js"></script> |
| 105 </dom-module> | 106 </dom-module> |
| OLD | NEW |