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

Unified Diff: chrome/browser/resources/md_settings/md_settings.html

Issue 939533002: Add a cr-button element, a thin wrapper around paper-button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase with suspected fixes for bots Created 5 years, 10 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
« no previous file with comments | « chrome/browser/resources/md_settings/md_settings.css ('k') | chrome/browser/ui/webui/md_settings_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/md_settings/md_settings.html
diff --git a/chrome/browser/resources/md_settings/md_settings.html b/chrome/browser/resources/md_settings/md_settings.html
index 70f4c0b1a138b07a05293744e65781f8e29c70ae..c3b584207ebf585d9469e7c8b8f3f61626ce613f 100644
--- a/chrome/browser/resources/md_settings/md_settings.html
+++ b/chrome/browser/resources/md_settings/md_settings.html
@@ -6,25 +6,31 @@
<link rel="import" href="chrome://resources/polymer/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html">
<link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html">
- <link rel="import"
- href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
- <link rel="import"
- href="chrome://resources/cr_elements/cr_collapse/cr_collapse.html">
- <link rel="import"
- href="chrome://resources/cr_elements/cr_toggle_button/cr_toggle_button.html">
- <link rel="import"
- href="chrome://resources/cr_elements/cr_dropdown_menu/cr_dropdown_menu.html">
+ <link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
+ <link rel="import" href="chrome://resources/cr_elements/cr_collapse/cr_collapse.html">
+ <link rel="import" href="chrome://resources/cr_elements/cr_toggle_button/cr_toggle_button.html">
+ <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
+ <link rel="import" href="chrome://resources/cr_elements/cr_dropdown_menu/cr_dropdown_menu.html">
+ <link rel="stylesheet" href="md_settings.css">
</head>
<body>
<header>
<h1>Settings</h1>
</header>
<div class="main">
- <cr-toggle-button checked></cr-toggle-button>
- <cr-checkbox checked></cr-checkbox>
<section>
- <h2>cr-dropdown-menu</h2>
- <cr-dropdown-menu style="width: 200px">
+ <h3>cr-toggle-button</h3>
+ <cr-toggle-button></cr-toggle-button>
+ <cr-toggle-button checked></cr-toggle-button>
+ </section>
+ <section>
+ <h3>cr-checkbox</h3>
+ <cr-checkbox></cr-checkbox>
+ <cr-checkbox checked></cr-checkbox>
+ </section>
+ <section>
+ <h3>cr-dropdown-menu</h3>
+ <cr-dropdown-menu>
<core-menu class="menu">
<paper-item>Chrome</paper-item>
<paper-item>IE</paper-item>
@@ -41,6 +47,11 @@
<div>collapsed content</div>
</cr-collapse>
</section>
+ <section>
+ <h3>cr-button</h3>
+ <cr-button>Flat button</cr-button>
+ <cr-button raised>Raised Button</cr-button>
+ </section>
</div>
<script>
var collapse = document.getElementById('collapse');
« no previous file with comments | « chrome/browser/resources/md_settings/md_settings.css ('k') | chrome/browser/ui/webui/md_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698