Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1885)

Unified Diff: chrome/browser/resources/md_downloads/vulcanized.html

Issue 2119733002: Revert "MD Settings: Improve rendering performance of fonts page." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/controls/settings_dropdown_menu.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2d2caca784ad7de15677e5c1b377778d8a1ff681..5135d05b975a573886c379ecce2f43fb9a29bec5 100644
--- a/chrome/browser/resources/md_downloads/vulcanized.html
+++ b/chrome/browser/resources/md_downloads/vulcanized.html
@@ -59,24 +59,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
</head>
<body><div hidden="" by-vulcanize=""><script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://downloads/strings.js"></script>
-<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: rgb(241, 241, 241);
- /* This is --google-blue-700, rewritten as a native custom property for speed.
- */
- --md-toolbar-color: rgb(51, 103, 214);
-}
-
-</style>
-
-
-
<dom-module id="iron-list" assetpath="chrome://resources/polymer/v1_0/iron-list/">
<template>
<style>
@@ -470,6 +452,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/">
<style>
@@ -655,6 +639,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
</style>
</template>
</dom-module>
+
+
<dom-module id="paper-material" assetpath="chrome://resources/polymer/v1_0/paper-material/">
<template>
<style include="paper-material-shared-styles"></style>
@@ -1081,6 +1067,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
}
</style>
+
+
<dom-module id="paper-progress" assetpath="chrome://resources/polymer/v1_0/paper-progress/">
<template>
<style>
@@ -1596,8 +1584,6 @@ paper-button {
</dom-module>
-
-
<style is="custom-style">
:root {
@@ -1655,6 +1641,36 @@ 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. */
+
+@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');
+}
+
+</style>
<style is="custom-style">
:root {
@@ -1811,40 +1827,10 @@ 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. */
-
-@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');
-}
-
-</style>
<dom-module id="paper-item-shared-styles" assetpath="chrome://resources/polymer/v1_0/paper-item/">
<template>
<style>
- :host(paper-item), :host(paper-icon-item), .paper-item {
+ :host, .paper-item {
display: block;
position: relative;
min-height: var(--paper-item-min-height, 48px);
@@ -1860,30 +1846,30 @@ paper-button {
text-align: left;
}
- :host(paper-item[hidden]), :host(paper-icon-item[hidden]), .paper-item[hidden] {
+ :host([hidden]), .paper-item[hidden] {
display: none !important;
}
- :host(paper-item.iron-selected), :host(paper-icon-item.iron-selected), .paper-item.iron-selected {
+ :host(.iron-selected), .paper-item.iron-selected {
font-weight: var(--paper-item-selected-weight, bold);
@apply(--paper-item-selected);
}
- :host(paper-item[disabled]), :host(paper-icon-item[disabled]), .paper-item[disabled] {
+ :host([disabled]), .paper-item[disabled] {
color: var(--paper-item-disabled-color, --disabled-text-color);
@apply(--paper-item-disabled);
}
- :host(paper-item:focus), :host(paper-icon-item:focus), .paper-item:focus {
+ :host(:focus), .paper-item:focus {
position: relative;
outline: 0;
@apply(--paper-item-focused);
}
- :host(paper-item:focus):before, :host(paper-icon-item:focus):before, .paper-item:focus:before {
+ :host(:focus):before, .paper-item:focus:before {
@apply(--layout-fit);
background: currentColor;
@@ -1896,6 +1882,8 @@ paper-button {
</style>
</template>
</dom-module>
+
+
<dom-module id="paper-item" assetpath="chrome://resources/polymer/v1_0/paper-item/">
<template>
<style include="paper-item-shared-styles"></style>
@@ -1950,6 +1938,8 @@ paper-button {
</style>
</template>
</dom-module>
+
+
<dom-module id="paper-menu" assetpath="chrome://resources/polymer/v1_0/paper-menu/">
<template>
<style include="paper-menu-shared-styles"></style>
@@ -2001,6 +1991,8 @@ 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/">
<style>
:host {
@@ -2670,6 +2662,22 @@ paper-button {
</dom-module>
+<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: rgb(241, 241, 241);
+ /* This is --google-blue-700, rewritten as a native custom property for speed.
+ */
+ --md-toolbar-color: rgb(51, 103, 214);
+}
+
+</style>
+
<dom-module id="downloads-manager" assetpath="chrome://downloads/">
<template><style>
/* Copyright 2015 The Chromium Authors. All rights reserved.
« no previous file with comments | « no previous file | chrome/browser/resources/settings/controls/settings_dropdown_menu.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698