Bug 1389740 - Use arrow-dropdown-16.svg for the urlbar history dropmarker. r=gijs

MozReview-Commit-ID: BFjr8C5R4yC
This commit is contained in:
Dão Gottwald 2017-08-17 15:18:21 +02:00
parent 866a0cbc3b
commit b3bc155fb6
17 changed files with 6 additions and 148 deletions

View File

@ -47,10 +47,6 @@ const whitelist = [
file: "chrome://browser/skin/arrow-left.svg",
platforms: ["linux", "win", "macosx"],
},
{
file: "chrome://browser/skin/arrow-dropdown-16.svg",
platforms: ["linux", "win", "macosx"],
},
{
file: "chrome://browser/skin/tabbrowser/tab-overflow-indicator.png",
platforms: ["linux", "win", "macosx"],

View File

@ -255,9 +255,6 @@ menuitem.bookmark-item {
.urlbar-input-box {
margin: 0;
}
.urlbar-history-dropmarker {
-moz-appearance: toolbarbutton-dropdown;
}
/* ::::: URL Bar Zoom Reset Button ::::: */
@keyframes urlbar-zoom-reset-pulse {

View File

@ -4,17 +4,6 @@
%include ../shared/compacttheme.inc.css
:root:-moz-lwtheme-darktext {
--urlbar-dropmarker-url: url("chrome://browser/skin/compacttheme/urlbar-history-dropmarker.svg");
--urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/compacttheme/urlbar-history-dropmarker.svg");
--urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px);
}
/* The menubar and tabs toolbar should match the devedition theme */
#TabsToolbar,
#toolbar-menubar {
@ -27,10 +16,4 @@
color: inherit;
}
.urlbar-history-dropmarker {
-moz-appearance: none;
padding: 0 3px;
list-style-image: var(--urlbar-dropmarker-url);
-moz-image-region: var(--urlbar-dropmarker-region);
}

View File

@ -25,13 +25,6 @@
--toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) + 1px);
--toolbarbutton-border-radius: 4px;
--urlbar-dropmarker-url: url("chrome://browser/skin/urlbar-history-dropmarker.png");
--urlbar-dropmarker-region: rect(0, 11px, 14px, 0);
--urlbar-dropmarker-active-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
--urlbar-dropmarker-2x-region: rect(0, 22px, 28px, 0);
--urlbar-dropmarker-active-2x-region: rect(0, 44px, 28px, 22px);
--panel-separator-color: hsla(210,4%,10%,.14);
--arrowpanel-dimmed: hsla(210,4%,10%,.07);
--arrowpanel-dimmed-further: hsla(210,4%,10%,.12);
@ -420,32 +413,6 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
margin: 0;
padding: 3px 0 2px;
}
.urlbar-history-dropmarker {
padding: 0 3px;
list-style-image: var(--urlbar-dropmarker-url);
-moz-image-region: var(--urlbar-dropmarker-region);
}
.urlbar-history-dropmarker[open="true"],
.urlbar-history-dropmarker:hover:active {
-moz-image-region: var(--urlbar-dropmarker-active-region);
}
@media (min-resolution: 2dppx) {
.urlbar-history-dropmarker {
list-style-image: var(--urlbar-dropmarker-2x-url);
-moz-image-region: var(--urlbar-dropmarker-2x-region);
}
.urlbar-history-dropmarker[open="true"],
.urlbar-history-dropmarker:hover:active {
-moz-image-region: var(--urlbar-dropmarker-active-2x-region);
}
.urlbar-history-dropmarker > .dropmarker-icon {
width: 11px;
}
}
/* ::::: URL Bar Zoom Reset Button ::::: */
@keyframes urlbar-zoom-reset-pulse {

View File

@ -38,8 +38,6 @@ browser.jar:
skin/classic/browser/slowStartup-16.png
skin/classic/browser/toolbarbutton-dropmarker.png
skin/classic/browser/toolbarbutton-dropmarker@2x.png
skin/classic/browser/urlbar-history-dropmarker.png
skin/classic/browser/urlbar-history-dropmarker@2x.png
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-popup-blocked@2x.png
skin/classic/browser/webRTC-sharingDevice-menubar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 807 B

View File

@ -32,14 +32,6 @@
/* Url and search bars */
--url-and-searchbar-background-color: rgb(71, 71, 73);
--urlbar-separator-color: #5F6670;
--urlbar-dropmarker-url: url("chrome://browser/skin/compacttheme/urlbar-history-dropmarker.svg");
--urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/compacttheme/urlbar-history-dropmarker.svg");
--urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px);
}
:root:-moz-lwtheme-darktext {

View File

@ -1,22 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33" height="14" viewBox="0 0 33 14">
<defs>
<polygon points="0,0 5.5,7 11,0" id="dropmarker-shape"/>
</defs>
<style>
use {
fill: #b6babf;
}
.hover {
fill: #61bdeb;
}
.active {
fill: #39ace6;
}
</style>
<use xlink:href="#dropmarker-shape" style="transform: translate(0, 4px)"/>
<use xlink:href="#dropmarker-shape" style="transform: translate(11px, 4px)" class="hover"/>
<use xlink:href="#dropmarker-shape" style="transform: translate(22px, 4px)" class="active"/>
</svg>

Before

Width:  |  Height:  |  Size: 831 B

View File

@ -257,5 +257,4 @@
skin/classic/browser/privatebrowsing/tracking-protection.svg (../shared/privatebrowsing/tracking-protection.svg)
skin/classic/browser/compacttheme/loading-inverted.png (../shared/compacttheme/loading-inverted.png)
skin/classic/browser/compacttheme/loading-inverted@2x.png (../shared/compacttheme/loading-inverted@2x.png)
skin/classic/browser/compacttheme/urlbar-history-dropmarker.svg (../shared/compacttheme/urlbar-history-dropmarker.svg)
skin/classic/browser/urlbar-tab.svg (../shared/urlbar-tab.svg)

View File

@ -107,7 +107,13 @@
list-style-image: url("chrome://browser/skin/sync.svg");
}
/* URL bar and page action buttons */
.urlbar-history-dropmarker {
-moz-appearance: none;
list-style-image: url(chrome://browser/skin/arrow-dropdown-16.svg);
-moz-context-properties: fill;
fill: currentColor;
transition: opacity 0.15s ease;
}
@ -119,8 +125,6 @@
opacity: 0;
}
/* Page action urlbar buttons */
#page-action-buttons {
-moz-box-align: center;
/* Add more space between the last icon and the urlbar's edge. */

View File

@ -24,15 +24,6 @@
--toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) - 1px);
--toolbarbutton-border-radius: 2px;
--urlbar-dropmarker-url: url("chrome://browser/skin/urlbar-history-dropmarker.png");
--urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-region: rect(0px, 22px, 14px, 11px);
--urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
--urlbar-dropmarker-2x-region: rect(0, 22px, 28px, 0);
--urlbar-dropmarker-hover-2x-region: rect(0, 44px, 28px, 22px);
--urlbar-dropmarker-active-2x-region: rect(0, 66px, 28px, 44px);
--panel-separator-color: ThreeDLightShadow;
--arrowpanel-dimmed: hsla(0,0%,80%,.3);
--arrowpanel-dimmed-further: hsla(0,0%,80%,.45);
@ -631,47 +622,6 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
outline-offset: -3px;
}
/* Location bar dropmarker */
.urlbar-history-dropmarker {
-moz-appearance: none;
padding: 0 3px;
background-color: transparent;
border: none;
width: auto;
list-style-image: var(--urlbar-dropmarker-url);
-moz-image-region: var(--urlbar-dropmarker-region);
}
.urlbar-history-dropmarker:hover {
-moz-image-region: var(--urlbar-dropmarker-hover-region);
}
.urlbar-history-dropmarker:hover:active,
.urlbar-history-dropmarker[open="true"] {
-moz-image-region: var(--urlbar-dropmarker-active-region);
}
@media (min-resolution: 1.1dppx) {
.urlbar-history-dropmarker {
list-style-image: var(--urlbar-dropmarker-2x-url);
-moz-image-region: var(--urlbar-dropmarker-2x-region);
}
.urlbar-history-dropmarker:hover {
-moz-image-region: var(--urlbar-dropmarker-hover-2x-region);
}
.urlbar-history-dropmarker[open="true"],
.urlbar-history-dropmarker:hover:active {
-moz-image-region: var(--urlbar-dropmarker-active-2x-region);
}
.urlbar-history-dropmarker > .dropmarker-icon {
width: 11px;
}
}
/* page proxy icon */
%include ../shared/identity-block/identity-block.inc.css

View File

@ -40,10 +40,6 @@ browser.jar:
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
skin/classic/browser/toolbarbutton-dropdown-arrow-win7.png
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-history-dropmarker.png
skin/classic/browser/urlbar-history-dropmarker@2x.png
skin/classic/browser/urlbar-history-dropmarker-win7.png
skin/classic/browser/urlbar-history-dropmarker-win7@2x.png
skin/classic/browser/webRTC-indicator.css (../shared/webRTC-indicator.css)
* skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css)
skin/classic/browser/customizableui/menu-arrow.svg (customizableui/menu-arrow.svg)
@ -112,8 +108,6 @@ browser.jar:
% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-win7@2x.png os=WINNT osversion<=6.1
% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-win7@2x.png os=WINNT osversion<=6.1
% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/tabbrowser/tab-background-start.png chrome://browser/skin/tabbrowser/tab-background-start-preWin10.png os=WINNT osversion<=6.3

Binary file not shown.

Before

Width:  |  Height:  |  Size: 479 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 788 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 B