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

Side by Side Diff: chrome/browser/resources/settings/appearance_page/appearance_page.html

Issue 2726113003: MD Settings: re-fix relative paper-input-label font-size. (Closed)
Patch Set: hardcode line-height so clear-icon doesn't push content down when appearing Created 3 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> 2 <link rel="import" href="chrome://resources/html/md_select_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="appearance_browser_proxy.html"> 8 <link rel="import" href="appearance_browser_proxy.html">
9 <link rel="import" href="../controls/controlled_radio_button.html"> 9 <link rel="import" href="../controls/controlled_radio_button.html">
10 <link rel="import" href="../controls/extension_controlled_indicator.html"> 10 <link rel="import" href="../controls/extension_controlled_indicator.html">
11 <link rel="import" href="../controls/settings_dropdown_menu.html"> 11 <link rel="import" href="../controls/settings_dropdown_menu.html">
12 <link rel="import" href="../controls/settings_input.html"> 12 <link rel="import" href="../controls/settings_input.html">
13 <link rel="import" href="../controls/settings_radio_group.html"> 13 <link rel="import" href="../controls/settings_radio_group.html">
14 <link rel="import" href="../controls/settings_toggle_button.html"> 14 <link rel="import" href="../controls/settings_toggle_button.html">
15 <link rel="import" href="../route.html"> 15 <link rel="import" href="../route.html">
16 <link rel="import" href="../settings_page/settings_animated_pages.html"> 16 <link rel="import" href="../settings_page/settings_animated_pages.html">
17 <link rel="import" href="../settings_page/settings_subpage.html"> 17 <link rel="import" href="../settings_page/settings_subpage.html">
18 <link rel="import" href="../settings_shared_css.html"> 18 <link rel="import" href="../settings_shared_css.html">
19 <link rel="import" href="../settings_vars_css.html"> 19 <link rel="import" href="../settings_vars_css.html">
20 <link rel="import" href="appearance_fonts_page.html"> 20 <link rel="import" href="appearance_fonts_page.html">
21 21
22 <dom-module id="settings-appearance-page"> 22 <dom-module id="settings-appearance-page">
23 <template> 23 <template>
24 <style include="settings-shared md-select"> 24 <style include="settings-shared md-select">
25 :host {
26 --paper-input-container-label: {
27 font-size: inherit;
28 font-weight: inherit;
29 };
30 }
31
32 .secondary-button ~ .secondary-button { 25 .secondary-button ~ .secondary-button {
33 -webkit-margin-start: 12px; 26 -webkit-margin-start: 12px;
34 } 27 }
35 </style> 28 </style>
36 <settings-animated-pages id="pages" section="appearance"> 29 <settings-animated-pages id="pages" section="appearance">
37 <neon-animatable route-path="default"> 30 <neon-animatable route-path="default">
38 <if expr="chromeos"> 31 <if expr="chromeos">
39 <div class="settings-box first two-line" id="wallpaperButton" 32 <div class="settings-box first two-line" id="wallpaperButton"
40 on-tap="openWallpaperManager_" actionable 33 on-tap="openWallpaperManager_" actionable
41 hidden="[[!pageVisibility.setWallpaper]]"> 34 hidden="[[!pageVisibility.setWallpaper]]">
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 186 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
194 page-title="$i18n{customizeFonts}"> 187 page-title="$i18n{customizeFonts}">
195 <settings-appearance-fonts-page prefs="{{prefs}}"> 188 <settings-appearance-fonts-page prefs="{{prefs}}">
196 </settings-appearance-fonts-page> 189 </settings-appearance-fonts-page>
197 </settings-subpage> 190 </settings-subpage>
198 </template> 191 </template>
199 </settings-animated-pages> 192 </settings-animated-pages>
200 </template> 193 </template>
201 <script src="appearance_page.js"></script> 194 <script src="appearance_page.js"></script>
202 </dom-module> 195 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698