Commit a1b402e7 authored by stevenjb's avatar stevenjb Committed by Commit bot

Settings: shared css: add .settings-box.single-column

This should make it a little bit simpler for the somewhat common case
of a single column settings-box (20 / 60 existing two-line instances,
with more to come in internet settings).

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

Review-Url: https://codereview.chromium.org/2169193003
Cr-Commit-Position: refs/heads/master@{#407322}
parent 8cafd0e7
...@@ -15,18 +15,14 @@ ...@@ -15,18 +15,14 @@
-webkit-user-select: text; -webkit-user-select: text;
} }
</style> </style>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>$i18n{aboutPlatformLabel}</div>
<div>$i18n{aboutPlatformLabel}</div> <div class="secondary" id="osVersion">[[versionInfo_.osVersion]]</div>
<div class="secondary" id="osVersion">[[versionInfo_.osVersion]]</div>
</div>
</div> </div>
<div class="settings-box two-line" <div class="settings-box two-line single-column"
hidden$="[[!shouldShowVersion_(versionInfo_.osFirmware)]]"> hidden$="[[!shouldShowVersion_(versionInfo_.osFirmware)]]">
<div class="start"> <div>$i18n{aboutFirmwareLabel}</div>
<div>$i18n{aboutFirmwareLabel}</div> <div class="secondary" id="osFirmware">[[versionInfo_.osFirmware]]</div>
<div class="secondary" id="osFirmware">[[versionInfo_.osFirmware]]</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line">
<div class="start"> <div class="start">
...@@ -44,42 +40,30 @@ ...@@ -44,42 +40,30 @@
<settings-channel-switcher-dialog></settings-channel-switcher-dialog> <settings-channel-switcher-dialog></settings-channel-switcher-dialog>
</template> </template>
</div> </div>
<div class="settings-box two-line" <div class="settings-box two-line single-column"
hidden$="[[!shouldShowVersion_(versionInfo_.arcVersion)]]"> hidden$="[[!shouldShowVersion_(versionInfo_.arcVersion)]]">
<div class="start"> <div>$i18n{aboutArcVersionLabel}</div>
<div>$i18n{aboutArcVersionLabel}</div> <div class="secondary" id="arcVersion">[[versionInfo_.arcVersion]]</div>
<div class="secondary" id="arcVersion">[[versionInfo_.arcVersion]]</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>Blink</div><!-- No need to localize. -->
<div>Blink</div><!-- No need to localize. --> <div class="secondary">$i18n{aboutBlinkVersion}</div>
<div class="secondary">$i18n{aboutBlinkVersion}</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>V8</div>
<div>V8</div> <div class="secondary">$i18n{aboutJsEngineVersion}</div>
<div class="secondary">$i18n{aboutJsEngineVersion}</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>$i18n{aboutUserAgentLabel}</div>
<div>$i18n{aboutUserAgentLabel}</div> <div class="secondary">$i18n{aboutUserAgent}</div>
<div class="secondary">$i18n{aboutUserAgent}</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>$i18n{aboutCommandLineLabel}</div>
<div>$i18n{aboutCommandLineLabel}</div> <div class="secondary">$i18n{aboutCommandLine}</div>
<div class="secondary">$i18n{aboutCommandLine}</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>$i18n{aboutBuildDateLabel}</div>
<div>$i18n{aboutBuildDateLabel}</div> <div class="secondary">$i18n{aboutBuildDate}</div>
<div class="secondary">$i18n{aboutBuildDate}</div>
</div>
</div> </div>
</template> </template>
<script src="detailed_build_info.js"></script> <script src="detailed_build_info.js"></script>
......
...@@ -97,12 +97,10 @@ ...@@ -97,12 +97,10 @@
menu-options="[[fontSizeOptions_]]" no-label-float> menu-options="[[fontSizeOptions_]]" no-label-float>
</settings-dropdown-menu> </settings-dropdown-menu>
</div> </div>
<div class="settings-box two-line" on-tap="onCustomizeFontsTap_" <div class="settings-box two-line single-column"
actionable> on-tap="onCustomizeFontsTap_" actionable>
<div class="start"> <div>$i18n{customizeFonts}</div>
<div>$i18n{customizeFonts}</div>
<div class="secondary">$i18n{chooseFontsAndEncoding}</div> <div class="secondary">$i18n{chooseFontsAndEncoding}</div>
</div>
</div> </div>
<div class="settings-box"> <div class="settings-box">
<div class="start">$i18n{pageZoom}</div> <div class="start">$i18n{pageZoom}</div>
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
</div> </div>
<if expr="chromeos"> <if expr="chromeos">
<div class="settings-box"> <div class="settings-box single-column">
<settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
label="$i18n{enableScreenlock}"> label="$i18n{enableScreenlock}">
</settings-checkbox> </settings-checkbox>
......
...@@ -123,23 +123,15 @@ ...@@ -123,23 +123,15 @@
</paper-checkbox> </paper-checkbox>
</div> </div>
<div class="settings-box two-line" on-tap="onManageSyncedDataTap_" <div class="settings-box two-line single-column" actionable
actionable> on-tap="onManageSyncedDataTap_">
<div class="start"> <div>$i18n{manageSyncedDataTitle}</div>
$i18n{manageSyncedDataTitle} <div class="secondary">$i18n{manageSyncedDataDescription}</div>
<div class="secondary">
$i18n{manageSyncedDataDescription}
</div>
</div>
</div> </div>
<div class="settings-box two-line"> <div class="settings-box two-line single-column">
<div class="start"> <div>$i18n{encryptionOptionsTitle}</div>
$i18n{encryptionOptionsTitle} <div class="secondary">$i18n{syncDataEncryptedText}</div>
<div class="secondary">
$i18n{syncDataEncryptedText}
</div>
</div>
</div> </div>
<div id="encryptionRadioGroupContainer" class="list-frame" <div id="encryptionRadioGroupContainer" class="list-frame"
......
...@@ -84,20 +84,16 @@ ...@@ -84,20 +84,16 @@
</if> </if>
</div> </div>
<if expr="use_nss_certs or is_win or is_macosx"> <if expr="use_nss_certs or is_win or is_macosx">
<div id="manageCertificates" class="settings-box two-line" actionable <div id="manageCertificates" class="settings-box two-line single-column"
on-tap="onManageCertificatesTap_"> actionable on-tap="onManageCertificatesTap_">
<div class="start"> <div>$i18n{manageCertificates}</div>
<div>$i18n{manageCertificates}</div> <div class="secondary">$i18n{manageCertificatesDescription}</div>
<div class="secondary">$i18n{manageCertificatesDescription}</div>
</div>
</div> </div>
</if> </if>
<div class="settings-box two-line" on-tap="onSiteSettingsTap_" <div class="settings-box two-line single-column" actionable
actionable> on-tap="onSiteSettingsTap_">
<div class="start"> <div>$i18n{siteSettings}</div>
<div>$i18n{siteSettings}</div> <div class="secondary">$i18n{siteSettingsDescription}</div>
<div class="secondary">$i18n{siteSettingsDescription}</div>
</div>
</div> </div>
<div class="settings-box"> <div class="settings-box">
<paper-button on-tap="onClearBrowsingDataTap_" class="primary-button"> <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button">
......
...@@ -10,20 +10,16 @@ ...@@ -10,20 +10,16 @@
<dom-module id="settings-reset-page"> <dom-module id="settings-reset-page">
<template> <template>
<style include="settings-shared"></style> <style include="settings-shared"></style>
<div class="settings-box first two-line" id="resetProfile" <div class="settings-box first two-line single-column" id="resetProfile"
on-tap="onShowResetProfileDialog_" actionable> on-tap="onShowResetProfileDialog_" actionable>
<div> <div>$i18n{resetPageTitle}</div>
<div>$i18n{resetPageTitle}</div> <div class="secondary">$i18n{resetPageDescription}</div>
<div class="secondary">$i18n{resetPageDescription}</div>
</div>
</div> </div>
<if expr="chromeos"> <if expr="chromeos">
<div class="settings-box two-line" id="powerwash" actionable <div class="settings-box two-line single-column" id="powerwash" actionable
on-tap="onShowPowerwashDialog_" hidden="[[!allowPowerwash_]]"> on-tap="onShowPowerwashDialog_" hidden="[[!allowPowerwash_]]">
<div> <div>$i18n{powerwashTitle}</div>
<div>$i18n{powerwashTitle}</div> <div class="secondary">$i18n{powerwashDescription}</div>
<div class="secondary">$i18n{powerwashDescription}</div>
</div>
</div> </div>
</if> </if>
</template> </template>
......
...@@ -280,6 +280,16 @@ ...@@ -280,6 +280,16 @@
min-height: 56px; min-height: 56px;
} }
/*
* A settings box with a single start-aligned column, generally but not
* necessarily used in combination with two-line.
*/
.settings-box.single-column {
align-items: flex-start;
flex-direction: column;
justify-content: center;
}
/* The lower line of text in a .settings-box.two-line. */ /* The lower line of text in a .settings-box.two-line. */
.settings-box .secondary { .settings-box .secondary {
@apply(--settings-secondary); @apply(--settings-secondary);
......
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