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

Unified 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 side-by-side diff with in-line comments
Download patch
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 a0855273554e4bae03cea5aec0a9886d8894a475..55c43e796c6779d431907b8e7612769a3267ed24 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_drawer/cr_drawer.html">
<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/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,39 +51,19 @@
width: 100%;
}
- dialog[is='dialog-drawer'] {
+ dialog[is='cr-drawer'] {
z-index: 2;
}
- dialog[is='dialog-drawer'] .drawer-header {
- align-items: center;
- display: flex;
- font-size: 123.08%; /* go to 16px from 13px */
- min-height: 56px;
- }
-
cr-toolbar {
@apply(--layout-center);
--cr-toolbar-field-width: var(--settings-card-max-width);
+ --iron-icon-fill-color: white;
background-color: var(--settings-title-bar-background-color);
color: white;
min-height: 56px;
z-index: 2;
}
-
- cr-toolbar {
- --iron-icon-fill-color: white;
- }
-
- dialog[is='dialog-drawer'] .drawer-header {
- -webkit-padding-start: 24px;
- border-bottom: var(--settings-separator-line);
- }
-
- dialog[is='dialog-drawer'] .drawer-content {
- height: calc(100% - 56px);
- overflow: auto;
- }
</style>
<settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs>
<cr-toolbar page-name="$i18n{settings}"
@@ -95,7 +75,7 @@
on-search-changed="onSearchChanged_"
show-menu>
</cr-toolbar>
- <dialog id="drawer" is="dialog-drawer">
+ <dialog id="drawer" is="cr-drawer">
<div class="drawer-header">$i18n{settings}</div>
<div class="drawer-content">
<template is="dom-if" id="drawerTemplate">

Powered by Google App Engine
This is Rietveld 408576698