|
|
Created:
4 years ago by tsergeant Modified:
3 years, 11 months ago Reviewers:
calamity CC:
chromium-reviews, chrome-apps-syd-reviews_chromium.org, Patrick Dubroy, michaelpg+watch-md-ui_chromium.org, dbeam+watch-history_chromium.org, pam+watch_chromium.org, arv+watch_chromium.org Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionMD History: Fix broken sync status dropdown
The sync (i) icon in the top-right of the page uses the iron-dropdown
Polymer element to display its content. This element was implicitly
imported by cr-shared-menu, meaning that after cr-shared-menu was
removed (in crrev.com/440308) from the history page, the dropdown
stopped working.
This CL restores the import of iron-dropdown, fixing the dropdown.
BUG=658821
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
Committed: https://crrev.com/8fa5f27bcd9f3348c8344e0b0728dd7f936bbfc4
Cr-Commit-Position: refs/heads/master@{#440815}
Patch Set 1 #Patch Set 2 : All your rebase #
Messages
Total messages: 20 (13 generated)
Description was changed from ========== MD History: Fix broken sync status dropdown The sync (i) icon in the top-right of the page uses the iron-dropdown Polymer element to display its content. This element was implicitly imported by cr-shared-menu, meaning that after cr-shared-menu was removed (in crrev.com/440308) from the history page, the dropdown stopped working. This CL restores the import of iron-dropdown, fixing the dropdown. BUG=658821 ========== to ========== MD History: Fix broken sync status dropdown The sync (i) icon in the top-right of the page uses the iron-dropdown Polymer element to display its content. This element was implicitly imported by cr-shared-menu, meaning that after cr-shared-menu was removed (in crrev.com/440308) from the history page, the dropdown stopped working. This CL restores the import of iron-dropdown, fixing the dropdown. BUG=658821 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ==========
The CQ bit was checked by tsergeant@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
tsergeant@chromium.org changed reviewers: + calamity@chromium.org
Next step is to remove the dependency on iron-dropdown. The sync status icon is the only thing that needs it now, and it adds 35KB to the lazy load bundle.
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
The CQ bit was checked by calamity@chromium.org
lgtm
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for chrome/browser/resources/md_history/app.vulcanized.html: While running git apply --index -p1; <stdin>:106: trailing whitespace. <stdin>:116: trailing whitespace. <stdin>:120: trailing whitespace. --light-theme-secondary-color: #737373; <stdin>:121: trailing whitespace. --light-theme-disabled-color: #9b9b9b; <stdin>:124: trailing whitespace. error: patch failed: chrome/browser/resources/md_history/app.vulcanized.html:22 error: chrome/browser/resources/md_history/app.vulcanized.html: patch does not apply Patch: chrome/browser/resources/md_history/app.vulcanized.html Index: chrome/browser/resources/md_history/app.vulcanized.html diff --git a/chrome/browser/resources/md_history/app.vulcanized.html b/chrome/browser/resources/md_history/app.vulcanized.html index ebc7206e8cbcbe1d3658f82db63323b9e1ed6b02..db2c0709dce9042a72cb6f9ee92882a388172af5 100644 --- a/chrome/browser/resources/md_history/app.vulcanized.html +++ b/chrome/browser/resources/md_history/app.vulcanized.html @@ -22,9 +22,27 @@ The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as part of the polymer project is also subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt ---><meta charset="UTF-8"> +--><meta charset="UTF-8"><link rel="import" href="chrome://resources/html/polymer.html"> +<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. */ -</head><body><div hidden="" by-vulcanize=""><link rel="import" href="chrome://resources/html/polymer.html"><dom-module id="iron-pages" assetpath="chrome://resources/polymer/v1_0/iron-pages/" css-build="shadow"> +: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> + + + +</head><body><div hidden="" by-vulcanize=""><dom-module id="iron-pages" assetpath="chrome://resources/polymer/v1_0/iron-pages/" css-build="shadow"> <template> <style scope="iron-pages">:host { @@ -167,6 +185,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 { @@ -279,46 +299,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN </template> </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); - --secondary-text-color: var(--light-theme-secondary-color); - --disabled-text-color: var(--light-theme-disabled-color); - --divider-color: var(--light-theme-divider-color); - --error-color: var(--paper-deep-orange-a700); - - - --primary-color: var(--paper-indigo-500); - --light-primary-color: var(--paper-indigo-100); - --dark-primary-color: var(--paper-indigo-700); - - --accent-color: var(--paper-pink-a200); - --light-accent-color: var(--paper-pink-a100); - --dark-accent-color: var(--paper-pink-a400); - - - - --light-theme-background-color: #ffffff; - --light-theme-base-color: #000000; - --light-theme-text-color: var(--paper-grey-900); - --light-theme-secondary-color: #737373; - --light-theme-disabled-color: #9b9b9b; - --light-theme-divider-color: #dbdbdb; - - - --dark-theme-background-color: var(--paper-grey-900); - --dark-theme-base-color: #ffffff; - --dark-theme-text-color: #ffffff; - --dark-theme-secondary-color: #bcbcbc; - --dark-theme-disabled-color: #646464; - --dark-theme-divider-color: #3c3c3c; - - - --text-primary-color: var(--dark-theme-text-color); - --default-primary-color: var(--primary-color); -} - -</style> -<style is="custom-style" css-build="shadow">html { --google-red-100: #f4c7c3; --google-red-300: #e67c73; --google-red-500: #db4437; @@ -633,6 +613,50 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN } </style> + + +<style is="custom-style" css-build="shadow">html { + --primary-text-color: var(--light-theme-text-color); + --primary-background-color: var(--light-theme-background-color); + --secondary-text-color: var(--light-theme-secondary-color); + --disabled-text-color: var(--light-theme-disabled-color); + --divider-color: var(--light-theme-divider-color); + --error-color: var(--paper-deep-orange-a700); + + + --primary-color: var(--paper-indigo-500); + --light-primary-color: var(--paper-indigo-100); + --dark-primary-color: var(--paper-indigo-700); + + --accent-color: var(--paper-pink-a200); + --light-accent-color: var(--paper-pink-a100); + --dark-accent-color: var(--paper-pink-a400); + + + + --light-theme-background-color: #ffffff; + --light-theme-base-color: #000000; + --light-theme-text-color: var(--paper-grey-900); + --light-theme-secondary-color: #737373; + --light-theme-disabled-color: #9b9b9b; + --light-theme-divider-color: #dbdbdb; + + + --dark-theme-background-color: var(--paper-grey-900); + --dark-theme-base-color: #ffffff; + --dark-theme-text-color: #ffffff; + --dark-theme-secondary-color: #bcbcbc; + --dark-theme-disabled-color: #646464; + --dark-theme-divider-color: #3c3c3c; + + + --text-primary-color: var(--dark-theme-text-color); + --default-primary-color: var(--primary-color); +} + +</style> + + <dom-module id="paper-icon-button" assetpath="chrome://resources/polymer/v1_0/paper-icon-button/" css-build="shadow"> <template strip-whitespace=""> <style scope="paper-icon-button">:host { @@ -662,12 +686,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN } :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; @@ -743,23 +767,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 { @@ -1227,6 +1251,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 { @@ -1281,23 +1307,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 { @@ -2055,7 +2081,8 @@ h1 { </div> </template> </dom-module> -<link rel="import" href="chrome://history/constants.html"><iron-iconset-svg size="24" name="history"> +<link rel="import" href="chrome://history/constants.html"> +<iron-iconset-svg size="24" name="history"> <svg> <defs> @@ -2171,6 +2198,8 @@ button.more-vert-button div { </style> </template> </dom-module> + + <dom-module id="history-toolbar" assetpath="chrome://history/" css-build="shadow"> <template> <style scope="history-toolbar">[hidden] { @@ -2449,9 +2478,6 @@ paper-tab { </template> </dom-module> - - - <style is="custom-style" css-build="shadow">html { --cr-actionable_-_cursor: pointer;; --cr-focused-item-color: var(--google-grey-300); @@ -2472,6 +2498,7 @@ paper-tab { } </style> + <dom-module id="cr-shared-style" assetpath="chrome://resources/cr_elements/" css-build="shadow"> <template> <style scope="cr-shared-style">paper-spinner { @@ -2682,9 +2709,12 @@ paper-icon-button.subpage-arrow { } </style> -<link rel="im… (message too large)
The CQ bit was checked by tsergeant@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from calamity@chromium.org Link to the patchset: https://codereview.chromium.org/2594303002/#ps20001 (title: "All your rebase")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch. Bot data: {"patchset_id": 20001, "attempt_start_ts": 1482882474593250, "parent_rev": "309062c08adde27eed1ef1433a056aa5da819423", "commit_rev": "befa0862948fda61d20835062c20c003254a3068"}
Message was sent while issue was closed.
Description was changed from ========== MD History: Fix broken sync status dropdown The sync (i) icon in the top-right of the page uses the iron-dropdown Polymer element to display its content. This element was implicitly imported by cr-shared-menu, meaning that after cr-shared-menu was removed (in crrev.com/440308) from the history page, the dropdown stopped working. This CL restores the import of iron-dropdown, fixing the dropdown. BUG=658821 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation ========== to ========== MD History: Fix broken sync status dropdown The sync (i) icon in the top-right of the page uses the iron-dropdown Polymer element to display its content. This element was implicitly imported by cr-shared-menu, meaning that after cr-shared-menu was removed (in crrev.com/440308) from the history page, the dropdown stopped working. This CL restores the import of iron-dropdown, fixing the dropdown. BUG=658821 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2594303002 ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001)
Message was sent while issue was closed.
Description was changed from ========== MD History: Fix broken sync status dropdown The sync (i) icon in the top-right of the page uses the iron-dropdown Polymer element to display its content. This element was implicitly imported by cr-shared-menu, meaning that after cr-shared-menu was removed (in crrev.com/440308) from the history page, the dropdown stopped working. This CL restores the import of iron-dropdown, fixing the dropdown. BUG=658821 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2594303002 ========== to ========== MD History: Fix broken sync status dropdown The sync (i) icon in the top-right of the page uses the iron-dropdown Polymer element to display its content. This element was implicitly imported by cr-shared-menu, meaning that after cr-shared-menu was removed (in crrev.com/440308) from the history page, the dropdown stopped working. This CL restores the import of iron-dropdown, fixing the dropdown. BUG=658821 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Committed: https://crrev.com/8fa5f27bcd9f3348c8344e0b0728dd7f936bbfc4 Cr-Commit-Position: refs/heads/master@{#440815} ==========
Message was sent while issue was closed.
Patchset 2 (id:??) landed as https://crrev.com/8fa5f27bcd9f3348c8344e0b0728dd7f936bbfc4 Cr-Commit-Position: refs/heads/master@{#440815} |