Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Side by Side Diff: chrome/browser/resources/settings/settings_ui/settings_ui.html

Issue 2628123002: MD WebUI: Move settings' dialog-drawer element into a shared cr-element (Closed)
Patch Set: Rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html ">
1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht ml"> 2 <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"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
4 <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">
5 <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">
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
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 dialog[is='dialog-drawer'] { 54 dialog[is='cr-drawer'] {
55 z-index: 2; 55 z-index: 2;
56 } 56 }
57 57
58 dialog[is='dialog-drawer'] .drawer-header {
59 align-items: center;
60 display: flex;
61 font-size: 123.08%; /* go to 16px from 13px */
62 min-height: 56px;
63 }
64
65 cr-toolbar { 58 cr-toolbar {
66 @apply(--layout-center); 59 @apply(--layout-center);
67 --cr-toolbar-field-width: var(--settings-card-max-width); 60 --cr-toolbar-field-width: var(--settings-card-max-width);
61 --iron-icon-fill-color: white;
68 background-color: var(--settings-title-bar-background-color); 62 background-color: var(--settings-title-bar-background-color);
69 color: white; 63 color: white;
70 min-height: 56px; 64 min-height: 56px;
71 z-index: 2; 65 z-index: 2;
72 } 66 }
73
74 cr-toolbar {
75 --iron-icon-fill-color: white;
76 }
77
78 dialog[is='dialog-drawer'] .drawer-header {
79 -webkit-padding-start: 24px;
80 border-bottom: var(--settings-separator-line);
81 }
82
83 dialog[is='dialog-drawer'] .drawer-content {
84 height: calc(100% - 56px);
85 overflow: auto;
86 }
87 </style> 67 </style>
88 <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs> 68 <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs>
89 <cr-toolbar page-name="$i18n{settings}" 69 <cr-toolbar page-name="$i18n{settings}"
90 clear-label="$i18n{clearSearch}" 70 clear-label="$i18n{clearSearch}"
91 search-prompt="$i18n{searchPrompt}" 71 search-prompt="$i18n{searchPrompt}"
92 on-cr-toolbar-menu-tap="onMenuButtonTap_" 72 on-cr-toolbar-menu-tap="onMenuButtonTap_"
93 spinner-active="[[toolbarSpinnerActive_]]" 73 spinner-active="[[toolbarSpinnerActive_]]"
94 menu-label="$i18n{menuButtonLabel}" 74 menu-label="$i18n{menuButtonLabel}"
95 on-search-changed="onSearchChanged_" 75 on-search-changed="onSearchChanged_"
96 show-menu> 76 show-menu>
97 </cr-toolbar> 77 </cr-toolbar>
98 <dialog id="drawer" is="dialog-drawer"> 78 <dialog id="drawer" is="cr-drawer">
99 <div class="drawer-header">$i18n{settings}</div> 79 <div class="drawer-header">$i18n{settings}</div>
100 <div class="drawer-content"> 80 <div class="drawer-content">
101 <template is="dom-if" id="drawerTemplate"> 81 <template is="dom-if" id="drawerTemplate">
102 <settings-menu page-visibility="[[pageVisibility_]]" 82 <settings-menu page-visibility="[[pageVisibility_]]"
103 show-android-apps="[[showAndroidApps_]]" 83 show-android-apps="[[showAndroidApps_]]"
104 on-iron-activate="onIronActivate_" 84 on-iron-activate="onIronActivate_"
105 advanced-opened="{{advancedOpened_}}"> 85 advanced-opened="{{advancedOpened_}}">
106 </settings-menu> 86 </settings-menu>
107 </template> 87 </template>
108 </div> 88 </div>
109 </dialog> 89 </dialog>
110 <paper-header-panel id="headerPanel" mode="waterfall"> 90 <paper-header-panel id="headerPanel" mode="waterfall">
111 <settings-main id="main" prefs="{{prefs}}" 91 <settings-main id="main" prefs="{{prefs}}"
112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" 92 toolbar-spinner-active="{{toolbarSpinnerActive_}}"
113 page-visibility="[[pageVisibility_]]" 93 page-visibility="[[pageVisibility_]]"
114 show-android-apps="[[showAndroidApps_]]" 94 show-android-apps="[[showAndroidApps_]]"
115 advanced-toggle-expanded="{{advancedOpened_}}"> 95 advanced-toggle-expanded="{{advancedOpened_}}">
116 </settings-main> 96 </settings-main>
117 </paper-header-panel> 97 </paper-header-panel>
118 </template> 98 </template>
119 <script src="settings_ui.js"></script> 99 <script src="settings_ui.js"></script>
120 </dom-module> 100 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698