| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 border-bottom: var(--settings-separator-line); | 78 border-bottom: var(--settings-separator-line); |
| 79 } | 79 } |
| 80 | 80 |
| 81 app-drawer .drawer-content { | 81 app-drawer .drawer-content { |
| 82 height: calc(100% - 56px); | 82 height: calc(100% - 56px); |
| 83 overflow: auto; | 83 overflow: auto; |
| 84 } | 84 } |
| 85 </style> | 85 </style> |
| 86 <cr-toolbar page-name="$i18n{settings}" clear-label="$i18n{clearSearch}" | 86 <cr-toolbar page-name="$i18n{settings}" clear-label="$i18n{clearSearch}" |
| 87 search-prompt="$i18n{searchPrompt}" on-cr-menu-tap="onMenuButtonTap_" | 87 search-prompt="$i18n{searchPrompt}" on-cr-menu-tap="onMenuButtonTap_" |
| 88 spinner-active="[[toolbarSpinnerActive_]]"> | 88 spinner-active="[[toolbarSpinnerActive_]]" |
| 89 button-label="$i18n{menuButtonLabel}"> |
| 89 </cr-toolbar> | 90 </cr-toolbar> |
| 90 <app-drawer swipe-open> | 91 <app-drawer swipe-open> |
| 91 <div class="drawer-header">$i18n{settings}</div> | 92 <div class="drawer-header">$i18n{settings}</div> |
| 92 <div class="drawer-content"> | 93 <div class="drawer-content"> |
| 93 <settings-menu id="sideNav" page-visibility="[[pageVisibility_]]"> | 94 <settings-menu id="sideNav" page-visibility="[[pageVisibility_]]"> |
| 94 </settings-menu> | 95 </settings-menu> |
| 95 </div> | 96 </div> |
| 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 |