| 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/polymer/v1_0/iron-resizable-behavior
/iron-resizable-behavior.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/neon-animation/neon-ani
matable-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/paper-icon-button/paper
-icon-button.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> |
| 5 <link rel="import" href="/icons.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"> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 /* Centers the ripple on the icon with appropriate margin on right. */ | 25 /* Centers the ripple on the icon with appropriate margin on right. */ |
| 26 -webkit-margin-end: 8px; | 26 -webkit-margin-end: 8px; |
| 27 -webkit-margin-start: -8px; | 27 -webkit-margin-start: -8px; |
| 28 /* The inner icon is 20px in size. paper-icon-button has 8px padding. */ | 28 /* The inner icon is 20px in size. paper-icon-button has 8px padding. */ |
| 29 height: 36px; | 29 height: 36px; |
| 30 width: 36px; | 30 width: 36px; |
| 31 } | 31 } |
| 32 | 32 |
| 33 h1 { | 33 h1 { |
| 34 color: var(--settings-nav-grey); | 34 color: var(--settings-nav-grey); |
| 35 font-size: 107.6923%; /* go to 14px from 13px */ | 35 flex: 1; /* Push other items to the end. */ |
| 36 font-size: 107.6923%; /* Go to 14px from 13px */ |
| 36 font-weight: 500; | 37 font-weight: 500; |
| 37 } | 38 } |
| 38 | 39 |
| 39 settings-subpage-search { | 40 settings-subpage-search { |
| 40 -webkit-margin-start: auto; | 41 -webkit-margin-start: auto; |
| 41 } | 42 } |
| 42 </style> | 43 </style> |
| 43 <div class="settings-box first"> | 44 <div class="settings-box first"> |
| 44 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"> | 45 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"> |
| 45 </paper-icon-button> | 46 </paper-icon-button> |
| 46 <h1>[[pageTitle]]</h1> | 47 <h1>[[pageTitle]]</h1> |
| 47 <template is="dom-if" if="[[searchLabel]]"> | 48 <template is="dom-if" if="[[searchLabel]]"> |
| 48 <settings-subpage-search label="[[searchLabel]]" | 49 <settings-subpage-search label="[[searchLabel]]" |
| 49 on-search-changed="onSearchChanged_"> | 50 on-search-changed="onSearchChanged_"> |
| 50 </settings-subpage-search> | 51 </settings-subpage-search> |
| 51 </template> | 52 </template> |
| 53 <content select=".subpage-title-extra"></content> |
| 52 </div> | 54 </div> |
| 53 <content></content> | 55 <content></content> |
| 54 </template> | 56 </template> |
| 55 <script src="settings_subpage.js"></script> | 57 <script src="settings_subpage.js"></script> |
| 56 </dom-module> | 58 </dom-module> |
| OLD | NEW |