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

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

Issue 1766173002: [MD settings] change layout of Custom Font settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge with master Created 4 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 | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js » ('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 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 4 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
5 5
6 <dom-module id="settings-appearance-fonts-page"> 6 <dom-module id="settings-appearance-fonts-page">
7 <link rel="import" type="css" 7 <link rel="import" type="css"
8 href="chrome://md-settings/appearance_page/appearance_shared.css"> 8 href="chrome://md-settings/appearance_page/appearance_shared.css">
9 <template> 9 <template>
10 <style include="settings-shared"></style> 10 <style include="settings-shared"></style>
11 <div>[[selectedStandardFont_]]</div>
12 <div class="settings-box first"> 11 <div class="settings-box first">
13 <div i18n-content="fontSize"></div> 12 <div class="start">$i18n{fontSize}</div>
14 <paper-slider id="sizeSlider" value="{{fontSizeIndex_}}" 13 <paper-slider class="slider-labels" id="sizeSlider"
15 max="[[fontSizeRangeLimit_]]" 14 value="{{fontSizeIndex_}}"
16 immediate-value="{{immediateSizeIndex_}}" 15 max="[[fontSizeRangeLimit_]]" max-markers="5"
17 on-immediate-value-change="immediateSizeIndexChanged_"> 16 immediate-value="{{immediateSizeIndex_}}" snaps>
18 </paper-slider> 17 </paper-slider>
19 </div> 18 </div>
20 <div class="settings-box"> 19 <div class="settings-box">
21 <settings-dropdown-menu id="standardFont" 20 <div class="start">$i18n{minimumFont}</div>
22 i18n-values="label:standardFont" 21 <div class="list-item" style$="[[computeStyle_(minimumFontSize_, prefs.web kit.webprefs.fonts.standard.Zyyy.value)]]">
23 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}" 22 <span>[[minimumFontSize_]]</span>:&nbsp;
24 menu-options="[[fontOptions_]]"> 23 <span i18n-content="quickBrownFox"></span>
25 </settings-dropdown-menu> 24 </div>
26 <div class="settings-column" 25 <paper-slider class="slider-labels" id="minimumSizeSlider"
27 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts. standard.Zyyy.value)]]"> 26 value="{{minimumSizeIndex_}}"
28 <span>[[defaultFontSize_]]</span>: 27 max="[[minimumFontSizeRangeLimit_]]" max-markers="5"
29 <span i18n-content="loremIpsum"></span> 28 immediate-value="{{immediateMinimumSizeIndex_}}" snaps>
29 </paper-slider>
30 </div>
31 <div class="settings-box">
32 <div class="start">
33 <h2 i18n-content="standardFont"></h2>
34 <div class="list-frame">
35 <div class="list-item">
36 <settings-dropdown-menu class="start" id="standardFont"
37 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}"
38 menu-options="[[fontOptions_]]" no-label-float>
39 </settings-dropdown-menu>
40 </div>
41 <div class="list-item underbar"
42 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.standard.Zyyy.value)]]">
43 <span>[[defaultFontSize_]]</span>:&nbsp;
44 <span i18n-content="quickBrownFox"></span>
45 </div>
46 </div>
47 <h2 i18n-content="serifFont"></h2>
48 <div class="list-frame">
49 <div class="list-item">
50 <settings-dropdown-menu class="start" id="serifFont"
51 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}"
52 menu-options="[[fontOptions_]]" no-label-float>
53 </settings-dropdown-menu>
54 </div>
55 <div class="list-item underbar"
56 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.serif.Zyyy.value)]]">
57 <span>[[defaultFontSize_]]</span>:&nbsp;
58 <span i18n-content="quickBrownFox"></span>
59 </div>
60 </div>
61 <h2 i18n-content="sansSerifFont"></h2>
62 <div class="list-frame">
63 <div class="list-item">
64 <settings-dropdown-menu class="start" id="sansSerifFont"
65 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
66 menu-options="[[fontOptions_]]" no-label-float>
67 </settings-dropdown-menu>
68 </div>
69 <div class="list-item underbar"
70 style$="{{computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.sansserif.Zyyy.value)}}">
71 <span>[[defaultFontSize_]]</span>:&nbsp;
72 <span i18n-content="quickBrownFox"></span>
73 </div>
74 </div>
75 <h2 i18n-content="fixedWidthFont"></h2>
76 <div class="list-frame">
77 <div class="list-item">
78 <settings-dropdown-menu class="start" id="fixedFont"
79 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
80 menu-options="[[fontOptions_]]" no-label-float>
81 </settings-dropdown-menu>
82 </div>
83 <div class="list-item"
84 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.fixed.Zyyy.value)]]">
85 <span>[[defaultFontSize_]]</span>:&nbsp;
86 <span i18n-content="quickBrownFox"></span>
87 </div>
88 </div>
30 </div> 89 </div>
31 </div> 90 </div>
32 <div class="settings-box"> 91 <div class="settings-box">
33 <settings-dropdown-menu id="serifFont" 92 <div class="start" i18n-content="encoding"></div>
34 i18n-values="label:serifFont" 93 <settings-dropdown-menu id="encoding"
35 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}" 94 pref="{{prefs.intl.charset_default}}"
36 menu-options="[[fontOptions_]]"> 95 menu-options="[[encodingOptions_]]" no-label-float>
37 </settings-dropdown-menu> 96 </settings-dropdown-menu>
38 <div class="settings-column" 97 </div>
39 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts. serif.Zyyy.value)]]"> 98 <div class="settings-box two-line">
40 <span>[[defaultFontSize_]]</span>: 99 <div class="start">
41 <span i18n-content="loremIpsum"></span> 100 <div i18n-content="advancedFontSettings"></div>
101 <div class="secondary" i18n-content="requiresWebStoreExtension"></div>
42 </div> 102 </div>
43 </div> 103 </div>
44 <div class="settings-box">
45 <settings-dropdown-menu id="sansSerifFont"
46 i18n-values="label:sansSerifFont"
47 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
48 menu-options="[[fontOptions_]]">
49 </settings-dropdown-menu>
50 <div class="settings-column"
51 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts. sansserif.Zyyy.value)]]">
52 <span>[[defaultFontSize_]]</span>:
53 <span i18n-content="loremIpsum"></span>
54 </div>
55 </div>
56 <div class="settings-box">
57 <settings-dropdown-menu id="fixedFont"
58 i18n-values="label:fixedWidthFont"
59 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
60 menu-options="[[fontOptions_]]">
61 </settings-dropdown-menu>
62 <div class="settings-column"
63 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts. fixed.Zyyy.value)]]">
64 <span i18n-content="loremIpsum"></span>
65 </div>
66 </div>
67 <div class="settings-box">
68 <div>
69 <div i18n-content="minimumFont"></div>
70 <paper-slider id="minimumSizeSlider" value="{{minimumSizeIndex_}}"
71 max="[[minimumFontSizeRangeLimit_]]"
72 immediate-value="{{immediateMinimumSizeIndex_}}"
73 on-immediate-value-change="immediateMinimumSizeIndexChanged_">
74 </paper-slider>
75 </div>
76 <div style$="[[computeStyle_(minimumFontSize_, prefs.webkit.webprefs.fonts .standard.Zyyy.value)]]">
77 <span>[[minimumFontSize_]]</span>:
78 <span i18n-content="loremIpsum"></span>
79 </div>
80 </div>
81 <div class="settings-box">
82 <settings-dropdown-menu id="encoding"
83 i18n-values="label:encoding"
84 pref="{{prefs.intl.charset_default}}"
85 menu-options="[[encodingOptions_]]">
86 </settings-dropdown-menu>
87 </div>
88 </template> 104 </template>
89 <script src="appearance_fonts_page.js"></script> 105 <script src="appearance_fonts_page.js"></script>
90 </dom-module> 106 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698