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

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

Issue 2751063003: [MD settings] move font controls in MD settings (Closed)
Patch Set: 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 | no next file » | 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=" 25 style="
26 font-size:[[computeMinimumFontSize_( 26 font-size:[[computeMinimumFontSize_(
27 prefs.webkit.webprefs.minimum_font_size.value)]]px; 27 prefs.webkit.webprefs.minimum_font_size.value)]]px;
28 font-family: 28 font-family:
29 '[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';" 29 '[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';">
30 <span>[[ 30 <span>[[
31 computeMinimumFontSize_( 31 computeMinimumFontSize_(
32 prefs.webkit.webprefs.minimum_font_size.value)]]</span> 32 prefs.webkit.webprefs.minimum_font_size.value)]]</span>
33 : $i18n{quickBrownFox} 33 : $i18n{quickBrownFox}
34 </div> 34 </div>
35 <cr-slider id="minimumSizeSlider" 35 <cr-slider id="minimumSizeSlider"
36 pref="{{prefs.webkit.webprefs.minimum_font_size}}" 36 pref="{{prefs.webkit.webprefs.minimum_font_size}}"
37 tick-values="[[minimumFontSizeRange_]]" 37 tick-values="[[minimumFontSizeRange_]]"
38 label-min="$i18n{tiny}" label-max="$i18n{huge}"> 38 label-min="$i18n{tiny}" label-max="$i18n{huge}">
39 </cr-slider> 39 </cr-slider>
40 </div> 40 </div>
41 <div class="settings-box"> 41 <div class="settings-box">
42 <div class="start"> 42 <h2>$i18n{standardFont}</h2>
43 <h2>$i18n{standardFont}</h2> 43 </div>
44 <div class="list-frame"> 44 <div class="list-frame">
45 <div class="list-item"> 45 <div class="list-item">
46 <settings-dropdown-menu class="start" 46 <settings-dropdown-menu class="start"
47 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}" 47 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}"
48 menu-options="[[fontOptions_]]"> 48 menu-options="[[fontOptions_]]">
49 </settings-dropdown-menu> 49 </settings-dropdown-menu>
50 </div> 50 </div>
51 <div class="list-item underbar" 51 <div class="list-item underbar"
52 style=" 52 style="
53 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px; 53 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
54 font-family: 54 font-family:
55 '[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';" 55 '[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';">
56 <span> 56 <span>
57 [[prefs.webkit.webprefs.default_font_size.value]]: 57 [[prefs.webkit.webprefs.default_font_size.value]]:
58 $i18n{quickBrownFox} 58 $i18n{quickBrownFox}
59 </span> 59 </span>
60 </div> 60 </div>
61 </div> 61 </div>
62 <h2>$i18n{serifFont}</h2> 62 <div class="settings-box">
63 <div class="list-frame"> 63 <h2>$i18n{serifFont}</h2>
64 <div class="list-item"> 64 </div>
65 <settings-dropdown-menu class="start" 65 <div class="list-frame">
66 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}" 66 <div class="list-item">
67 menu-options="[[fontOptions_]]"> 67 <settings-dropdown-menu class="start"
68 </settings-dropdown-menu> 68 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}"
69 </div> 69 menu-options="[[fontOptions_]]">
70 <div class="list-item underbar" 70 </settings-dropdown-menu>
71 style=" 71 </div>
72 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px; 72 <div class="list-item underbar"
73 font-family: 73 style="
74 '[[prefs.webkit.webprefs.fonts.serif.Zyyy.value]]';" 74 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
75 <span> 75 font-family:
76 [[prefs.webkit.webprefs.default_font_size.value]]: 76 '[[prefs.webkit.webprefs.fonts.serif.Zyyy.value]]';">
77 $i18n{quickBrownFox} 77 <span>
78 </span> 78 [[prefs.webkit.webprefs.default_font_size.value]]:
79 </div> 79 $i18n{quickBrownFox}
80 </div> 80 </span>
81 <h2>$i18n{sansSerifFont}</h2> 81 </div>
82 <div class="list-frame"> 82 </div>
83 <div class="list-item"> 83 <div class="settings-box">
84 <settings-dropdown-menu class="start" 84 <h2>$i18n{sansSerifFont}</h2>
85 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}" 85 </div>
86 menu-options="[[fontOptions_]]"> 86 <div class="list-frame">
87 </settings-dropdown-menu> 87 <div class="list-item">
88 </div> 88 <settings-dropdown-menu class="start"
89 <div class="list-item underbar" 89 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
90 style=" 90 menu-options="[[fontOptions_]]">
91 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px; 91 </settings-dropdown-menu>
92 font-family: 92 </div>
93 '[[prefs.webkit.webprefs.fonts.sansserif.Zyyy.value]]';" 93 <div class="list-item underbar"
94 <span> 94 style="
95 [[prefs.webkit.webprefs.default_font_size.value]]: 95 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
96 $i18n{quickBrownFox} 96 font-family:
97 </span> 97 '[[prefs.webkit.webprefs.fonts.sansserif.Zyyy.value]]';">
98 </div> 98 <span>
99 </div> 99 [[prefs.webkit.webprefs.default_font_size.value]]:
100 <h2>$i18n{fixedWidthFont}</h2> 100 $i18n{quickBrownFox}
101 <div class="list-frame"> 101 </span>
102 <div class="list-item"> 102 </div>
103 <settings-dropdown-menu class="start" 103 </div>
104 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}" 104 <div class="settings-box">
105 menu-options="[[fontOptions_]]"> 105 <h2>$i18n{fixedWidthFont}</h2>
106 </settings-dropdown-menu> 106 </div>
107 </div> 107 <div class="list-frame">
108 <div class="list-item" 108 <div class="list-item">
109 style=" 109 <settings-dropdown-menu class="start"
110 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px; 110 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
111 font-family: 111 menu-options="[[fontOptions_]]">
112 '[[prefs.webkit.webprefs.fonts.fixed.Zyyy.value]]';" 112 </settings-dropdown-menu>
113 <span> 113 </div>
114 [[prefs.webkit.webprefs.default_font_size.value]]: 114 <div class="list-item"
115 $i18n{quickBrownFox} 115 style="
116 </span> 116 font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
117 </div> 117 font-family:
118 </div> 118 '[[prefs.webkit.webprefs.fonts.fixed.Zyyy.value]]';">
119 <span>
120 [[prefs.webkit.webprefs.default_font_size.value]]:
121 $i18n{quickBrownFox}
122 </span>
119 </div> 123 </div>
120 </div> 124 </div>
121 <template is="dom-if" if="[[!isGuest_]]"> 125 <template is="dom-if" if="[[!isGuest_]]">
122 <div class="settings-box two-line" id="advancedButton" 126 <div class="settings-box two-line" id="advancedButton"
123 on-tap="openAdvancedExtension_" actionable> 127 on-tap="openAdvancedExtension_" actionable>
124 <div class="start"> 128 <div class="start">
125 $i18n{advancedFontSettings} 129 $i18n{advancedFontSettings}
126 <div class="secondary" id="advancedButtonSublabel"> 130 <div class="secondary" id="advancedButtonSublabel">
127 [[advancedExtensionSublabel_]] 131 [[advancedExtensionSublabel_]]
128 </div> 132 </div>
129 </div> 133 </div>
130 <button class="icon-external" is="paper-icon-button-light" 134 <button class="icon-external" is="paper-icon-button-light"
131 aria-label="$i18n{advancedFontSettings}" 135 aria-label="$i18n{advancedFontSettings}"
132 aria-describedby="advancedButtonSublabel"></button> 136 aria-describedby="advancedButtonSublabel"></button>
133 </div> 137 </div>
134 </template> 138 </template>
135 </template> 139 </template>
136 <script src="appearance_fonts_page.js"></script> 140 <script src="appearance_fonts_page.js"></script>
137 </dom-module> 141 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698