 Chromium Code Reviews
 Chromium Code Reviews Issue 1766173002:
  [MD settings] change layout of Custom Font settings  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1766173002:
  [MD settings] change layout of Custom Font settings  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 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_}}" | 
| 17 on-immediate-value-change="immediateSizeIndexChanged_" snaps> | |
| 
dpapad
2016/03/05 02:27:29
Nit(optional): An alternative to forwarding on-imm
 
dschuyler
2016/03/08 20:09:14
Done.
 | |
| 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 <div class="start">$i18n{minimumFont}</div> | 
| 22 i18n-values="label:standardFont" | 22 <div class="list-item" style$="[[computeStyle_(minimumFontSize_, prefs.web kit.webprefs.fonts.standard.Zyyy.value)]]"> | 
| 23 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}" | 23 <span>[[minimumFontSize_]]</span>:  | 
| 24 menu-options="[[fontOptions_]]"> | 24 <span i18n-content="quickBrownFox"></span> | 
| 25 </settings-dropdown-menu> | 25 </div> | 
| 26 <div class="settings-column" | 26 <paper-slider class="slider-labels" id="minimumSizeSlider" | 
| 27 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts. standard.Zyyy.value)]]"> | 27 value="{{minimumSizeIndex_}}" | 
| 28 <span>[[defaultFontSize_]]</span>: | 28 max="[[minimumFontSizeRangeLimit_]]" max-markers="5" | 
| 29 <span i18n-content="loremIpsum"></span> | 29 immediate-value="{{immediateMinimumSizeIndex_}}" | 
| 30 on-immediate-value-change="immediateMinimumSizeIndexChanged_" snaps> | |
| 31 </paper-slider> | |
| 32 </div> | |
| 33 <div class="settings-box"> | |
| 34 <div class="start"> | |
| 35 <h2 i18n-content="standardFont"></h2> | |
| 36 <div class="list-frame"> | |
| 37 <div class="list-item"> | |
| 38 <settings-dropdown-menu class="start" id="standardFont" | |
| 39 pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}" | |
| 40 menu-options="[[fontOptions_]]" no-label-float> | |
| 41 </settings-dropdown-menu> | |
| 42 </div> | |
| 43 <div class="list-item underbar" | |
| 44 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.standard.Zyyy.value)]]"> | |
| 45 <span>[[defaultFontSize_]]</span>:  | |
| 46 <span i18n-content="quickBrownFox"></span> | |
| 47 </div> | |
| 48 </div> | |
| 49 <h2 i18n-content="serifFont"></h2> | |
| 50 <div class="list-frame"> | |
| 51 <div class="list-item"> | |
| 52 <settings-dropdown-menu class="start" id="serifFont" | |
| 53 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}" | |
| 54 menu-options="[[fontOptions_]]" no-label-float> | |
| 55 </settings-dropdown-menu> | |
| 56 </div> | |
| 57 <div class="list-item underbar" | |
| 58 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.serif.Zyyy.value)]]"> | |
| 59 <span>[[defaultFontSize_]]</span>:  | |
| 60 <span i18n-content="quickBrownFox"></span> | |
| 61 </div> | |
| 62 </div> | |
| 63 <h2 i18n-content="sansSerifFont"></h2> | |
| 64 <div class="list-frame"> | |
| 65 <div class="list-item"> | |
| 66 <settings-dropdown-menu class="start" id="sansSerifFont" | |
| 67 pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}" | |
| 68 menu-options="[[fontOptions_]]" no-label-float> | |
| 69 </settings-dropdown-menu> | |
| 70 </div> | |
| 71 <div class="list-item underbar" | |
| 72 style$="{{computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.sansserif.Zyyy.value)}}"> | |
| 73 <span>[[defaultFontSize_]]</span>:  | |
| 74 <span i18n-content="quickBrownFox"></span> | |
| 75 </div> | |
| 76 </div> | |
| 77 <h2 i18n-content="fixedWidthFont"></h2> | |
| 78 <div class="list-frame"> | |
| 79 <div class="list-item"> | |
| 80 <settings-dropdown-menu class="start" id="fixedFont" | |
| 81 pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}" | |
| 82 menu-options="[[fontOptions_]]" no-label-float> | |
| 83 </settings-dropdown-menu> | |
| 84 </div> | |
| 85 <div class="list-item" | |
| 86 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fo nts.fixed.Zyyy.value)]]"> | |
| 87 <span>[[defaultFontSize_]]</span>:  | |
| 88 <span i18n-content="quickBrownFox"></span> | |
| 89 </div> | |
| 90 </div> | |
| 30 </div> | 91 </div> | 
| 31 </div> | 92 </div> | 
| 32 <div class="settings-box"> | 93 <div class="settings-box"> | 
| 33 <settings-dropdown-menu id="serifFont" | 94 <div class="start" i18n-content="encoding"></div> | 
| 34 i18n-values="label:serifFont" | 95 <settings-dropdown-menu id="encoding" | 
| 35 pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}" | 96 pref="{{prefs.intl.charset_default}}" | 
| 36 menu-options="[[fontOptions_]]"> | 97 menu-options="[[encodingOptions_]]" no-label-float> | 
| 37 </settings-dropdown-menu> | 98 </settings-dropdown-menu> | 
| 38 <div class="settings-column" | 99 </div> | 
| 39 style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts. serif.Zyyy.value)]]"> | 100 <div class="settings-box two-line"> | 
| 40 <span>[[defaultFontSize_]]</span>: | 101 <div class="start"> | 
| 41 <span i18n-content="loremIpsum"></span> | 102 <div i18n-content="advancedFontSettings"></div> | 
| 103 <div class="secondary" i18n-content="requiresWebStoreExtension"></div> | |
| 42 </div> | 104 </div> | 
| 43 </div> | 105 </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> | 106 </template> | 
| 89 <script src="appearance_fonts_page.js"></script> | 107 <script src="appearance_fonts_page.js"></script> | 
| 90 </dom-module> | 108 </dom-module> | 
| OLD | NEW |