| 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"> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 border-bottom: var(--settings-separator-line); | 79 border-bottom: var(--settings-separator-line); |
| 80 } | 80 } |
| 81 | 81 |
| 82 app-drawer .drawer-content { | 82 app-drawer .drawer-content { |
| 83 height: calc(100% - 56px); | 83 height: calc(100% - 56px); |
| 84 overflow: auto; | 84 overflow: auto; |
| 85 } | 85 } |
| 86 </style> | 86 </style> |
| 87 <cr-toolbar page-name="$i18n{settings}" clear-label="$i18n{clearSearch}" | 87 <cr-toolbar page-name="$i18n{settings}" clear-label="$i18n{clearSearch}" |
| 88 search-prompt="$i18n{searchPrompt}" on-cr-menu-tap="onMenuButtonTap_" | 88 search-prompt="$i18n{searchPrompt}" on-cr-menu-tap="onMenuButtonTap_" |
| 89 spinner-active="[[toolbarSpinnerActive_]]"> | 89 spinner-active="[[toolbarSpinnerActive_]]" |
| 90 menu-label="$i18n{menuButtonLabel}"> |
| 90 </cr-toolbar> | 91 </cr-toolbar> |
| 91 <app-drawer swipe-open opened="{{drawerOpened_}}"> | 92 <app-drawer swipe-open opened="{{drawerOpened_}}"> |
| 92 <div class="drawer-header">$i18n{settings}</div> | 93 <div class="drawer-header">$i18n{settings}</div> |
| 93 <div class="drawer-content"> | 94 <div class="drawer-content"> |
| 94 <template is="dom-if" if="[[drawerOpened_]]"> | 95 <template is="dom-if" if="[[drawerOpened_]]"> |
| 95 <settings-menu page-visibility="[[pageVisibility_]]" | 96 <settings-menu page-visibility="[[pageVisibility_]]" |
| 96 on-iron-activate="onIronActivate_"> | 97 on-iron-activate="onIronActivate_"> |
| 97 </settings-menu> | 98 </settings-menu> |
| 98 </template> | 99 </template> |
| 99 </div> | 100 </div> |
| 100 </app-drawer> | 101 </app-drawer> |
| 101 <paper-header-panel mode="waterfall"> | 102 <paper-header-panel mode="waterfall"> |
| 102 <settings-main prefs="{{prefs}}" | 103 <settings-main prefs="{{prefs}}" |
| 103 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 104 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 104 page-visibility="[[pageVisibility_]]"> | 105 page-visibility="[[pageVisibility_]]"> |
| 105 </settings-main> | 106 </settings-main> |
| 106 </paper-header-panel> | 107 </paper-header-panel> |
| 107 </template> | 108 </template> |
| 108 <script src="settings_ui.js"></script> | 109 <script src="settings_ui.js"></script> |
| 109 </dom-module> | 110 </dom-module> |
| OLD | NEW |