Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1208020 - Fix gUM sharing icons not being shown in mac toolbar when making a call. webRTC-indicator.css is only shared across Windows and Linux, not Mac as well. r=dao

Browse Source 
--HG--
rename : browser/themes/shared/webrtc/indicator.css => browser/themes/linux/webRTC-indicator.css
rename : browser/themes/shared/webrtc/indicator.css => browser/themes/windows/webRTC-indicator.css
This commit is contained in:
Mark Banner 2015-10-01 19:38:56 +01:00
parent 1fb1bc7a2f
commit 2beeec6ee2
5 changed files with 118 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/themes/linux/jar.mn
View File

@ -56,6 +56,7 @@ browser.jar:
skin/classic/browser/Toolbar.png
skin/classic/browser/Toolbar-inverted.png
skin/classic/browser/Toolbar-small.png
skin/classic/browser/webRTC-indicator.css
skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png)
skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png)
skin/classic/browser/loop/toolbar.png (loop/toolbar.png)

0
browser/themes/shared/webrtc/indicator.css → browser/themes/linux/webRTC-indicator.css
View File

1
browser/themes/shared/jar.inc.mn
View File

@ -145,7 +145,6 @@
skin/classic/browser/webRTC-shareScreen-64@2x.png (../shared/webrtc/webRTC-shareScreen-64@2x.png)
skin/classic/browser/webRTC-sharingScreen-16.png (../shared/webrtc/webRTC-sharingScreen-16.png)
skin/classic/browser/webRTC-sharingScreen-16@2x.png (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
skin/classic/browser/webRTC-indicator.css (../shared/webrtc/indicator.css)
skin/classic/browser/webRTC-camera-white-16.png (../shared/webrtc/camera-white-16.png)
skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
skin/classic/browser/webRTC-screen-white-16.png (../shared/webrtc/screen-white-16.png)

1
browser/themes/windows/jar.mn
View File

@ -92,6 +92,7 @@ browser.jar:
skin/classic/browser/urlbar-history-dropmarker@2x.png
skin/classic/browser/urlbar-history-dropmarker-preWin10.png
skin/classic/browser/urlbar-history-dropmarker-preWin10@2x.png
skin/classic/browser/webRTC-indicator.css
skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png)
skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png)
skin/classic/browser/loop/menuPanel-aero.png (loop/menuPanel-aero.png)

116
browser/themes/windows/webRTC-indicator.css Normal file
View File

@ -0,0 +1,116 @@
/* 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/. */
window {
border: 1px solid #ff9500;
}
#audioVideoButton,
#screenShareButton,
#firefoxButton {
height: 29px;
margin: 0;
-moz-appearance: none;
border-style: none;
}
#firefoxButton {
background-image: url("chrome://branding/content/icon48.png");
background-repeat: no-repeat;
background-size: 22px;
background-position: center center;
min-width: 29px;
background-color: white;
}
#firefoxButton:hover {
background-color: #f2f2f2;
}
#screenShareButton {
background-image: url("webRTC-screen-white-16.png");
background-position: center center;
background-repeat: no-repeat;
background-size: 16px;
min-width: 27px;
display: none;
}
window[sharingscreen] > #screenShareButton {
display: -moz-box;
}
#audioVideoButton {
display: none;
background-repeat: no-repeat;
}
/* When screen sharing, need to pull in the separator: */
window[sharingscreen] > #audioVideoButton {
margin-right: -1px;
}
/* Single icon button: */
window[sharingvideo] > #audioVideoButton,
window[sharingaudio] > #audioVideoButton {
display: -moz-box;
background-position: center center;
background-size: 16px;
min-width: 26px;
}
window[sharingvideo] > #audioVideoButton {
background-image: url("webRTC-camera-white-16.png");
}
window[sharingaudio] > #audioVideoButton {
background-image: url("webRTC-microphone-white-16.png");
}
/* Multi-icon button: */
window[sharingaudio][sharingvideo] > #audioVideoButton {
background-image: url("webRTC-camera-white-16.png"),
url("webRTC-microphone-white-16.png");
background-position: 6px center, 26px center;
background-size: 16px, 16px;
min-width: 46px;
}
/* Hover styles */
#audioVideoButton,
#screenShareButton {
background-color: #ffaa33;
}
#audioVideoButton:hover,
#screenShareButton:hover {
background-color: #ff9500;
}
/* Don't show the dropmarker for the type="menu" case */
#audioVideoButton > .box-inherit > .button-menu-dropmarker,
#screenShareButton > .box-inherit > .button-menu-dropmarker {
display: none;
}
/* Separator in case of screen sharing + video/audio sharing */
#shareSeparator {
width: 1px;
margin: 4px -1px 4px 0;
background-color: #FFCA80;
/* Separator needs to show above either button when they're hovered: */
position: relative;
z-index: 1;
display: none;
}
window[sharingscreen][sharingvideo] > #shareSeparator,
window[sharingscreen][sharingaudio] > #shareSeparator {
display: -moz-box;
}
:-moz-any(#audioVideoButton, #screenShareButton,
#firefoxButton):-moz-focusring > .button-box {
border: none;
}