| 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="/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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 app-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}" clear-label="$i18n{clearSearch}" | 89 <cr-toolbar page-name="$i18n{settings}" |
| 90 search-prompt="$i18n{searchPrompt}" on-cr-menu-tap="onMenuButtonTap_" | 90 clear-label="$i18n{clearSearch}" |
| 91 spinner-active="[[toolbarSpinnerActive_]]" show-menu | 91 search-prompt="$i18n{searchPrompt}" |
| 92 menu-label="$i18n{menuButtonLabel}"> | 92 on-cr-toolbar-menu-tap="onMenuButtonTap_" |
| 93 spinner-active="[[toolbarSpinnerActive_]]" |
| 94 menu-label="$i18n{menuButtonLabel}" |
| 95 show-menu> |
| 93 </cr-toolbar> | 96 </cr-toolbar> |
| 94 <app-drawer swipe-open> | 97 <app-drawer swipe-open> |
| 95 <div class="drawer-header">$i18n{settings}</div> | 98 <div class="drawer-header">$i18n{settings}</div> |
| 96 <div class="drawer-content"> | 99 <div class="drawer-content"> |
| 97 <template is="dom-if" id="drawerTemplate"> | 100 <template is="dom-if" id="drawerTemplate"> |
| 98 <settings-menu page-visibility="[[pageVisibility_]]" | 101 <settings-menu page-visibility="[[pageVisibility_]]" |
| 99 on-iron-activate="onIronActivate_" | 102 on-iron-activate="onIronActivate_" |
| 100 advanced-opened="{{advancedOpened_}}"> | 103 advanced-opened="{{advancedOpened_}}"> |
| 101 </settings-menu> | 104 </settings-menu> |
| 102 </template> | 105 </template> |
| 103 </div> | 106 </div> |
| 104 </app-drawer> | 107 </app-drawer> |
| 105 <paper-header-panel id="headerPanel" mode="waterfall"> | 108 <paper-header-panel id="headerPanel" mode="waterfall"> |
| 106 <settings-main prefs="{{prefs}}" | 109 <settings-main prefs="{{prefs}}" |
| 107 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 110 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 108 page-visibility="[[pageVisibility_]]" | 111 page-visibility="[[pageVisibility_]]" |
| 109 advanced-toggle-expanded="{{advancedOpened_}}"> | 112 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 110 </settings-main> | 113 </settings-main> |
| 111 </paper-header-panel> | 114 </paper-header-panel> |
| 112 </template> | 115 </template> |
| 113 <script src="settings_ui.js"></script> | 116 <script src="settings_ui.js"></script> |
| 114 </dom-module> | 117 </dom-module> |
| OLD | NEW |