chrome/browser/resources/settings/settings_page/settings_subpage.html - Issue 2615673003: [MD WebUI] Move icons used in Bookmarks and Settings to shared file.

Side by Side Diff: chrome/browser/resources/settings/settings_page/settings_subpage.html

Issue 2615673003: [MD WebUI] Move icons used in Bookmarks and Settings to shared file. (Closed)

Patch Set: reorder some icons 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:

« chrome/browser/resources/settings/icons.html ('K') | « chrome/browser/resources/settings/settings_menu/settings_menu.js ('k') | chrome/browser/resources/settings/settings_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/html/polymer.html">	1 <link rel="import" href="chrome://resources/html/polymer.html">

	2 <link rel="import" href="chrome://resources/cr_elements/icons.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable-behavior.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable-behavior.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">

5 <link rel="import" href="/icons.html">

6 <link rel="import" href="/route.html">	6 <link rel="import" href="/route.html">

7 <link rel="import" href="/settings_page/settings_subpage_search.html">	7 <link rel="import" href="/settings_page/settings_subpage_search.html">

8 <link rel="import" href="/settings_shared_css.html">	8 <link rel="import" href="/settings_shared_css.html">

9	9

10 <dom-module id="settings-subpage">	10 <dom-module id="settings-subpage">

11 <template>	11 <template>

12 <style include="settings-shared">	12 <style include="settings-shared">

13 :host {	13 :host {

14 --iron-icon-fill-color: var(--settings-nav-grey);	14 --iron-icon-fill-color: var(--settings-nav-grey);

15 display: block;	15 display: block;

(...skipping 16 matching lines...) Expand all Loading...
32 flex: 1; /* Push other items to the end. */	32 flex: 1; /* Push other items to the end. */

33 font-size: 107.6923%; /* Go to 14px from 13px */	33 font-size: 107.6923%; /* Go to 14px from 13px */

34 font-weight: 500;	34 font-weight: 500;

35 }	35 }

36	36

37 settings-subpage-search {	37 settings-subpage-search {

38 -webkit-margin-start: auto;	38 -webkit-margin-start: auto;

39 }	39 }

40 </style>	40 </style>

41 <div class="settings-box first">	41 <div class="settings-box first">

42 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"	42 <paper-icon-button icon="cr:arrow-back" on-tap="onTapBack_"

43 aria-label="$i18n{back}">	43 aria-label="$i18n{back}">

44 </paper-icon-button>	44 </paper-icon-button>

45 <h1>[[pageTitle]]</h1>	45 <h1>[[pageTitle]]</h1>

46 <template is="dom-if" if="[[searchLabel]]">	46 <template is="dom-if" if="[[searchLabel]]">

47 <settings-subpage-search label="[[searchLabel]]"	47 <settings-subpage-search label="[[searchLabel]]"

48 on-search-changed="onSearchChanged_">	48 on-search-changed="onSearchChanged_">

49 </settings-subpage-search>	49 </settings-subpage-search>

50 </template>	50 </template>

51 <content select=".subpage-title-extra"></content>	51 <content select=".subpage-title-extra"></content>

52 </div>	52 </div>

53 <content></content>	53 <content></content>

54 </template>	54 </template>

55 <script src="settings_subpage.js"></script>	55 <script src="settings_subpage.js"></script>

56 </dom-module>	56 </dom-module>

OLD	NEW