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