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

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

Issue 2738333004: [MD settings] set pref to valid slider value (Closed)
Patch Set: review changes 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
« 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/cr_elements/cr_slider/cr_slider.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html ">
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.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/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
6 <link rel="import" href="fonts_browser_proxy.html"> 6 <link rel="import" href="fonts_browser_proxy.html">
7 <link rel="import" href="../controls/settings_dropdown_menu.html"> 7 <link rel="import" href="../controls/settings_dropdown_menu.html">
8 <link rel="import" href="../i18n_setup.html"> 8 <link rel="import" href="../i18n_setup.html">
9 <link rel="import" href="../settings_shared_css.html"> 9 <link rel="import" href="../settings_shared_css.html">
10 10
11 <dom-module id="settings-appearance-fonts-page"> 11 <dom-module id="settings-appearance-fonts-page">
12 <template> 12 <template>
13 <style include="settings-shared"></style> 13 <style include="settings-shared"></style>
14 <div class="settings-box first"> 14 <div class="settings-box first">
15 <div class="start">$i18n{fontSize}</div> 15 <div class="start">$i18n{fontSize}</div>
16 <cr-slider id="sizeSlider" 16 <cr-slider id="sizeSlider"
17 pref="{{prefs.webkit.webprefs.default_font_size}}" 17 pref="{{prefs.webkit.webprefs.default_font_size}}"
18 tick-values="[[fontSizeRange_]]" 18 tick-values="[[fontSizeRange_]]"
19 label-min="$i18n{tiny}" label-max="$i18n{huge}"> 19 label-min="$i18n{tiny}" label-max="$i18n{huge}">
20 </cr-slider> 20 </cr-slider>
21 </div> 21 </div>
22 <div class="settings-box"> 22 <div class="settings-box">
23 <div class="start">$i18n{minimumFont}</div> 23 <div class="start">$i18n{minimumFont}</div>
24 <div class="list-item" 24 <div class="list-item"
25 style$="[[computeStyle_( 25 style="
26 prefs.webkit.webprefs.minimum_font_size.value, 26 font-size:[[computeMinimumFontSize_(
27 prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]"> 27 prefs.webkit.webprefs.minimum_font_size.value)]]px;
28 <span>[[prefs.webkit.webprefs.minimum_font_size.value]]</span> 28 font-family:
29 '[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]];"
Dan Beam 2017/03/14 18:59:35 only 1 single quote, does this handle font names w
dschuyler 2017/03/14 19:13:12 This is a typo, here and each font-family below. I
Dan Beam 2017/03/14 19:19:02 i'm asking, what if the font name is Doesn't Wo
dschuyler 2017/03/14 20:39:33 Good question. Since it's a change from what we we
30 <span>[[
31 computeMinimumFontSize_(
32 prefs.webkit.webprefs.minimum_font_size.value)]]</span>
29 : $i18n{quickBrownFox} 33 : $i18n{quickBrownFox}
30 </div> 34 </div>
31 <cr-slider id="minimumSizeSlider" 35 <cr-slider id="minimumSizeSlider"
32 pref="{{prefs.webkit.webprefs.minimum_font_size}}" 36 pref="{{prefs.webkit.webprefs.minimum_font_size}}"
33 tick-values="[[minimumFontSizeRange_]]" 37 tick-values="[[minimumFontSizeRange_]]"
34 label-min="$i18n{tiny}" label-max="$i18n{huge}"> 38 label-min="$i18n{tiny}" label-max="$i18n{huge}">
35 </cr-slider> 39 </cr-slider>
36 </div> 40 </div>
37 <div class="settings-box"> 41 <div class="settings-box">
38 <div class="start"> 42 <div class="start">
39 <h2>$i18n{standardFont}</h2> 43 <h2>$i18n{standardFont}</h2>
40 <div class="list-frame"> 44 <div class="list-frame">
41 <div class="list-item"> 45 <div class="list-item">
42 <settings-dropdown-menu class="start" 46 <settings-dropdown-menu class="start"
43 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}" 47 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}"
44 menu-options="[[fontOptions_]]"> 48 menu-options="[[fontOptions_]]">
45 </settings-dropdown-menu> 49 </settings-dropdown-menu>
46 </div> 50 </div>
47 <div class="list-item underbar" 51 <div class="list-item underbar"
48 style$="[[computeStyle_( 52 style="
49 prefs.webkit.webprefs.default_font_size.value, 53 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
50 prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]"> 54 font-family:
55 '[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]];"
51 <span> 56 <span>
52 [[prefs.webkit.webprefs.default_font_size.value]]: 57 [[prefs.webkit.webprefs.default_font_size.value]]:
53 $i18n{quickBrownFox} 58 $i18n{quickBrownFox}
54 </span> 59 </span>
55 </div> 60 </div>
56 </div> 61 </div>
57 <h2>$i18n{serifFont}</h2> 62 <h2>$i18n{serifFont}</h2>
58 <div class="list-frame"> 63 <div class="list-frame">
59 <div class="list-item"> 64 <div class="list-item">
60 <settings-dropdown-menu class="start" 65 <settings-dropdown-menu class="start"
61 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}" 66 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}"
62 menu-options="[[fontOptions_]]"> 67 menu-options="[[fontOptions_]]">
63 </settings-dropdown-menu> 68 </settings-dropdown-menu>
64 </div> 69 </div>
65 <div class="list-item underbar" 70 <div class="list-item underbar"
66 style$="[[computeStyle_( 71 style="
67 prefs.webkit.webprefs.default_font_size.value, 72 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
68 prefs.webkit.webprefs.fonts.serif.Zyyy.value)]]"> 73 font-family:
74 '[[prefs.webkit.webprefs.fonts.serif.Zyyy.value]];"
69 <span> 75 <span>
70 [[prefs.webkit.webprefs.default_font_size.value]]: 76 [[prefs.webkit.webprefs.default_font_size.value]]:
71 $i18n{quickBrownFox} 77 $i18n{quickBrownFox}
72 </span> 78 </span>
73 </div> 79 </div>
74 </div> 80 </div>
75 <h2>$i18n{sansSerifFont}</h2> 81 <h2>$i18n{sansSerifFont}</h2>
76 <div class="list-frame"> 82 <div class="list-frame">
77 <div class="list-item"> 83 <div class="list-item">
78 <settings-dropdown-menu class="start" 84 <settings-dropdown-menu class="start"
79 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}" 85 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
80 menu-options="[[fontOptions_]]"> 86 menu-options="[[fontOptions_]]">
81 </settings-dropdown-menu> 87 </settings-dropdown-menu>
82 </div> 88 </div>
83 <div class="list-item underbar" 89 <div class="list-item underbar"
84 style$="{{computeStyle_( 90 style="
85 prefs.webkit.webprefs.default_font_size.value, 91 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
86 prefs.webkit.webprefs.fonts.sansserif.Zyyy.value)}}"> 92 font-family:
93 '[[prefs.webkit.webprefs.fonts.sansserif.Zyyy.value]];"
87 <span> 94 <span>
88 [[prefs.webkit.webprefs.default_font_size.value]]: 95 [[prefs.webkit.webprefs.default_font_size.value]]:
89 $i18n{quickBrownFox} 96 $i18n{quickBrownFox}
90 </span> 97 </span>
91 </div> 98 </div>
92 </div> 99 </div>
93 <h2>$i18n{fixedWidthFont}</h2> 100 <h2>$i18n{fixedWidthFont}</h2>
94 <div class="list-frame"> 101 <div class="list-frame">
95 <div class="list-item"> 102 <div class="list-item">
96 <settings-dropdown-menu class="start" 103 <settings-dropdown-menu class="start"
97 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}" 104 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
98 menu-options="[[fontOptions_]]"> 105 menu-options="[[fontOptions_]]">
99 </settings-dropdown-menu> 106 </settings-dropdown-menu>
100 </div> 107 </div>
101 <div class="list-item" 108 <div class="list-item"
102 style$="[[computeStyle_( 109 style="
103 prefs.webkit.webprefs.default_fixed_font_size.value, 110 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
104 prefs.webkit.webprefs.fonts.fixed.Zyyy.value)]]"> 111 font-family:
112 '[[prefs.webkit.webprefs.fonts.fixed.Zyyy.value]];"
105 <span> 113 <span>
106 [[prefs.webkit.webprefs.default_font_size.value]]: 114 [[prefs.webkit.webprefs.default_font_size.value]]:
107 $i18n{quickBrownFox} 115 $i18n{quickBrownFox}
108 </span> 116 </span>
109 </div> 117 </div>
110 </div> 118 </div>
111 </div> 119 </div>
112 </div> 120 </div>
113 <template is="dom-if" if="[[!isGuest_]]"> 121 <template is="dom-if" if="[[!isGuest_]]">
114 <div class="settings-box two-line" id="advancedButton" 122 <div class="settings-box two-line" id="advancedButton"
115 on-tap="openAdvancedExtension_" actionable> 123 on-tap="openAdvancedExtension_" actionable>
116 <div class="start"> 124 <div class="start">
117 $i18n{advancedFontSettings} 125 $i18n{advancedFontSettings}
118 <div class="secondary" id="advancedButtonSublabel"> 126 <div class="secondary" id="advancedButtonSublabel">
119 [[advancedExtensionSublabel_]] 127 [[advancedExtensionSublabel_]]
120 </div> 128 </div>
121 </div> 129 </div>
122 <button class="icon-external" is="paper-icon-button-light" 130 <button class="icon-external" is="paper-icon-button-light"
123 aria-label="$i18n{advancedFontSettings}" 131 aria-label="$i18n{advancedFontSettings}"
124 aria-describedby="advancedButtonSublabel"></button> 132 aria-describedby="advancedButtonSublabel"></button>
125 </div> 133 </div>
126 </template> 134 </template>
127 </template> 135 </template>
128 <script src="appearance_fonts_page.js"></script> 136 <script src="appearance_fonts_page.js"></script>
129 </dom-module> 137 </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