Commit 2449240a authored by John Lee's avatar John Lee Committed by Commit Bot

Settings WebUI: Remove --settings-list-frame-padding mixin

This CL replaces uses of --settings-list-frame-padding with the
existing .list-frame class and removes the align-items property on the
class as it has no effect on block elements.

Bug: 973674
Change-Id: I69eef3deaa016e0183c6c3d359e29f94e5b0875a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2161931
Commit-Queue: John Lee <johntlee@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762148}
parent bd540794
<style include="settings-shared action-link iron-flex"> <style include="settings-shared action-link iron-flex">
.list-frame {
@apply --settings-list-frame-padding;
}
.list-frame > div { .list-frame > div {
border-top: var(--cr-separator-line); border-top: var(--cr-separator-line);
} }
#outer { #outer {
@apply --settings-list-frame-padding;
max-height: 355px; /** Enough height to show six entries. */ max-height: 355px; /** Enough height to show six entries. */
} }
...@@ -16,7 +11,7 @@ ...@@ -16,7 +11,7 @@
cursor: default; cursor: default;
} }
</style> </style>
<div id="outer" class="layout vertical flex"> <div id="outer" class="layout vertical flex list-frame">
<div id="container" class="scroll-container" scrollable> <div id="container" class="scroll-container" scrollable>
<iron-list items="[[startupPages_]]" scroll-target="container" <iron-list items="[[startupPages_]]" scroll-target="container"
preserve-focus risk-selection class="cr-separators"> preserve-focus risk-selection class="cr-separators">
......
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
flex: 4; flex: 4;
} }
#outer {
@apply --settings-list-frame-padding;
}
settings-search-engine-entry { settings-search-engine-entry {
border-top: var(--cr-separator-line); border-top: var(--cr-separator-line);
} }
...@@ -34,7 +30,7 @@ ...@@ -34,7 +30,7 @@
width: var(--cr-icon-ripple-size); width: var(--cr-icon-ripple-size);
} }
</style> </style>
<div id="outer"> <div id="outer" class="list-frame">
<div id="headers" class="column-header"> <div id="headers" class="column-header">
<div class="name">$i18n{searchEnginesSearchEngine}</div> <div class="name">$i18n{searchEnginesSearchEngine}</div>
<div class="keyword">$i18n{searchEnginesKeyword}</div> <div class="keyword">$i18n{searchEnginesKeyword}</div>
......
<style include="cr-shared-style settings-shared iron-flex"> <style include="cr shared-style settings-shared iron-flex">
.extension-engines,
#noOtherEngines,
.no-search-results {
@apply --settings-list-frame-padding;
}
settings-omnibox-extension-entry { settings-omnibox-extension-entry {
border-top: var(--cr-separator-line); border-top: var(--cr-separator-line);
} }
...@@ -12,7 +6,8 @@ ...@@ -12,7 +6,8 @@
<div class="cr-row first"> <div class="cr-row first">
<h2>$i18n{searchEnginesDefault}</h2> <h2>$i18n{searchEnginesDefault}</h2>
</div> </div>
<div class="no-search-results" hidden="[[matchingDefaultEngines_.length]]"> <div class="no-search-results list-frame"
hidden="[[matchingDefaultEngines_.length]]">
$i18n{searchNoResults} $i18n{searchNoResults}
</div> </div>
<settings-search-engines-list fixed-height <settings-search-engines-list fixed-height
...@@ -32,10 +27,11 @@ ...@@ -32,10 +27,11 @@
$i18n{add} $i18n{add}
</cr-button> </cr-button>
</div> </div>
<div id="noOtherEngines" hidden="[[otherEngines.length]]"> <div id="noOtherEngines" class="list-frame"
hidden="[[otherEngines.length]]">
$i18n{searchEnginesNoOtherEngines} $i18n{searchEnginesNoOtherEngines}
</div> </div>
<div class="no-search-results" <div class="no-search-results list-frame"
hidden="[[!showNoResultsMessage_( hidden="[[!showNoResultsMessage_(
otherEngines, matchingOtherEngines_)]]"> otherEngines, matchingOtherEngines_)]]">
$i18n{searchNoResults} $i18n{searchNoResults}
...@@ -49,10 +45,11 @@ ...@@ -49,10 +45,11 @@
<div class="cr-row first"> <div class="cr-row first">
<h2>$i18n{searchEnginesExtension}</h2> <h2>$i18n{searchEnginesExtension}</h2>
</div> </div>
<div class="no-search-results" hidden="[[matchingExtensions_.length]]"> <div class="no-search-results list-frame"
hidden="[[matchingExtensions_.length]]">
$i18n{searchNoResults} $i18n{searchNoResults}
</div> </div>
<iron-list id="extensions" class="extension-engines" <iron-list id="extensions" class="extension-engines list-frame"
items="[[matchingExtensions_]]" preserve-focus risk-selection> items="[[matchingExtensions_]]" preserve-focus risk-selection>
<template> <template>
<settings-omnibox-extension-entry engine="[[item]]" <settings-omnibox-extension-entry engine="[[item]]"
......
...@@ -154,9 +154,11 @@ ...@@ -154,9 +154,11 @@
* outside of a settings-box. A list-frame is likely to follow a * outside of a settings-box. A list-frame is likely to follow a
* settings box. */ * settings box. */
.list-frame { .list-frame {
@apply --settings-list-frame-padding;
align-items: center;
display: block; display: block;
padding-block-end: 0;
padding-block-start: 0;
padding-inline-end: var(--cr-section-padding);
padding-inline-start: var(--cr-section-indent-padding);
} }
/* A list-item is intended to be contained within a list-frame. The list /* A list-item is intended to be contained within a list-frame. The list
......
...@@ -15,13 +15,6 @@ ...@@ -15,13 +15,6 @@
--settings-disabled-opacity: .65; --settings-disabled-opacity: .65;
--settings-error-color: var(--google-red-700); --settings-error-color: var(--google-red-700);
--settings-list-frame-padding: {
padding-inline-end: var(--cr-section-padding);
padding-inline-start: var(--cr-section-indent-padding);
padding-bottom: 0;
padding-top: 0;
}
/* No --settings-nav-icon-color needed in light mode. */ /* No --settings-nav-icon-color needed in light mode. */
--settings-nav-item-color: var(--google-grey-refresh-700); --settings-nav-item-color: var(--google-grey-refresh-700);
......
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