From 1ecc8f31c80803a66bde3f81505eb391b2680c91 Mon Sep 17 00:00:00 2001 From: Bo Majewski Date: Thu, 1 Jun 2023 04:59:26 +0000 Subject: [PATCH] [M115][Files]: Eliminate extra space between trash and options In crrev.com/4521362 in order to hide search in trash while preserving transition events the display: none was replaced with visibility: none. This however upsets the layout of the files. In this CL we force the button to occupy no additional space. Video: http://screencast/cast/NTQ1NjgzMjgxOTYyNTk4NHw4OTMzZTdjMi1mZg (cherry picked from commit 9bc6e519d5648d73e415edc0b88e282264be56f6) Bug: b:283932818 Change-Id: I2f8d2a750f26442c57beecb265239a443ac2f7cf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4564176 Reviewed-by: Wenbo Jie Commit-Queue: Bo Majewski Cr-Original-Commit-Position: refs/heads/main@{#1148924} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4569965 Cr-Commit-Position: refs/branch-heads/5790@{#211} Cr-Branched-From: 1d71a337b1f6e707a13ae074dca1e2c34905eb9f-refs/heads/main@{#1148114} --- .../file_manager/foreground/css/file_manager.css | 9 +++++++++ .../file_manager/foreground/css/file_manager_gm3.css | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/ui/file_manager/file_manager/foreground/css/file_manager.css b/ui/file_manager/file_manager/foreground/css/file_manager.css index 2c50d8fc367ff..8baebefa35ce6 100644 --- a/ui/file_manager/file_manager/foreground/css/file_manager.css +++ b/ui/file_manager/file_manager/foreground/css/file_manager.css @@ -807,7 +807,12 @@ body.check-select #cancel-selection-button-wrapper { /* Search button */ body.check-select-v1 #search-button { + border: 0; + margin: 0; + min-width: 0; + padding: 0; visibility: hidden; + width: 0; } /* Search box */ @@ -828,6 +833,10 @@ body.check-select-v1 #search-button { caret-color: var(--cr-input-color); } +body.check-select-v1 #search-box { + visibility: hidden; +} + .dialog-header.files-ng #search-box.has-cursor, .dialog-header.files-ng #search-box.has-text, .dialog-header.files-ng #search-box.hide-pending { diff --git a/ui/file_manager/file_manager/foreground/css/file_manager_gm3.css b/ui/file_manager/file_manager/foreground/css/file_manager_gm3.css index 62b392772db98..dbfc6f8db0d99 100644 --- a/ui/file_manager/file_manager/foreground/css/file_manager_gm3.css +++ b/ui/file_manager/file_manager/foreground/css/file_manager_gm3.css @@ -655,7 +655,12 @@ body.check-select #cancel-selection-button-wrapper { /* Search button */ body.check-select-v1 #search-button { + border: 0; + margin: 0; + min-width: 0; + padding: 0; visibility: hidden; + width: 0; } /* Search box */ @@ -670,6 +675,10 @@ body.check-select-v1 #search-button { margin-inline-end: 16px; } +body.check-select-v1 #search-box { + visibility: hidden; +} + .dialog-header.files-ng #search-box.has-cursor, .dialog-header.files-ng #search-box.has-text, .dialog-header.files-ng #search-box.hide-pending {