Commit 1f3bff29 authored by Rebekah Potter's avatar Rebekah Potter Committed by Commit Bot

Revert "Fix Assistant settings label padding"

This reverts commit 27008de3.

Reason for revert: This resulted in all dropdown menus in Print
Preview being cut off, see https://crbug.com/927649.

This also caused a regression in the settings credit card dialog,
may be others that have not been identified yet.

Original change's description:
> Fix Assistant settings label padding
> 
> - Wrap the sub-label of settings entry.
> - md-select items automatically shrink, adding a min-width to it.
>   (not sure if this is intended?)
> 
> Bug: b/123363474
> Test: Manual Test
> Change-Id: Idd47e14a3b9d00dafe792f421660665d636e58b5
> Reviewed-on: https://chromium-review.googlesource.com/c/1439460
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
> Commit-Queue: Yue Li <updowndota@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#627996}

TBR=stevenjb@chromium.org,xiaohuic@chromium.org,updowndota@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: b/123363474
Change-Id: I56b0551c822152498f5b8387c954a785c1af94f5
Reviewed-on: https://chromium-review.googlesource.com/c/1450017Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#628474}
parent a230653d
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 8px 0; margin: 8px 0;
min-width: var(--cr-text-element-min-width); min-width: 200px;
} }
#labels { #labels {
......
...@@ -14,11 +14,7 @@ ...@@ -14,11 +14,7 @@
<dom-module id="settings-google-assistant-page"> <dom-module id="settings-google-assistant-page">
<template> <template>
<style include="settings-shared md-select"> <style include="settings-shared md-select"></style>
.text-area {
margin-inline-end: 24px;
}
</style>
<settings-toggle-button id="googleAssistantEnable" <settings-toggle-button id="googleAssistantEnable"
class="first primary-toggle" class="first primary-toggle"
pref="{{prefs.settings.voice_interaction.enabled}}" pref="{{prefs.settings.voice_interaction.enabled}}"
......
...@@ -187,8 +187,6 @@ ...@@ -187,8 +187,6 @@
white-space: nowrap; white-space: nowrap;
} }
--cr-text-element-min-width: 200px;
--cr-title-text: { --cr-title-text: {
color: var(--cr-title-text-color); color: var(--cr-title-text-color);
font-size: 107.6923%; /* Go to 14px from 13px. */ font-size: 107.6923%; /* Go to 14px from 13px. */
...@@ -205,7 +203,7 @@ ...@@ -205,7 +203,7 @@
font-size: 92.31%; /* Effectively 12px if the host default is 13px. */ font-size: 92.31%; /* Effectively 12px if the host default is 13px. */
font-weight: 500; font-weight: 500;
max-width: 330px; max-width: 330px;
min-width: var(--cr-text-element-min-width); min-width: 200px;
padding: 10px 8px; padding: 10px 8px;
} }
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
max-width: 100%; max-width: 100%;
min-width: var(--cr-text-element-min-width);
outline: none; outline: none;
padding-bottom: 6px; padding-bottom: 6px;
/* Ensures 3px space between text and arrow */ /* Ensures 3px space between text and arrow */
......
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