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

Unified Diff: chrome/browser/resources/md_user_manager/user_manager_dialog.html

Issue 2024233003: MD User Manager: Refactors existing dialogs in User Manager into <user-manager-dialog> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-locked-test
Patch Set: Initial Created 4 years, 7 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/md_user_manager/user_manager_dialog.html
diff --git a/chrome/browser/resources/md_user_manager/error_dialog.html b/chrome/browser/resources/md_user_manager/user_manager_dialog.html
similarity index 54%
copy from chrome/browser/resources/md_user_manager/error_dialog.html
copy to chrome/browser/resources/md_user_manager/user_manager_dialog.html
index a105d535d093b76ac82aff81fc4de00aff002ec1..d3f25e2eff8234c07b1ce351e6e6f38e8248c294 100644
--- a/chrome/browser/resources/md_user_manager/error_dialog.html
+++ b/chrome/browser/resources/md_user_manager/user_manager_dialog.html
@@ -4,9 +4,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
-<!-- TODO(mahmadi): refactor this and import-supervised-user reusing
- <paper-dialog> or <settings-dialog> -->
-<dom-module id="error-dialog">
+<dom-module id="user-manager-dialog">
<template>
<style include="shared-styles">
#backdrop {
@@ -32,32 +30,55 @@
}
#title-bar {
- padding: 6px;
+ align-items: center;
+ border-bottom: var(--user-manager-separator-line);
+ min-height: 52px;
+ @apply(--user-manager-dialog-title-bar);
}
- #title-bar paper-icon-button {
+ #close {
--paper-icon-button: {
+ height: 40px;
padding: 10px;
+ width: 40px;
};
+ -webkit-margin-end: 6px;
+ -webkit-margin-start: auto;
+ flex-shrink: 0;
+ }
+
+ :host ::content .title {
+ -webkit-margin-end: 10px;
+ -webkit-margin-start: 16px;
+ font-size: 16px;
+ }
+
+ :host ::content .body > * {
+ padding: 0 16px;
+ }
+
+ :host ::content .body > .no-padding {
+ padding: 0;
}
- #message {
- padding: 10px 16px 62px;
- white-space: pre-wrap;
- word-wrap: break-word;
+ :host ::content .footer {
+ margin-top: 20px;
+ padding: 16px;
}
</style>
- <template is="dom-if" if="[[!popupHidden_]]">
+ <template is="dom-if" if="[[!dialogHidden_]]">
<div id="backdrop">
<div id="dialog">
- <div id="title-bar" class="horizontal end-justified layout">
- <paper-icon-button icon="cr:close" on-tap="onCloseTap_">
+ <div id="title-bar" class="horizontal justified layout">
+ <content select=".title"></content>
+ <paper-icon-button icon="cr:close" id="close" on-tap="close">
</paper-icon-button>
</div>
- <div id="message">[[message_]]</div>
+ <content select=".body"></content>
+ <content select=".footer"></content>
</div>
</div>
</template>
</template>
- <script src="chrome://md-user-manager/error_dialog.js"></script>
+ <script src="chrome://md-user-manager/user_manager_dialog.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698