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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html

Issue 1967913002: Material WebUI: cr-slider element for intelligent range mapping (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KeyboardFinish
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js » ('j') | ui/webui/resources/cr_elements/cr_slider/cr_slider.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
diff --git a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
index 58365514b21b2146dbb13b4bf579e09453973af1..5510ef82d7e8d430eb0d4245dd86414c306cbb8b 100644
--- a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
@@ -1,7 +1,7 @@
+<link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html">
<link rel="import" href="chrome://md-settings/appearance_page/fonts_browser_proxy.html">
<link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.html">
<link rel="import" href="chrome://md-settings/i18n_setup.html">
@@ -12,23 +12,24 @@
<style include="settings-shared"></style>
<div class="settings-box first">
<div class="start">$i18n{fontSize}</div>
- <paper-slider class="always-on" id="sizeSlider"
- value="{{fontSizeIndex_}}"
- max="[[fontSizeRangeLimit_]]" max-markers="5"
- immediate-value="{{immediateSizeIndex_}}" snaps>
- </paper-slider>
+ <cr-slider class="always-on" id="sizeSlider" snaps max-markers="5"
+ value="{{prefs.webkit.webprefs.default_font_size.value}}"
+ tick-values="[[fontSizeRange_]]">
+ </cr-slider>
</div>
<div class="settings-box">
<div class="start">$i18n{minimumFont}</div>
- <div class="list-item" style$="[[computeStyle_(minimumFontSize_, prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]">
- <span>[[minimumFontSize_]]</span>:&nbsp;
+ <div class="list-item"
+ style$="[[computeStyle_(
+ prefs.webkit.webprefs.minimum_font_size.value,
+ prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]">
+ <span>[[prefs.webkit.webprefs.minimum_font_size.value]]</span>:&nbsp;
$i18n{quickBrownFox}
</div>
- <paper-slider class="always-on" id="minimumSizeSlider"
- value="{{minimumSizeIndex_}}"
- max="[[minimumFontSizeRangeLimit_]]" max-markers="5"
- immediate-value="{{immediateMinimumSizeIndex_}}" snaps>
- </paper-slider>
+ <cr-slider class="always-on" id="minimumSizeSlider" snaps max-markers="5"
+ value="{{prefs.webkit.webprefs.minimum_font_size.value}}"
+ tick-values="[[minimumFontSizeRange_]]">
+ </cr-slider>
</div>
<div class="settings-box">
<div class="start">
@@ -41,9 +42,11 @@
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
- style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]">
- <span>[[defaultFontSize_]]</span>:&nbsp;
- $i18n{quickBrownFox}
+ style$="[[computeStyle_(
+ prefs.webkit.webprefs.default_font_size.value,
+ prefs.webkit.webprefs.fonts.standard.Zyyy.value)]]">
+ <span>[[prefs.webkit.webprefs.default_font_size.value]]</span><!--
+ no whitespace -->:&nbsp;$i18n{quickBrownFox}
dschuyler 2016/05/18 20:51:21 nit: will this work instead: <span> <span>[
michaelpg 2016/05/19 17:09:27 Done. I also filed https://crbug.com/id=613203 bec
</div>
</div>
<h2>$i18n{serifFont}</h2>
@@ -55,9 +58,11 @@
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
- style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts.serif.Zyyy.value)]]">
- <span>[[defaultFontSize_]]</span>:&nbsp;
- $i18n{quickBrownFox}
+ style$="[[computeStyle_(
+ prefs.webkit.webprefs.default_font_size.value,
+ prefs.webkit.webprefs.fonts.serif.Zyyy.value)]]">
+ <span>[[prefs.webkit.webprefs.default_font_size.value]]</span><!--
+ no whitespace -->:&nbsp;$i18n{quickBrownFox}
</div>
</div>
<h2>$i18n{sansSerifFont}</h2>
@@ -69,9 +74,11 @@
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
- style$="{{computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts.sansserif.Zyyy.value)}}">
- <span>[[defaultFontSize_]]</span>:&nbsp;
- $i18n{quickBrownFox}
+ style$="{{computeStyle_(
+ prefs.webkit.webprefs.default_font_size.value,
+ prefs.webkit.webprefs.fonts.sansserif.Zyyy.value)}}">
+ <span>[[prefs.webkit.webprefs.default_font_size.value]]</span><!--
+ no whitespace -->:&nbsp;$i18n{quickBrownFox}
</div>
</div>
<h2>$i18n{fixedWidthFont}</h2>
@@ -83,9 +90,11 @@
</settings-dropdown-menu>
</div>
<div class="list-item"
- style$="[[computeStyle_(defaultFontSize_, prefs.webkit.webprefs.fonts.fixed.Zyyy.value)]]">
- <span>[[defaultFontSize_]]</span>:&nbsp;
- $i18n{quickBrownFox}
+ style$="[[computeStyle_(
+ prefs.webkit.webprefs.default_font_size.value,
+ prefs.webkit.webprefs.fonts.fixed.Zyyy.value)]]">
+ <span>[[prefs.webkit.webprefs.default_font_size.value]]</span><!--
+ no whitespace -->:&nbsp;$i18n{quickBrownFox}
</div>
</div>
</div>
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js » ('j') | ui/webui/resources/cr_elements/cr_slider/cr_slider.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698