| Index: chrome/browser/resources/settings/settings_ui/settings_ui.html
|
| diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html
|
| index 2afab9cb2e2d25a928d27320e4137ff51a112f4d..a0855273554e4bae03cea5aec0a9886d8894a475 100644
|
| --- a/chrome/browser/resources/settings/settings_ui/settings_ui.html
|
| +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html
|
| @@ -1,9 +1,9 @@
|
| <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.html">
|
| <link rel="import" href="chrome://resources/cr_elements/icons.html">
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/app-drawer.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/paper-header-panel.html">
|
| +<link rel="import" href="/controls/dialog_drawer.html">
|
| <link rel="import" href="/direction_delegate.html">
|
| <link rel="import" href="/global_scroll_target_behavior.html">
|
| <link rel="import" href="/i18n_setup.html">
|
| @@ -51,11 +51,11 @@
|
| width: 100%;
|
| }
|
|
|
| - app-drawer {
|
| + dialog[is='dialog-drawer'] {
|
| z-index: 2;
|
| }
|
|
|
| - app-drawer .drawer-header {
|
| + dialog[is='dialog-drawer'] .drawer-header {
|
| align-items: center;
|
| display: flex;
|
| font-size: 123.08%; /* go to 16px from 13px */
|
| @@ -75,12 +75,12 @@
|
| --iron-icon-fill-color: white;
|
| }
|
|
|
| - app-drawer .drawer-header {
|
| + dialog[is='dialog-drawer'] .drawer-header {
|
| -webkit-padding-start: 24px;
|
| border-bottom: var(--settings-separator-line);
|
| }
|
|
|
| - app-drawer .drawer-content {
|
| + dialog[is='dialog-drawer'] .drawer-content {
|
| height: calc(100% - 56px);
|
| overflow: auto;
|
| }
|
| @@ -95,7 +95,7 @@
|
| on-search-changed="onSearchChanged_"
|
| show-menu>
|
| </cr-toolbar>
|
| - <app-drawer swipe-open>
|
| + <dialog id="drawer" is="dialog-drawer">
|
| <div class="drawer-header">$i18n{settings}</div>
|
| <div class="drawer-content">
|
| <template is="dom-if" id="drawerTemplate">
|
| @@ -106,7 +106,7 @@
|
| </settings-menu>
|
| </template>
|
| </div>
|
| - </app-drawer>
|
| + </dialog>
|
| <paper-header-panel id="headerPanel" mode="waterfall">
|
| <settings-main id="main" prefs="{{prefs}}"
|
| toolbar-spinner-active="{{toolbarSpinnerActive_}}"
|
|
|