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

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

Issue 1422023012: MD Settings: Simplify settings-dropdown-menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month 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 | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html">
3 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> 3 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">
4 4
5 <dom-module id="settings-appearance-fonts-page"> 5 <dom-module id="settings-appearance-fonts-page">
6 <link rel="import" type="css" 6 <link rel="import" type="css"
7 href="chrome://md-settings/settings_page/settings_page.css"> 7 href="chrome://md-settings/settings_page/settings_page.css">
8 <link rel="import" type="css" 8 <link rel="import" type="css"
9 href="chrome://md-settings/appearance_page/appearance_shared.css"> 9 href="chrome://md-settings/appearance_page/appearance_shared.css">
10 <template> 10 <template>
11 <div>[[selectedStandardFont_]]</div> 11 <div>[[selectedStandardFont_]]</div>
12 <div class="settings-box"> 12 <div class="settings-box">
13 <div i18n-content="fontSize"></div> 13 <div i18n-content="fontSize"></div>
14 <paper-slider id="sizeSlider" value="{{fontSizeIndex_}}" 14 <paper-slider id="sizeSlider" value="{{fontSizeIndex_}}"
15 max="[[fontSizeRangeLimit_]]" 15 max="[[fontSizeRangeLimit_]]"
16 immediate-value="{{immediateSizeIndex_}}" 16 immediate-value="{{immediateSizeIndex_}}"
17 on-immediate-value-change="immediateSizeIndexChanged_"> 17 on-immediate-value-change="immediateSizeIndexChanged_">
18 </paper-slider> 18 </paper-slider>
19 </div> 19 </div>
20 <div class="settings-box"> 20 <div class="settings-box">
21 <settings-dropdown-menu id="standardFont" 21 <settings-dropdown-menu id="standardFont"
22 i18n-values="label:standardFont" 22 i18n-values="label:standardFont"
23 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}" 23 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}"
24 menuOptions="[[fontOptions_]]"> 24 menu-options="[[fontOptions_]]">
25 </settings-dropdown-menu> 25 </settings-dropdown-menu>
26 <div class="settings-column" 26 <div class="settings-column"
27 style$="[[computeStyle_(defaultFontSize_, 27 style$="[[computeStyle_(defaultFontSize_,
28 prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]"> 28 prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]">
29 <span>[[defaultFontSize_]]</span>: 29 <span>[[defaultFontSize_]]</span>:
30 <span i18n-content="loremIpsum"></span> 30 <span i18n-content="loremIpsum"></span>
31 </div> 31 </div>
32 </div> 32 </div>
33 <div class="settings-box"> 33 <div class="settings-box">
34 <settings-dropdown-menu id="serifFont" 34 <settings-dropdown-menu id="serifFont"
35 i18n-values="label:serifFont" 35 i18n-values="label:serifFont"
36 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}" 36 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}"
37 menuOptions="[[fontOptions_]]"> 37 menu-options="[[fontOptions_]]">
38 </settings-dropdown-menu> 38 </settings-dropdown-menu>
39 <div class="settings-column" 39 <div class="settings-column"
40 style$="[[computeStyle_(defaultFontSize_, 40 style$="[[computeStyle_(defaultFontSize_,
41 prefs.webkit.webprefs.fonts.serif.Zyyy.value)]]"> 41 prefs.webkit.webprefs.fonts.serif.Zyyy.value)]]">
42 <span>[[defaultFontSize_]]</span>: 42 <span>[[defaultFontSize_]]</span>:
43 <span i18n-content="loremIpsum"></span> 43 <span i18n-content="loremIpsum"></span>
44 </div> 44 </div>
45 </div> 45 </div>
46 <div class="settings-box"> 46 <div class="settings-box">
47 <settings-dropdown-menu id="sansSerifFont" 47 <settings-dropdown-menu id="sansSerifFont"
48 i18n-values="label:sansSerifFont" 48 i18n-values="label:sansSerifFont"
49 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}" 49 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
50 menuOptions="[[fontOptions_]]"> 50 menu-options="[[fontOptions_]]">
51 </settings-dropdown-menu> 51 </settings-dropdown-menu>
52 <div class="settings-column" 52 <div class="settings-column"
53 style$="{{computeStyle_(defaultFontSize_, 53 style$="{{computeStyle_(defaultFontSize_,
54 prefs.webkit.webprefs.fonts.sansserif.Zyyy.value)}}"> 54 prefs.webkit.webprefs.fonts.sansserif.Zyyy.value)}}">
55 <span>[[defaultFontSize_]]</span>: 55 <span>[[defaultFontSize_]]</span>:
56 <span i18n-content="loremIpsum"></span> 56 <span i18n-content="loremIpsum"></span>
57 </div> 57 </div>
58 </div> 58 </div>
59 <div class="settings-box"> 59 <div class="settings-box">
60 <settings-dropdown-menu id="fixedFont" 60 <settings-dropdown-menu id="fixedFont"
61 i18n-values="label:fixedWidthFont" 61 i18n-values="label:fixedWidthFont"
62 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}" 62 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
63 menuOptions="[[fontOptions_]]"> 63 menu-options="[[fontOptions_]]">
64 </settings-dropdown-menu> 64 </settings-dropdown-menu>
65 <div class="settings-column" 65 <div class="settings-column"
66 style$="[[computeStyle_(defaultFontSize_, 66 style$="[[computeStyle_(defaultFontSize_,
67 prefs.webkit.webprefs.fonts.fixed.Zyyy.value)]]"> 67 prefs.webkit.webprefs.fonts.fixed.Zyyy.value)]]">
68 <span i18n-content="loremIpsum"></span> 68 <span i18n-content="loremIpsum"></span>
69 </div> 69 </div>
70 </div> 70 </div>
71 <div class="settings-box"> 71 <div class="settings-box">
72 <div> 72 <div>
73 <div i18n-content="minimumFont"></div> 73 <div i18n-content="minimumFont"></div>
74 <paper-slider id="minimumSizeSlider" value="{{minimumSizeIndex_}}" 74 <paper-slider id="minimumSizeSlider" value="{{minimumSizeIndex_}}"
75 max="[[minimumFontSizeRangeLimit_]]" 75 max="[[minimumFontSizeRangeLimit_]]"
76 immediate-value="{{immediateMinimumSizeIndex_}}" 76 immediate-value="{{immediateMinimumSizeIndex_}}"
77 on-immediate-value-change="immediateMinimumSizeIndexChanged_"> 77 on-immediate-value-change="immediateMinimumSizeIndexChanged_">
78 </paper-slider> 78 </paper-slider>
79 </div> 79 </div>
80 <div style$="[[computeStyle_(minimumFontSize_, 80 <div style$="[[computeStyle_(minimumFontSize_,
81 prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]"> 81 prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]">
82 <span>[[minimumFontSize_]]</span>: 82 <span>[[minimumFontSize_]]</span>:
83 <span i18n-content="loremIpsum"></span> 83 <span i18n-content="loremIpsum"></span>
84 </div> 84 </div>
85 </div> 85 </div>
86 <div class="settings-box"> 86 <div class="settings-box">
87 <settings-dropdown-menu id="encoding" 87 <settings-dropdown-menu id="encoding"
88 i18n-values="label:encoding" 88 i18n-values="label:encoding"
89 pref="{{prefs.intl.charset_default}}" 89 pref="{{prefs.intl.charset_default}}"
90 menuOptions="[[encodingOptions_]]"> 90 menu-options="[[encodingOptions_]]">
91 </settings-dropdown-menu> 91 </settings-dropdown-menu>
92 </div> 92 </div>
93 </template> 93 </template>
94 <script src="appearance_fonts_page.js"></script> 94 <script src="appearance_fonts_page.js"></script>
95 </dom-module> 95 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698