Commit db31f019 authored by John Lee's avatar John Lee Committed by Commit Bot

Settings WebUI: Add padding to some rows, convert some to cr-link-row

https://imgur.com/a/qnVs4lG

Bug: 686905, 934202
Change-Id: If51daf61ec4ddaa780aff7a1f11af6746330d198
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1690564Reviewed-by: default avatarEsmael El-Moslimany <aee@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675715}
parent 5d908ca7
...@@ -179,22 +179,20 @@ ...@@ -179,22 +179,20 @@
</span> </span>
</div> </div>
<if expr="chromeos"> <if expr="chromeos">
<div id="aboutTPMFirmwareUpdate" class="settings-box two-line" <cr-link-row
id="aboutTPMFirmwareUpdate"
class="hr"
hidden$="[[!showTPMFirmwareUpdateLineItem_]]" hidden$="[[!showTPMFirmwareUpdateLineItem_]]"
on-click="onTPMFirmwareUpdateTap_" actionable> label="$i18n{aboutTPMFirmwareUpdateTitle}"
<div class="start"> on-click="onTPMFirmwareUpdateTap_">
<div>$i18n{aboutTPMFirmwareUpdateTitle}</div> <div slot="sub-label">
<div class="secondary"> $i18n{aboutTPMFirmwareUpdateDescription}
$i18n{aboutTPMFirmwareUpdateDescription} <a href="$i18n{aboutTPMFirmwareUpdateLearnMoreURL}"
<a href="$i18n{aboutTPMFirmwareUpdateLearnMoreURL}" target="_blank" on-click="onLearnMoreTap_">
target="_blank" on-click="onLearnMoreTap_"> $i18n{learnMore}
$i18n{learnMore} </a>
</a>
</div>
</div> </div>
<cr-icon-button class="subpage-arrow" </cr-link-row>
aria-labelledby="aboutTPMFirmwareUpdate"></cr-icon-button>
</div>
</if> </if>
<if expr="_google_chrome and is_macosx"> <if expr="_google_chrome and is_macosx">
<template is="dom-if" if="[[!promoteUpdaterStatus_.hidden]]"> <template is="dom-if" if="[[!promoteUpdaterStatus_.hidden]]">
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<if expr="is_linux and not chromeos"> <if expr="is_linux and not chromeos">
<div class="settings-row continuation" <div class="settings-row continuation"
hidden="[[!showThemesSecondary_( hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]" prefs.extensions.theme.id.value, useSystemTheme_)]]"
id="themesSecondaryActions"> id="themesSecondaryActions">
<div class="separator"></div> <div class="separator"></div>
<template is="dom-if" if="[[showUseClassic_( <template is="dom-if" if="[[showUseClassic_(
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
</settings-toggle-button> </settings-toggle-button>
</if> </if>
<div class="settings-box"> <div class="settings-box">
<div class="start">$i18n{fontSize}</div> <div class="start settings-box-text">$i18n{fontSize}</div>
<settings-dropdown-menu id="defaultFontSize" label="$i18n{fontSize}" <settings-dropdown-menu id="defaultFontSize" label="$i18n{fontSize}"
pref="{{prefs.webkit.webprefs.default_font_size}}" pref="{{prefs.webkit.webprefs.default_font_size}}"
menu-options="[[fontSizeOptions_]]"> menu-options="[[fontSizeOptions_]]">
...@@ -153,7 +153,9 @@ ...@@ -153,7 +153,9 @@
label="$i18n{customizeFonts}" on-click="onCustomizeFontsTap_"> label="$i18n{customizeFonts}" on-click="onCustomizeFontsTap_">
</cr-link-row> </cr-link-row>
<div class="settings-box" hidden="[[!pageVisibility.pageZoom]]"> <div class="settings-box" hidden="[[!pageVisibility.pageZoom]]">
<div id="pageZoom" class="start">$i18n{pageZoom}</div> <div id="pageZoom" class="start settings-box-text">
$i18n{pageZoom}
</div>
<select id="zoomLevel" class="md-select" aria-labelledby="pageZoom" <select id="zoomLevel" class="md-select" aria-labelledby="pageZoom"
on-change="onZoomLevelChange_"> on-change="onZoomLevelChange_">
<template is="dom-repeat" items="[[pageZoomLevels_]]"> <template is="dom-repeat" items="[[pageZoomLevels_]]">
......
...@@ -138,22 +138,20 @@ ...@@ -138,22 +138,20 @@
</cr-button> </cr-button>
</span> </span>
</div> </div>
<div id="aboutTPMFirmwareUpdate" class="settings-box two-line" <cr-link-row
id="aboutTPMFirmwareUpdate"
class="hr"
hidden$="[[!showTPMFirmwareUpdateLineItem_]]" hidden$="[[!showTPMFirmwareUpdateLineItem_]]"
on-click="onTPMFirmwareUpdateClick_" actionable> label="$i18n{aboutTPMFirmwareUpdateTitle}"
<div class="start"> on-click="onTPMFirmwareUpdateClick_">
<div>$i18n{aboutTPMFirmwareUpdateTitle}</div> <div slot="sub-label">
<div class="secondary"> $i18n{aboutTPMFirmwareUpdateDescription}
$i18n{aboutTPMFirmwareUpdateDescription} <a href="$i18n{aboutTPMFirmwareUpdateLearnMoreURL}"
<a href="$i18n{aboutTPMFirmwareUpdateLearnMoreURL}" target="_blank" on-click="onLearnMoreClick_">
target="_blank" on-click="onLearnMoreClick_"> $i18n{learnMore}
$i18n{learnMore} </a>
</a>
</div>
</div> </div>
<cr-icon-button class="subpage-arrow" </cr-link-row>
aria-labelledby="aboutTPMFirmwareUpdate"></cr-icon-button>
</div>
<cr-link-row class="hr" id="help" on-click="onHelpClick_" <cr-link-row class="hr" id="help" on-click="onHelpClick_"
label="$i18n{aboutGetHelpUsingChromeOs}" external></cr-link-row> label="$i18n{aboutGetHelpUsingChromeOs}" external></cr-link-row>
<if expr="_google_chrome"> <if expr="_google_chrome">
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
focus-config="[[focusConfig_]]"> focus-config="[[focusConfig_]]">
<div route-path="default"> <div route-path="default">
<div class="settings-box first two-line"> <div class="settings-box first two-line">
<div class="start"> <div class="start settings-box-text">
<div>$i18n{downloadLocation}</div> <div>$i18n{downloadLocation}</div>
<div class="secondary" id="defaultDownloadPath"> <div class="secondary" id="defaultDownloadPath">
<if expr="not chromeos"> <if expr="not chromeos">
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- Omnibox search engine --> <!-- Omnibox search engine -->
<div class="settings-box first block"> <div class="settings-box first block">
<div id="search-wrapper"> <div id="search-wrapper">
<div id="searchExplanation" class="start"> <div id="searchExplanation" class="start settings-box-text">
$i18nRaw{searchExplanation} $i18nRaw{searchExplanation}
</div> </div>
<template is="dom-if" if="[[isDefaultSearchControlledByPolicy_( <template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
...@@ -86,18 +86,14 @@ ...@@ -86,18 +86,14 @@
<if expr="chromeos"> <if expr="chromeos">
<!-- Google Assistant --> <!-- Google Assistant -->
<template is="dom-if" if="[[isAssistantAllowed_]]"> <template is="dom-if" if="[[isAssistantAllowed_]]">
<div id="assistantSubpageTrigger" class="settings-box two-line" <cr-link-row
on-click="onGoogleAssistantTap_" actionable> class="hr"
<div class="start"> id="assistantSubpageTrigger"
$i18n{searchGoogleAssistant} label="$i18n{searchGoogleAssistant}"
<div class="secondary"> sub-label="[[getAssistantEnabledDisabledLabel_(
[[getAssistantEnabledDisabledLabel_( prefs.settings.voice_interaction.enabled.value)]]"
prefs.settings.voice_interaction.enabled.value)]] on-click="onGoogleAssistantTap_">
</div> </cr-link-row>
</div>
<cr-icon-button class="subpage-arrow"
aria-label="$i18n{searchGoogleAssistant}"></cr-icon-button>
</div>
</template> </template>
</if> </if>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment