Index: chrome/browser/resources/md_downloads/vulcanized.html |
diff --git a/chrome/browser/resources/md_downloads/vulcanized.html b/chrome/browser/resources/md_downloads/vulcanized.html |
index ad971a0e88869aaf71fa23f8dbb38ac729a8172b..fd1b42393b824b188dfc8aa99585b60e6810f758 100644 |
--- a/chrome/browser/resources/md_downloads/vulcanized.html |
+++ b/chrome/browser/resources/md_downloads/vulcanized.html |
@@ -25,6 +25,23 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN |
--> |
<meta charset="utf-8"> |
<title>$i18n{title}</title> |
+ <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> |
+ <style> |
+/* Copyright 2016 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. */ |
+ |
+:root { |
+ /* This is a custom, Chrome-specific color that does not have a --paper or |
+ * --google equivalent. */ |
+ --md-background-color: #f1f1f1; |
+ --md-loading-message-color: #6e6e6e; |
+ /* This is --google-blue-700, rewritten as a native custom property for speed. |
+ */ |
+ --md-toolbar-color: rgb(51, 103, 214); |
+} |
+ |
+</style> |
<style> |
html { |
background: var(--md-background-color); |
@@ -46,35 +63,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN |
} |
</style> |
</head> |
-<body><div hidden="" by-vulcanize=""><link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"><style> |
-/* Copyright 2016 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. */ |
- |
-:root { |
- /* This is a custom, Chrome-specific color that does not have a --paper or |
- * --google equivalent. */ |
- --md-background-color: #f1f1f1; |
- --md-loading-message-color: #6e6e6e; |
- /* This is --google-blue-700, rewritten as a native custom property for speed. |
- */ |
- --md-toolbar-color: rgb(51, 103, 214); |
-} |
- |
-</style></div> |
- <downloads-manager></downloads-manager> |
-<if expr="is_macosx"> |
- <command id="clear-all-command" shortcut="Alt|c Alt|ç"></command> |
- <command id="undo-command" shortcut="Meta|z"></command> |
- <command id="find-command" shortcut="Meta|f"></command> |
-</if> |
-<if expr="not is_macosx"> |
- <command id="clear-all-command" shortcut="Alt|c"></command> |
- <command id="undo-command" shortcut="Ctrl|z"></command> |
- <command id="find-command" shortcut="Ctrl|f"></command> |
-</if> |
- <div hidden="" by-vulcanize=""></div><link rel="import" href="chrome://resources/html/polymer.html"> |
- <div hidden="" by-vulcanize=""><script src="chrome://resources/js/load_time_data.js"></script><script src="chrome://downloads/strings.js"></script></div><div hidden="" by-vulcanize=""><dom-module id="iron-list" assetpath="chrome://resources/polymer/v1_0/iron-list/" css-build="shadow"> |
+<body><div hidden="" by-vulcanize=""><script src="chrome://resources/js/load_time_data.js"></script> |
+<script src="chrome://downloads/strings.js"></script> |
+<dom-module id="iron-list" assetpath="chrome://resources/polymer/v1_0/iron-list/" css-build="shadow"> |
<template> |
<style scope="iron-list">:host { |
display: block; |
@@ -243,6 +234,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN |
} |
</style> |
+ |
+ |
<dom-module id="iron-icon" assetpath="chrome://resources/polymer/v1_0/iron-icon/" css-build="shadow"> |
<template> |
<style scope="iron-icon">:host { |
@@ -388,6 +381,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN |
</style> |
</template> |
</dom-module> |
+ |
+ |
<dom-module id="paper-button" assetpath="chrome://resources/polymer/v1_0/paper-button/" css-build="shadow"> |
<template strip-whitespace=""> |
<style scope="paper-button">:host { |
@@ -830,6 +825,8 @@ paper-ripple { |
} |
</style> |
+ |
+ |
<dom-module id="paper-progress" assetpath="chrome://resources/polymer/v1_0/paper-progress/" css-build="shadow"> |
<template> |
<style scope="paper-progress">:host { |
@@ -857,7 +854,7 @@ paper-ripple { |
} |
#progressContainer, .indeterminate::after { |
- background: var(--paper-progress-container-color,var(--google-grey-300)); |
+ background: var(--paper-progress-container-color,var(--google-grey-300));; |
} |
:host(.transiting) #primaryProgress, :host(.transiting) #secondaryProgress { |
@@ -887,19 +884,19 @@ paper-ripple { |
} |
#primaryProgress { |
- background: var(--paper-progress-active-color,var(--google-green-500)); |
+ background: var(--paper-progress-active-color,var(--google-green-500));; |
} |
#secondaryProgress { |
- background: var(--paper-progress-secondary-color,var(--google-green-100)); |
+ background: var(--paper-progress-secondary-color,var(--google-green-100));; |
} |
:host([disabled]) #primaryProgress { |
- background: var(--paper-progress-disabled-active-color,var(--google-grey-500)); |
+ background: var(--paper-progress-disabled-active-color,var(--google-grey-500));; |
} |
:host([disabled]) #secondaryProgress { |
- background: var(--paper-progress-disabled-secondary-color,var(--google-grey-300)); |
+ background: var(--paper-progress-disabled-secondary-color,var(--google-grey-300));; |
} |
:host(:not([disabled])) #primaryProgress.indeterminate { |
@@ -1316,8 +1313,6 @@ paper-button { |
</dom-module> |
- |
- |
<style is="custom-style" css-build="shadow">html { |
--primary-text-color: var(--light-theme-text-color); |
--primary-background-color: var(--light-theme-background-color); |
@@ -1358,6 +1353,38 @@ paper-button { |
} |
</style> |
+<style> |
+/* Copyright 2015 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. */ |
+ |
+<if expr="not chromeos and not is_android"> |
+@font-face { |
+ font-family: 'Roboto'; |
+ font-style: normal; |
+ font-weight: 400; |
+ src: local('Roboto'), local('Roboto-Regular'), |
+ url("chrome://resources/roboto/roboto-regular.woff2") format('woff2'); |
+} |
+ |
+@font-face { |
+ font-family: 'Roboto'; |
+ font-style: normal; |
+ font-weight: 500; |
+ src: local('Roboto Medium'), local('Roboto-Medium'), |
+ url("chrome://resources/roboto/roboto-medium.woff2") format('woff2'); |
+} |
+ |
+@font-face { |
+ font-family: 'Roboto'; |
+ font-style: normal; |
+ font-weight: 700; |
+ src: local('Roboto Bold'), local('Roboto-Bold'), |
+ url("chrome://resources/roboto/roboto-bold.woff2") format('woff2'); |
+} |
+</if> |
+ |
+</style> |
<style is="custom-style" css-build="shadow">html { |
--paper-font-common-base_-_font-family: 'Roboto', 'Noto', sans-serif; --paper-font-common-base_-_-webkit-font-smoothing: antialiased;; |
@@ -1399,38 +1426,7 @@ paper-button { |
} |
</style> |
-<style> |
-/* Copyright 2015 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. */ |
- |
-<if expr="not chromeos and not is_android"> |
-@font-face { |
- font-family: 'Roboto'; |
- font-style: normal; |
- font-weight: 400; |
- src: local('Roboto'), local('Roboto-Regular'), |
- url("chrome://resources/roboto/roboto-regular.woff2") format('woff2'); |
-} |
- |
-@font-face { |
- font-family: 'Roboto'; |
- font-style: normal; |
- font-weight: 500; |
- src: local('Roboto Medium'), local('Roboto-Medium'), |
- url("chrome://resources/roboto/roboto-medium.woff2") format('woff2'); |
-} |
- |
-@font-face { |
- font-family: 'Roboto'; |
- font-style: normal; |
- font-weight: 700; |
- src: local('Roboto Bold'), local('Roboto-Bold'), |
- url("chrome://resources/roboto/roboto-bold.woff2") format('woff2'); |
-} |
-</if> |
- |
-</style><dom-module id="paper-item-shared-styles" assetpath="chrome://resources/polymer/v1_0/paper-item/" css-build="shadow"> |
+<dom-module id="paper-item-shared-styles" assetpath="chrome://resources/polymer/v1_0/paper-item/" css-build="shadow"> |
<template> |
<style scope="paper-item-shared-styles">:host, .paper-item { |
display: block; |
@@ -1459,7 +1455,7 @@ paper-button { |
} |
:host([disabled]), .paper-item[disabled] { |
- color: var(--paper-item-disabled-color,var(--disabled-text-color)); |
+ color: var(--paper-item-disabled-color,var(--disabled-text-color));; |
; |
} |
@@ -1485,6 +1481,8 @@ paper-button { |
</style> |
</template> |
</dom-module> |
+ |
+ |
<dom-module id="paper-item" assetpath="chrome://resources/polymer/v1_0/paper-item/" css-build="shadow"> |
<template> |
@@ -1515,7 +1513,7 @@ paper-button { |
} |
:host([disabled]), .paper-item[disabled] { |
- color: var(--paper-item-disabled-color,var(--disabled-text-color)); |
+ color: var(--paper-item-disabled-color,var(--disabled-text-color));; |
; |
} |
@@ -1561,7 +1559,7 @@ paper-button { |
} |
.selectable-content > ::content > [disabled] { |
- color: var(--paper-menu-disabled-color,var(--disabled-text-color)); |
+ color: var(--paper-menu-disabled-color,var(--disabled-text-color));; |
} |
.selectable-content > ::content > *:focus { |
@@ -1588,6 +1586,8 @@ paper-button { |
</style> |
</template> |
</dom-module> |
+ |
+ |
<dom-module id="paper-menu" assetpath="chrome://resources/polymer/v1_0/paper-menu/" css-build="shadow"> |
<template> |
@@ -1598,7 +1598,7 @@ paper-button { |
} |
.selectable-content > ::content > [disabled] { |
- color: var(--paper-menu-disabled-color,var(--disabled-text-color)); |
+ color: var(--paper-menu-disabled-color,var(--disabled-text-color));; |
} |
.selectable-content > ::content > *:focus { |
@@ -1626,8 +1626,8 @@ paper-button { |
display: block; |
padding: 8px 0; |
- background: var(--paper-menu-background-color,var(--primary-background-color)); |
- color: var(--paper-menu-color,var(--primary-text-color)); |
+ background: var(--paper-menu-background-color,var(--primary-background-color));; |
+ color: var(--paper-menu-color,var(--primary-text-color));; |
; |
} |
@@ -1640,7 +1640,7 @@ paper-button { |
</template> |
</dom-module> |
-<dom-module id="iron-overlay-backdrop" assetpath="/" css-build="shadow"> |
+<dom-module id="iron-overlay-backdrop" assetpath="chrome://resources/polymer/v1_0/iron-overlay-behavior/" css-build="shadow"> |
<template> |
<style scope="iron-overlay-backdrop">:host { |
@@ -1669,7 +1669,10 @@ paper-button { |
</dom-module> |
-<script src="chrome://resources/polymer/v1_0/web-animations-js/web-animations-next-lite.min.js"></script><dom-module id="iron-dropdown" assetpath="chrome://resources/polymer/v1_0/iron-dropdown/" css-build="shadow"> |
+<script src="chrome://resources/polymer/v1_0/web-animations-js/web-animations-next-lite.min.js"></script> |
+ |
+ |
+<dom-module id="iron-dropdown" assetpath="chrome://resources/polymer/v1_0/iron-dropdown/" css-build="shadow"> |
<template> |
<style scope="iron-dropdown">:host { |
position: fixed; |
@@ -1718,7 +1721,7 @@ iron-dropdown { |
position: relative; |
border-radius: 2px; |
- background-color: var(--paper-menu-button-dropdown-background,var(--primary-background-color)); |
+ background-color: var(--paper-menu-button-dropdown-background,var(--primary-background-color));; |
; |
} |
@@ -1782,12 +1785,12 @@ iron-dropdown { |
} |
:host #ink { |
- color: var(--paper-icon-button-ink-color,var(--primary-text-color)); |
+ color: var(--paper-icon-button-ink-color,var(--primary-text-color));; |
opacity: 0.6; |
} |
:host([disabled]) { |
- color: var(--paper-icon-button-disabled-text,var(--disabled-text-color)); |
+ color: var(--paper-icon-button-disabled-text,var(--disabled-text-color));; |
pointer-events: none; |
cursor: auto; |
@@ -1863,23 +1866,23 @@ to { |
height: 100%; |
opacity: 0; |
white-space: nowrap; |
- border-color: var(--paper-spinner-color,var(--google-blue-500)); |
+ border-color: var(--paper-spinner-color,var(--google-blue-500));; |
} |
.layer-1 { |
- border-color: var(--paper-spinner-layer-1-color,var(--google-blue-500)); |
+ border-color: var(--paper-spinner-layer-1-color,var(--google-blue-500));; |
} |
.layer-2 { |
- border-color: var(--paper-spinner-layer-2-color,var(--google-red-500)); |
+ border-color: var(--paper-spinner-layer-2-color,var(--google-red-500));; |
} |
.layer-3 { |
- border-color: var(--paper-spinner-layer-3-color,var(--google-yellow-500)); |
+ border-color: var(--paper-spinner-layer-3-color,var(--google-yellow-500));; |
} |
.layer-4 { |
- border-color: var(--paper-spinner-layer-4-color,var(--google-green-500)); |
+ border-color: var(--paper-spinner-layer-4-color,var(--google-green-500));; |
} |
.active .spinner-layer { |
@@ -2347,6 +2350,8 @@ to { |
</style> |
</template> |
</dom-module> |
+ |
+ |
<dom-module id="paper-spinner-lite" assetpath="chrome://resources/polymer/v1_0/paper-spinner/" css-build="shadow"> |
<template strip-whitespace=""> |
<style scope="paper-spinner-lite">:host { |
@@ -2401,23 +2406,23 @@ to { |
height: 100%; |
opacity: 0; |
white-space: nowrap; |
- border-color: var(--paper-spinner-color,var(--google-blue-500)); |
+ border-color: var(--paper-spinner-color,var(--google-blue-500));; |
} |
.layer-1 { |
- border-color: var(--paper-spinner-layer-1-color,var(--google-blue-500)); |
+ border-color: var(--paper-spinner-layer-1-color,var(--google-blue-500));; |
} |
.layer-2 { |
- border-color: var(--paper-spinner-layer-2-color,var(--google-red-500)); |
+ border-color: var(--paper-spinner-layer-2-color,var(--google-red-500));; |
} |
.layer-3 { |
- border-color: var(--paper-spinner-layer-3-color,var(--google-yellow-500)); |
+ border-color: var(--paper-spinner-layer-3-color,var(--google-yellow-500));; |
} |
.layer-4 { |
- border-color: var(--paper-spinner-layer-4-color,var(--google-green-500)); |
+ border-color: var(--paper-spinner-layer-4-color,var(--google-green-500));; |
} |
.active .spinner-layer { |
@@ -3283,7 +3288,9 @@ paper-item { |
--md-toolbar-color: rgb(51, 103, 214); |
} |
-</style><dom-module id="downloads-manager" assetpath="chrome://downloads/" css-build="shadow"> |
+</style> |
+ |
+<dom-module id="downloads-manager" assetpath="chrome://downloads/" css-build="shadow"> |
<template> |
<style scope="downloads-manager">:host { |
display: flex; |
@@ -3375,4 +3382,17 @@ paper-item { |
</div> |
</template> |
</dom-module> |
-</div><script src="crisper.js"></script></body></html> |
+</div> |
+ <downloads-manager></downloads-manager> |
+<if expr="is_macosx"> |
+ <command id="clear-all-command" shortcut="Alt|c Alt|ç"></command> |
+ <command id="undo-command" shortcut="Meta|z"></command> |
+ <command id="find-command" shortcut="Meta|f"></command> |
+</if> |
+<if expr="not is_macosx"> |
+ <command id="clear-all-command" shortcut="Alt|c"></command> |
+ <command id="undo-command" shortcut="Ctrl|z"></command> |
+ <command id="find-command" shortcut="Ctrl|f"></command> |
+</if> |
+ <link rel="import" href="chrome://resources/html/polymer.html"> |
+ <script src="crisper.js"></script></body></html> |