Skip to content

Commit

Permalink
[MD settings] move font controls in MD settings
Browse files Browse the repository at this point in the history 
This CL outdents some UI controlls to place them in the correct positions
(they were indented too far). Also corrects some div tags.

BUG=617712
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2751063003
Cr-Commit-Position: refs/heads/master@{#457280}
  • Loading branch information
@dschuyler
dschuyler authored and Commit bot committed Mar 16, 2017
1 parent f35a865 commit 566e65a
Showing 1 changed file with 82 additions and 78 deletions.
160 changes: 82 additions & 78 deletions chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
View file
Expand Up @@ -26,7 +26,7 @@
font-size:[[computeMinimumFontSize_(
prefs.webkit.webprefs.minimum_font_size.value)]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';"
'[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';">
<span>[[
computeMinimumFontSize_(
prefs.webkit.webprefs.minimum_font_size.value)]]</span>
Expand All @@ -39,83 +39,87 @@
</cr-slider>
</div>
<div class="settings-box">
<div class="start">
<h2>$i18n{standardFont}</h2>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';"
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<h2>$i18n{serifFont}</h2>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.serif.Zyyy.value]]';"
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<h2>$i18n{sansSerifFont}</h2>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.sansserif.Zyyy.value]]';"
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<h2>$i18n{fixedWidthFont}</h2>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.fixed.Zyyy.value]]';"
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<h2>$i18n{standardFont}</h2>
</div>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.standard.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.standard.Zyyy.value]]';">
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<div class="settings-box">
<h2>$i18n{serifFont}</h2>
</div>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.serif.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.serif.Zyyy.value]]';">
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<div class="settings-box">
<h2>$i18n{sansSerifFont}</h2>
</div>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.sansserif.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item underbar"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.sansserif.Zyyy.value]]';">
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<div class="settings-box">
<h2>$i18n{fixedWidthFont}</h2>
</div>
<div class="list-frame">
<div class="list-item">
<settings-dropdown-menu class="start"
pref="{{prefs.webkit.webprefs.fonts.fixed.Zyyy}}"
menu-options="[[fontOptions_]]">
</settings-dropdown-menu>
</div>
<div class="list-item"
style="
font-size:[[prefs.webkit.webprefs.default_font_size.value]]px;
font-family:
'[[prefs.webkit.webprefs.fonts.fixed.Zyyy.value]]';">
<span>
[[prefs.webkit.webprefs.default_font_size.value]]:
$i18n{quickBrownFox}
</span>
</div>
</div>
<template is="dom-if" if="[[!isGuest_]]">
Expand Down

0 comments on commit 566e65a

Please sign in to comment.