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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 9 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
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!doctype html> 1 <!doctype html>
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title>Settings</title> 5 <title>Settings</title>
6 <link rel="import" href="chrome://resources/polymer/paper-button/paper-button. html"> 6 <link rel="import" href="chrome://resources/polymer/paper-button/paper-button. html">
7 <link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html "> 7 <link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html ">
8 <link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html"> 8 <link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html">
9 <link rel="import" 9 <link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbo x.html">
10 href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html"> 10 <link rel="import" href="chrome://resources/cr_elements/cr_collapse/cr_collaps e.html">
11 <link rel="import" 11 <link rel="import" href="chrome://resources/cr_elements/cr_toggle_button/cr_to ggle_button.html">
12 href="chrome://resources/cr_elements/cr_collapse/cr_collapse.html"> 12 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.ht ml">
13 <link rel="import" 13 <link rel="import" href="chrome://resources/cr_elements/cr_dropdown_menu/cr_dr opdown_menu.html">
14 href="chrome://resources/cr_elements/cr_toggle_button/cr_toggle_button.htm l"> 14 <link rel="stylesheet" href="md_settings.css">
15 <link rel="import"
16 href="chrome://resources/cr_elements/cr_dropdown_menu/cr_dropdown_menu.htm l">
17 </head> 15 </head>
18 <body> 16 <body>
19 <header> 17 <header>
20 <h1>Settings</h1> 18 <h1>Settings</h1>
21 </header> 19 </header>
22 <div class="main"> 20 <div class="main">
23 <cr-toggle-button checked></cr-toggle-button>
24 <cr-checkbox checked></cr-checkbox>
25 <section> 21 <section>
26 <h2>cr-dropdown-menu</h2> 22 <h3>cr-toggle-button</h3>
27 <cr-dropdown-menu style="width: 200px"> 23 <cr-toggle-button></cr-toggle-button>
24 <cr-toggle-button checked></cr-toggle-button>
25 </section>
26 <section>
27 <h3>cr-checkbox</h3>
28 <cr-checkbox></cr-checkbox>
29 <cr-checkbox checked></cr-checkbox>
30 </section>
31 <section>
32 <h3>cr-dropdown-menu</h3>
33 <cr-dropdown-menu>
28 <core-menu class="menu"> 34 <core-menu class="menu">
29 <paper-item>Chrome</paper-item> 35 <paper-item>Chrome</paper-item>
30 <paper-item>IE</paper-item> 36 <paper-item>IE</paper-item>
31 <paper-item>Firefox</paper-item> 37 <paper-item>Firefox</paper-item>
32 </core-menu> 38 </core-menu>
33 </cr-dropdown-menu> 39 </cr-dropdown-menu>
34 </section> 40 </section>
35 <section> 41 <section>
36 <h2>cr-collapse</h2> 42 <h2>cr-collapse</h2>
37 <paper-button id="manage-button" raised onclick="toggleCollapse();"> 43 <paper-button id="manage-button" raised onclick="toggleCollapse();">
38 Toggle Collapse 44 Toggle Collapse
39 </paper-button> 45 </paper-button>
40 <cr-collapse id="collapse"> 46 <cr-collapse id="collapse">
41 <div>collapsed content</div> 47 <div>collapsed content</div>
42 </cr-collapse> 48 </cr-collapse>
43 </section> 49 </section>
50 <section>
51 <h3>cr-button</h3>
52 <cr-button>Flat button</cr-button>
53 <cr-button raised>Raised Button</cr-button>
54 </section>
44 </div> 55 </div>
45 <script> 56 <script>
46 var collapse = document.getElementById('collapse'); 57 var collapse = document.getElementById('collapse');
47 function toggleCollapse() { 58 function toggleCollapse() {
48 collapse.toggle(); 59 collapse.toggle();
49 } 60 }
50 </script> 61 </script>
51 </body> 62 </body>
52 </html> 63 </html>
OLDNEW
« 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