Commit bf15d68f authored by Alex Danilo's avatar Alex Danilo Committed by Commit Bot

Get rid of files_xf_elements.css

Remove the file and migrate any needed selectors to custom elements
that use them, and the main file_manager.css file.

Also removes the file reference in the python testing script.

Bug: 947388
Change-Id: I0673fa6cb819fdee0f50cc6749e87e1e25020430
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1691949
Commit-Queue: Alex Danilo <adanilo@chromium.org>
Reviewed-by: default avatarNoel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676221}
parent 2ec27377
...@@ -2148,13 +2148,20 @@ list.autocomplete-suggestions > [lead] { ...@@ -2148,13 +2148,20 @@ list.autocomplete-suggestions > [lead] {
/* Feedback panels */ /* Feedback panels */
.feedback-panels { .files-feedback-panels {
align-items: flex-end;
bottom: 24px; bottom: 24px;
display: flex;
flex-direction: column;
position: absolute; position: absolute;
right: 24px; right: 24px;
z-index: 502; /* Above splitter, but below quickview. */ z-index: 502; /* Above splitter, but below quickview. */
} }
.files-vertical-padder-8 {
height: 8px;
}
#completed-panel { #completed-panel {
padding-bottom: 8px; padding-bottom: 8px;
} }
......
...@@ -15,4 +15,3 @@ ...@@ -15,4 +15,3 @@
<link rel="import" href="files_toggle_ripple.html"> <link rel="import" href="files_toggle_ripple.html">
<link rel="import" href="files_tooltip.html"> <link rel="import" href="files_tooltip.html">
<link rel="import" href="icons.html"> <link rel="import" href="icons.html">
<link rel="import" href="files_xf_elements.css">
/* Copyright 2019 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
/* TODO(crbug.com/947388) revisit the 'xf-' prefix naming for better search. */
xf-display-panel {
max-width: 400px;
}
.feedback-panels {
align-items: flex-end;
display: flex;
flex-direction: column;
}
.xf-vertical-padder-8 {
height: 8px;
}
...@@ -62,6 +62,9 @@ class DisplayPanel extends HTMLElement { ...@@ -62,6 +62,9 @@ class DisplayPanel extends HTMLElement {
*/ */
static html_() { static html_() {
return `<style> return `<style>
:host {
max-width: 400px;
}
#container { #container {
align-items: stretch; align-items: stretch;
background-color: #FFF; background-color: #FFF;
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<link rel="stylesheet" href="foreground/css/file_status.css"> <link rel="stylesheet" href="foreground/css/file_status.css">
<link rel="stylesheet" href="foreground/css/file_types.css"> <link rel="stylesheet" href="foreground/css/file_types.css">
<link rel="stylesheet" href="foreground/css/common.css"> <link rel="stylesheet" href="foreground/css/common.css">
<link rel="stylesheet" href="foreground/elements/files_xf_elements.css">
<link rel="stylesheet" href="cws_widget/cws_widget_container.css"> <link rel="stylesheet" href="cws_widget/cws_widget_container.css">
<script src="foreground/js/elements_importer.js"></script> <script src="foreground/js/elements_importer.js"></script>
...@@ -543,10 +542,10 @@ ...@@ -543,10 +542,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="feedback-panels"> <div class="files-feedback-panels">
<xf-display-panel id="completed-panel"> <xf-display-panel id="completed-panel">
</xf-display-panel> </xf-display-panel>
<div class="xf-vertical-padder-8"></div> <div class="files-vertical-padder-8"></div>
<xf-display-panel id="progress-panel"> <xf-display-panel id="progress-panel">
</xf-display-panel> </xf-display-panel>
</div> </div>
......
...@@ -236,7 +236,6 @@ for filename, substitutions in ( ...@@ -236,7 +236,6 @@ for filename, substitutions in (
('foreground/elements/files_toast.html', ()), ('foreground/elements/files_toast.html', ()),
('foreground/elements/files_toggle_ripple.html', ()), ('foreground/elements/files_toggle_ripple.html', ()),
('foreground/elements/files_tooltip.html', ()), ('foreground/elements/files_tooltip.html', ()),
('foreground/elements/files_xf_elements.css', ()),
('foreground/elements/icons.html', ()), ('foreground/elements/icons.html', ()),
): ):
buf = i18n(read('ui/file_manager/file_manager/' + filename)) buf = i18n(read('ui/file_manager/file_manager/' + filename))
......
...@@ -137,7 +137,6 @@ ...@@ -137,7 +137,6 @@
<include name="IDR_FILE_MANAGER_IMG_UI_2X_DRIVE_WELCOME_LOGO" file="file_manager/foreground/images/files/ui/2x/drive_logo.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_IMG_UI_2X_DRIVE_WELCOME_LOGO" file="file_manager/foreground/images/files/ui/2x/drive_logo.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_UI_DRIVE_WELCOME_PEOPLE" file="file_manager/foreground/images/files/ui/drive_banner_people.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_IMG_UI_DRIVE_WELCOME_PEOPLE" file="file_manager/foreground/images/files/ui/drive_banner_people.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_UI_2X_DRIVE_WELCOME_PEOPLE" file="file_manager/foreground/images/files/ui/2x/drive_banner_people.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_IMG_UI_2X_DRIVE_WELCOME_PEOPLE" file="file_manager/foreground/images/files/ui/2x/drive_banner_people.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_XF_ELEMENTS_CSS" file="file_manager/foreground/elements/files_xf_elements.css" type="BINDATA" />
<!-- The VideoPlayer app pages and scripts. --> <!-- The VideoPlayer app pages and scripts. -->
<include name="IDR_VIDEO_PLAYER_MANIFEST" file="video_player/manifest.json" type="BINDATA" /> <include name="IDR_VIDEO_PLAYER_MANIFEST" file="video_player/manifest.json" type="BINDATA" />
......
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