| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html
"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.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="/global_scroll_target_behavior.html"> | 8 <link rel="import" href="/global_scroll_target_behavior.html"> |
| 9 <link rel="import" href="/i18n_setup.html"> | 9 <link rel="import" href="/i18n_setup.html"> |
| 10 <link rel="import" href="/icons.html"> | 10 <link rel="import" href="/icons.html"> |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 @apply(--layout-fit); | 26 @apply(--layout-fit); |
| 27 --paper-header-panel-waterfall-container: { | 27 --paper-header-panel-waterfall-container: { |
| 28 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ | 28 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ |
| 29 overflow-y: overlay; | 29 overflow-y: overlay; |
| 30 }; | 30 }; |
| 31 -webkit-user-select: none; | 31 -webkit-user-select: none; |
| 32 background-color: var(--settings-background-color); | 32 background-color: var(--settings-background-color); |
| 33 color: var(--paper-grey-800); | 33 color: var(--paper-grey-800); |
| 34 display: flex; | 34 display: flex; |
| 35 flex-direction: column; | 35 flex-direction: column; |
| 36 line-height: 154%; /* Apply 20px line-height to all texts by default. */ |
| 36 overflow: hidden; /* Prevent double scroll bar bugs. */ | 37 overflow: hidden; /* Prevent double scroll bar bugs. */ |
| 37 } | 38 } |
| 38 | 39 |
| 39 paper-header-panel { | 40 paper-header-panel { |
| 40 flex: 1; | 41 flex: 1; |
| 41 } | 42 } |
| 42 | 43 |
| 43 .paper-header { | 44 .paper-header { |
| 44 -webkit-padding-start: 24px; | 45 -webkit-padding-start: 24px; |
| 45 align-items: center; | 46 align-items: center; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 <settings-main id="main" prefs="{{prefs}}" | 96 <settings-main id="main" prefs="{{prefs}}" |
| 96 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 97 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 97 page-visibility="[[pageVisibility_]]" | 98 page-visibility="[[pageVisibility_]]" |
| 98 show-android-apps="[[showAndroidApps_]]" | 99 show-android-apps="[[showAndroidApps_]]" |
| 99 advanced-toggle-expanded="{{advancedOpened_}}"> | 100 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 100 </settings-main> | 101 </settings-main> |
| 101 </paper-header-panel> | 102 </paper-header-panel> |
| 102 </template> | 103 </template> |
| 103 <script src="settings_ui.js"></script> | 104 <script src="settings_ui.js"></script> |
| 104 </dom-module> | 105 </dom-module> |
| OLD | NEW |