Skip to content

GitLab

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

File Manager: Update remaining <style is="custom-style"> for Polymer 2. 

per Polymer 2 migration guide:
 - wrap <style is="custom-style"> with <custom-style>
 - move <custom-style> inside <body>

Bug: 739532
Change-Id: I089208681d14e19e71251a41e80bd024c02d1b3a
Reviewed-on: https://chromium-review.googlesource.com/1247530Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Reviewed-by: default avatarTrent Apted <tapted@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594762}
parent 4a447c2d
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 79 deletions
ui/file_manager/gallery/gallery.html
View file @ c696feb7
......@@ -28,71 +28,73 @@
<link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/foreground/elements/files_tooltip.html">
<script src="js/gallery_scripts.js"></script>
<style is="custom-style">
cr-checkbox {
--cr-checkbox-checked-box-color: white;
--cr-checkbox-label-color: white;
--cr-checkbox-label-container: {
-webkit-padding-start: 6px;
};
--cr-checkbox-mark-color: black;
--cr-checkbox-ripple-checked-color: white;
--cr-checkbox-ripple-size: 38px;
--cr-checkbox-ripple-unchecked-color: white;
--cr-checkbox-size: 14px;
--cr-checkbox-unchecked-box-color: white;
}
paper-slider {
--paper-slider-active-color: white;
--paper-slider-container-color: rgba(255, 255, 255, 0.2);
--paper-slider-knob-color: white;
--paper-slider-secondary-color: transparent;
}
paper-progress {
--paper-progress-container-color: rgba(0, 0, 0, 0.3);
--paper-progress-active-color: #1AC222;
}
paper-button {
--paper-button-ink-color: black;
}
files-toggle-ripple {
--files-toggle-ripple-activated: {
opacity: 0.4;
};
}
cr-input {
--cr-form-field-label: {
color: rgba(255, 255, 255, 0.54);
display: block;
font-size: var(--cr-form-field-label-font-size);
letter-spacing: 0.4px;
line-height: var(--cr-form-field-label-font-size);
margin-bottom: 0;
</head>
<body>
<custom-style>
<style is="custom-style">
cr-checkbox {
--cr-checkbox-checked-box-color: white;
--cr-checkbox-label-color: white;
--cr-checkbox-label-container: {
-webkit-padding-start: 6px;
};
--cr-checkbox-mark-color: black;
--cr-checkbox-ripple-checked-color: white;
--cr-checkbox-ripple-size: 38px;
--cr-checkbox-ripple-unchecked-color: white;
--cr-checkbox-size: 14px;
--cr-checkbox-unchecked-box-color: white;
}
paper-slider {
--paper-slider-active-color: white;
--paper-slider-container-color: rgba(255, 255, 255, 0.2);
--paper-slider-knob-color: white;
--paper-slider-secondary-color: transparent;
}
paper-progress {
--paper-progress-container-color: rgba(0, 0, 0, 0.3);
--paper-progress-active-color: #1AC222;
}
--cr-input-color: white;
--cr-input-container: {
border-radius: 0;
paper-button {
--paper-button-ink-color: black;
}
--cr-input-input: {
background-color: transparent;
border-bottom: 1px solid var(--paper-grey-800);
files-toggle-ripple {
--files-toggle-ripple-activated: {
opacity: 0.4;
};
}
--cr-input-padding-end: 0;
--cr-input-padding-start: 0;
--cr-input-error-display: none;
--cr-input-focus-color: white;
}
#rename-input {
font-size: 16px;
margin: 8px 0;
min-width: 160px;
text-overflow: ellipsis;
}
</style>
</head>
<body>
cr-input {
--cr-form-field-label: {
color: rgba(255, 255, 255, 0.54);
display: block;
font-size: var(--cr-form-field-label-font-size);
letter-spacing: 0.4px;
line-height: var(--cr-form-field-label-font-size);
margin-bottom: 0;
}
--cr-input-color: white;
--cr-input-container: {
border-radius: 0;
}
--cr-input-input: {
background-color: transparent;
border-bottom: 1px solid var(--paper-grey-800);
}
--cr-input-padding-end: 0;
--cr-input-padding-start: 0;
--cr-input-error-display: none;
--cr-input-focus-color: white;
}
#rename-input {
font-size: 16px;
margin: 8px 0;
min-width: 160px;
text-overflow: ellipsis;
}
</style>
</custom-style>
<div class="gallery">
<div id="content" class="content">
<div class="thumbnail-view"></div>
......
ui/file_manager/video_player/video_player.html
View file @ c696feb7
......@@ -18,27 +18,28 @@
<link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/foreground/elements/files_icon_button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html">
<style is="custom-style">
files-icon-button {
--files-ripple: {
background-color: black;
};
--files-toggle-ripple: {
background-color: black;
};
--files-toggle-ripple-activated: {
background-color: black;
};
}
paper-slider {
--paper-slider-knob-color: rgb(64, 138, 241);
--paper-slider-active-color: rgb(66, 133, 244);
}
</style>
<script src="js/video_player_scripts.js"></script>
</head>
<body>
<custom-style>
<style is="custom-style">
files-icon-button {
--files-ripple: {
background-color: black;
};
--files-toggle-ripple: {
background-color: black;
};
--files-toggle-ripple-activated: {
background-color: black;
};
}
paper-slider {
--paper-slider-knob-color: rgb(64, 138, 241);
--paper-slider-active-color: rgb(66, 133, 244);
}
</style>
</custom-style>
<div id="video-player" tools>
<cr-menu id='cast-menu' class='cast-menu tool'
i18n-values="playon-text:VIDEO_PLAYER_PLAY_ON"></cr-menu>
......
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