Bug 1385848 - Make the chats tab icon use the tab text color. r=jorgk

This commit is contained in:
Richard Marti 2017-07-31 13:50:51 +02:00
Родитель 539d3334cc
Коммит fee1643fc5
8 изменённых файлов: 16 добавлений и 57 удалений

Просмотреть файл

@ -643,3 +643,10 @@ toolbar[mode="text"] #statusTypeIcon > .toolbarbutton-icon {
border-color: ThreeDShadow;
background-color: -moz-field;
}
.tabmail-tab[type="chat"],
.alltabs-item[type="chat"] {
list-style-image: url("chrome://messenger/skin/icons/chat.svg");
-moz-context-properties: fill;
fill: currentColor;
}

Просмотреть файл

@ -153,6 +153,7 @@ classic.jar:
skin/classic/messenger/icons/arrow-left.svg (../shared/mail/icons/arrow-left.svg)
skin/classic/messenger/icons/blacklist.svg (../shared/mail/icons/blacklist.svg)
skin/classic/messenger/icons/cert-error.svg (../shared/mail/icons/cert-error.svg)
skin/classic/messenger/icons/chat.svg (../shared/mail/icons/chat.svg)
skin/classic/messenger/icons/correspondents.svg (../shared/mail/icons/correspondents.svg)
skin/classic/messenger/icons/extensionGeneric.svg (../shared/mail/icons/extensionGeneric.svg)
skin/classic/messenger/icons/mail-toolbar.svg (../shared/mail/icons/mail-toolbar.svg)

Просмотреть файл

@ -171,18 +171,3 @@ richlistitem[state="disconnected"] .accountStateIcon {
#appmenu_imAccountsStatus .menu-iconic-icon {
visibility: visible;
}
.tabmail-tab[type="chat"],
.alltabs-item[type="chat"] {
list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
-moz-image-region: auto;
}
.tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
width: 18px;
height: 18px;
margin-top: 0;
margin-inline-end: 5px;
margin-bottom: -1px;
margin-inline-start: -1px;
}

Просмотреть файл

@ -161,6 +161,7 @@ classic.jar:
skin/classic/messenger/icons/attachment-col.png (mail/icons/attachment-col.png)
skin/classic/messenger/icons/attachment-selected.png (mail/icons/attachment-selected.png)
skin/classic/messenger/icons/attachment.png (mail/icons/attachment.png)
skin/classic/messenger/icons/chat.svg (../shared/mail/icons/chat.svg)
skin/classic/messenger/icons/check.png (mail/icons/check.png)
skin/classic/messenger/icons/close-inverted.png (mail/icons/close-inverted.png)
skin/classic/messenger/icons/close-inverted@2x.png (mail/icons/close-inverted@2x.png)

Просмотреть файл

@ -265,26 +265,3 @@ richlistitem[state="disconnected"] .accountStateIcon {
height: 16px;
}
}
@media not all and (-moz-mac-yosemite-theme) {
.tabmail-tab[type="chat"],
.alltabs-item[type="chat"] {
list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#chat");
}
}
@media (-moz-mac-yosemite-theme) {
.tabmail-tab[type="chat"],
.alltabs-item[type="chat"] {
list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-flat");
}
}
.tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
width: 18px;
height: 18px;
margin-top: 0;
margin-inline-end: 5px;
margin-bottom: -1px;
margin-inline-start: -1px;
}

Просмотреть файл

@ -0,0 +1,6 @@
<!-- 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" width="16" height="16">
<path fill="context-fill" d="M 15,4 C 15,2.8 14.2,2 13,2 H 3 C 1.8,2 1,2.8 1,4 v 5 c 0,1.2 0.789,2 2,2 h 2 v 3.5 L 8.5,11 H 13 c 1.2,0 2,-0.8 2,-2 z"/>
</svg>

После

Ширина:  |  Высота:  |  Размер: 437 B

Просмотреть файл

@ -160,6 +160,7 @@ classic.jar:
skin/classic/messenger/icons/arrow-left.svg (../shared/mail/icons/arrow-left.svg)
skin/classic/messenger/icons/blacklist.svg (../shared/mail/icons/blacklist.svg)
skin/classic/messenger/icons/cert-error.svg (../shared/mail/icons/cert-error.svg)
skin/classic/messenger/icons/chat.svg (../shared/mail/icons/chat.svg)
skin/classic/messenger/icons/correspondents.svg (../shared/mail/icons/correspondents.svg)
skin/classic/messenger/icons/extensionGeneric.svg (../shared/mail/icons/extensionGeneric.svg)
skin/classic/messenger/icons/mail-toolbar.svg (../shared/mail/icons/mail-toolbar.svg)

Просмотреть файл

@ -281,20 +281,6 @@ toolbar[brighttext] #button-chat-accounts {
list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-inverted");
}
.tabmail-tab[type="chat"],
.alltabs-item[type="chat"] {
list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
}
.tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
width: 18px;
height: 18px;
margin-top: 0;
margin-inline-end: 5px;
margin-bottom: -1px;
margin-inline-start: -1px;
}
#statusTypeIcon[status="available"],
#statusTypeAvailable,
.statusTypeIcon[status="available"],
@ -427,9 +413,4 @@ richlistitem[state="disconnected"] .accountStateIcon {
#button-chat-accounts {
list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-flat");
}
.tabmail-tab[type="chat"],
.alltabs-item[type="chat"] {
list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-flat");
}
}