| 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"> | |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 4 <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"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
| 6 <link rel="import" href="/controls/dialog_drawer.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"> |
| 11 <link rel="import" href="/settings_main/settings_main.html"> | 11 <link rel="import" href="/settings_main/settings_main.html"> |
| 12 <link rel="import" href="/settings_menu/settings_menu.html"> | 12 <link rel="import" href="/settings_menu/settings_menu.html"> |
| 13 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="/settings_shared_css.html"> |
| 14 <link rel="import" href="/prefs/prefs.html"> | 14 <link rel="import" href="/prefs/prefs.html"> |
| 15 <link rel="import" href="/route.html"> | 15 <link rel="import" href="/route.html"> |
| 16 <link rel="import" href="/settings_vars_css.html"> | 16 <link rel="import" href="/settings_vars_css.html"> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 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 dialog[is='dialog-drawer'] { |
| 55 z-index: 2; | 55 z-index: 2; |
| 56 } | 56 } |
| 57 | 57 |
| 58 app-drawer .drawer-header { | 58 dialog[is='dialog-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 --cr-toolbar-field-width: var(--settings-card-max-width); | 67 --cr-toolbar-field-width: var(--settings-card-max-width); |
| 68 background-color: var(--settings-title-bar-background-color); | 68 background-color: var(--settings-title-bar-background-color); |
| 69 color: white; | 69 color: white; |
| 70 min-height: 56px; | 70 min-height: 56px; |
| 71 z-index: 2; | 71 z-index: 2; |
| 72 } | 72 } |
| 73 | 73 |
| 74 cr-toolbar { | 74 cr-toolbar { |
| 75 --iron-icon-fill-color: white; | 75 --iron-icon-fill-color: white; |
| 76 } | 76 } |
| 77 | 77 |
| 78 app-drawer .drawer-header { | 78 dialog[is='dialog-drawer'] .drawer-header { |
| 79 -webkit-padding-start: 24px; | 79 -webkit-padding-start: 24px; |
| 80 border-bottom: var(--settings-separator-line); | 80 border-bottom: var(--settings-separator-line); |
| 81 } | 81 } |
| 82 | 82 |
| 83 app-drawer .drawer-content { | 83 dialog[is='dialog-drawer'] .drawer-content { |
| 84 height: calc(100% - 56px); | 84 height: calc(100% - 56px); |
| 85 overflow: auto; | 85 overflow: auto; |
| 86 } | 86 } |
| 87 </style> | 87 </style> |
| 88 <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs> | 88 <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs> |
| 89 <cr-toolbar page-name="$i18n{settings}" | 89 <cr-toolbar page-name="$i18n{settings}" |
| 90 clear-label="$i18n{clearSearch}" | 90 clear-label="$i18n{clearSearch}" |
| 91 search-prompt="$i18n{searchPrompt}" | 91 search-prompt="$i18n{searchPrompt}" |
| 92 on-cr-toolbar-menu-tap="onMenuButtonTap_" | 92 on-cr-toolbar-menu-tap="onMenuButtonTap_" |
| 93 spinner-active="[[toolbarSpinnerActive_]]" | 93 spinner-active="[[toolbarSpinnerActive_]]" |
| 94 menu-label="$i18n{menuButtonLabel}" | 94 menu-label="$i18n{menuButtonLabel}" |
| 95 on-search-changed="onSearchChanged_" | 95 on-search-changed="onSearchChanged_" |
| 96 show-menu> | 96 show-menu> |
| 97 </cr-toolbar> | 97 </cr-toolbar> |
| 98 <app-drawer swipe-open> | 98 <dialog id="drawer" is="dialog-drawer"> |
| 99 <div class="drawer-header">$i18n{settings}</div> | 99 <div class="drawer-header">$i18n{settings}</div> |
| 100 <div class="drawer-content"> | 100 <div class="drawer-content"> |
| 101 <template is="dom-if" id="drawerTemplate"> | 101 <template is="dom-if" id="drawerTemplate"> |
| 102 <settings-menu page-visibility="[[pageVisibility_]]" | 102 <settings-menu page-visibility="[[pageVisibility_]]" |
| 103 show-android-apps="[[showAndroidApps_]]" | 103 show-android-apps="[[showAndroidApps_]]" |
| 104 on-iron-activate="onIronActivate_" | 104 on-iron-activate="onIronActivate_" |
| 105 advanced-opened="{{advancedOpened_}}"> | 105 advanced-opened="{{advancedOpened_}}"> |
| 106 </settings-menu> | 106 </settings-menu> |
| 107 </template> | 107 </template> |
| 108 </div> | 108 </div> |
| 109 </app-drawer> | 109 </dialog> |
| 110 <paper-header-panel id="headerPanel" mode="waterfall"> | 110 <paper-header-panel id="headerPanel" mode="waterfall"> |
| 111 <settings-main id="main" prefs="{{prefs}}" | 111 <settings-main id="main" prefs="{{prefs}}" |
| 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 113 page-visibility="[[pageVisibility_]]" | 113 page-visibility="[[pageVisibility_]]" |
| 114 show-android-apps="[[showAndroidApps_]]" | 114 show-android-apps="[[showAndroidApps_]]" |
| 115 advanced-toggle-expanded="{{advancedOpened_}}"> | 115 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 116 </settings-main> | 116 </settings-main> |
| 117 </paper-header-panel> | 117 </paper-header-panel> |
| 118 </template> | 118 </template> |
| 119 <script src="settings_ui.js"></script> | 119 <script src="settings_ui.js"></script> |
| 120 </dom-module> | 120 </dom-module> |
| OLD | NEW |