Skip to content

GitLab

T
tangled
Commit 247bda68 authored by dpapad's avatar dpapad Committed by Commit Bot
Browse files
Options

Files App: Fix occurence of <style is="custom-style"> to work with Polymer 2. 

 - wrap <style is="custom-style"> with <custom-style>
 - move custom-style inside <body>

Bug: 884030
Change-Id: Ic45df6d1846fdf6f6ee0cc5e23523779489bdb34
Reviewed-on: https://chromium-review.googlesource.com/1244833
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594548}
parent c6dc55ee
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
ui/file_manager/file_manager/main.html
View file @ 247bda68
...@@ -25,67 +25,69 @@ ...@@ -25,67 +25,69 @@
<link rel="stylesheet" href="foreground/css/common.css"> <link rel="stylesheet" href="foreground/css/common.css">
<link rel="stylesheet" href="chrome-extension://fbjakikfhfdajcamjleinfciajelkpek/cws_widget/cws_widget_container.css"> <link rel="stylesheet" href="chrome-extension://fbjakikfhfdajcamjleinfciajelkpek/cws_widget/cws_widget_container.css">
<style is="custom-style"> <script src="foreground/js/elements_importer.js"></script>
#search-box cr-input { <script src="foreground/js/main_scripts.js" defer></script>
--cr-input-color: white; </head>
--cr-input-focus-color: white;
--cr-input-container: { <body tabindex="-1">
border-radius: 0; <custom-style>
} <style is="custom-style">
--cr-input-error-display: none; #search-box cr-input {
--cr-input-input: { --cr-input-color: white;
background-color: transparent; --cr-input-focus-color: white;
border-bottom: 1px solid rgba(255, 255, 255, 0.5); --cr-input-container: {
border-radius: 0;
}
--cr-input-error-display: none;
--cr-input-input: {
background-color: transparent;
border-bottom: 1px solid rgba(255, 255, 255, 0.5);
}
--cr-input-padding-end: 20px;
--cr-input-padding-start: 0;
--cr-input-placeholder-color: rgba(255, 255, 255, 0.5);
display: inline-block;
transition: width 200ms ease;
vertical-align: middle;
width: 0;
} }
--cr-input-padding-end: 20px;
--cr-input-padding-start: 0; .dialog-footer cr-input {
--cr-input-placeholder-color: rgba(255, 255, 255, 0.5); --cr-input-container: {
display: inline-block; border-radius: 0;
transition: width 200ms ease; }
vertical-align: middle; --cr-input-error-display: none;
width: 0; --cr-input-input: {
} background-color: transparent;
border-bottom: 1px solid var(--paper-grey-800);
.dialog-footer cr-input { }
--cr-input-container: { --cr-input-padding-end: 0;
border-radius: 0; --cr-input-padding-start: 0;
--cr-input-padding-bottom: 2px;
width: 100%;
} }
--cr-input-error-display: none;
--cr-input-input: { paper-progress {
background-color: transparent; --paper-progress-active-color: rgb(26, 194, 34);
border-bottom: 1px solid var(--paper-grey-800);
} }
--cr-input-padding-end: 0;
--cr-input-padding-start: 0; body.check-select .dialog-header files-toggle-ripple {
--cr-input-padding-bottom: 2px; --files-toggle-ripple: {
width: 100%; background-color: black;
} };
--files-toggle-ripple-activated: {
paper-progress { opacity: 0.08;
--paper-progress-active-color: rgb(26, 194, 34); };
}
body.check-select .dialog-header files-toggle-ripple {
--files-toggle-ripple: {
background-color: black;
};
--files-toggle-ripple-activated: {
opacity: 0.08;
};
}
body.check-select .dialog-header files-ripple {
--files-ripple: {
background-color: black;
} }
}
</style>
<script src="foreground/js/elements_importer.js"></script> body.check-select .dialog-header files-ripple {
<script src="foreground/js/main_scripts.js" defer></script> --files-ripple: {
</head> background-color: black;
}
}
</style>
</custom-style>
<body tabindex="-1">
<commands> <commands>
<command id="cut" i18n-values="label:CUT_BUTTON_LABEL" <command id="cut" i18n-values="label:CUT_BUTTON_LABEL"
shortcut="x|Ctrl"> shortcut="x|Ctrl">
......
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