From 1988bb88c279ec0deae5bbf72308e7b356416ae5 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 12 Oct 2014 00:03:55 +0200 Subject: [PATCH] third and last part of syncing LCARStrek with Firefox 33 windows theme changes --- LCARStrek/browser/browser.css | 26 ++-- LCARStrek/browser/devtools/common.css | 9 +- LCARStrek/browser/devtools/dark-theme.css | 2 +- LCARStrek/browser/devtools/inspector.css | 85 +++++++++++++ .../preferences/in-content/preferences.css | 9 +- LCARStrek/browser/webRTC-camera-16.png | Bin 0 -> 172 bytes LCARStrek/browser/webRTC-camera-16@2x.png | Bin 0 -> 189 bytes LCARStrek/browser/webRTC-indicator.css | 116 ++++++++++++++++++ LCARStrek/browser/webRTC-microphone-16.png | Bin 0 -> 176 bytes LCARStrek/browser/webRTC-microphone-16@2x.png | Bin 0 -> 196 bytes LCARStrek/browser/webRTC-screen-16.png | Bin 0 -> 178 bytes LCARStrek/browser/webRTC-screen-16@2x.png | Bin 0 -> 205 bytes LCARStrek/global/in-content/common.css | 40 +++--- 13 files changed, 248 insertions(+), 39 deletions(-) create mode 100644 LCARStrek/browser/webRTC-camera-16.png create mode 100644 LCARStrek/browser/webRTC-camera-16@2x.png create mode 100644 LCARStrek/browser/webRTC-indicator.css create mode 100644 LCARStrek/browser/webRTC-microphone-16.png create mode 100644 LCARStrek/browser/webRTC-microphone-16@2x.png create mode 100644 LCARStrek/browser/webRTC-screen-16.png create mode 100644 LCARStrek/browser/webRTC-screen-16@2x.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index acff1bc7..ca9ce7f1 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -823,15 +823,6 @@ menuitem.bookmark-item { -moz-image-region: rect(36px, 576px, 54px, 558px); } -#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) { - -moz-image-region: rect(0, 594px, 18px, 576px); -} - -#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])):hover, -#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]))[open="true"] { - -moz-image-region: rect(18px, 594px, 36px, 576px); -} - #nav-bar-overflow-button { -moz-image-region: rect(0, 612px, 18px, 594px); } @@ -907,14 +898,14 @@ menuitem.bookmark-item { toolbaritem[sdkstylewidget="true"] > toolbarbutton, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, - #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, + #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button)[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, - #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, + #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, @@ -3852,6 +3843,19 @@ html|*#gcli-output-frame { /* margin: 0 3px; */ } +.devtools-responsiveui-menulist .menulist-editable-box { + background-color: transparent; +} + +.devtools-responsiveui-menulist html|*.menulist-editable-input { + color: inherit; + text-align: center; +} + +.devtools-responsiveui-menulist html|*.menulist-editable-input::-moz-selection { +/* background: hsla(212,7%,57%,.35);*/ +} + .devtools-responsiveui-toolbarbutton > .toolbarbutton-icon { width: 16px; height: 16px; diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index 6c9eafc9..72b61f3c 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -175,7 +175,14 @@ notification { min-width: 100px; max-width: 400px; } -.devtools-tooltip[clamped-dimensions] .panel-arrowcontent { +.devtools-tooltip[clamped-dimensions-no-min-height] { + min-height: 0; + max-height: 400px; + min-width: 100px; + max-width: 400px; +} +.devtools-tooltip[clamped-dimensions] .panel-arrowcontent, +.devtools-tooltip[clamped-dimensions-no-min-height] .panel-arrowcontent { overflow: hidden; } diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index bdaf21b1..279ce70f 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -33,7 +33,7 @@ .theme-bg-contrast, .variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */ - background: #402800; + background: #402800; /* Background - Attention */ } .theme-link, diff --git a/LCARStrek/browser/devtools/inspector.css b/LCARStrek/browser/devtools/inspector.css index 10ba6b3a..cb1b5409 100644 --- a/LCARStrek/browser/devtools/inspector.css +++ b/LCARStrek/browser/devtools/inspector.css @@ -287,3 +287,88 @@ window { #inspector-searchbox[filled] { max-width: 200px !important; } + +/* Tooltip: Events */ + +#devtools-tooltip-events-container { + margin: -4px; /* Compensate for the .panel-arrowcontent padding. */ + max-width: 390px; +} + +.event-header { + display: flex; + align-items: center; + cursor: pointer; +} + +.event-tooltip-event-type, +.event-tooltip-filename, +.event-tooltip-attributes { + -moz-margin-start: 0; + flex-shrink: 0; + cursor: pointer; +} + +.event-tooltip-event-type { + font-weight: bold; + font-size: 13px; +} + +.event-tooltip-filename { + -moz-margin-end: 0; + font-size: 100%; + flex-shrink: 1; +} + +.event-tooltip-debugger-icon { + width: 16px; + height: 16px; + -moz-margin-end: 4px; + opacity: 0.6; + flex-shrink: 0; +} + +.event-tooltip-debugger-icon:hover { + opacity: 1; +} + +.event-tooltip-content-box { + display: none; + overflow: auto; + -moz-margin-end: 0; +} + +.event-tooltip-content-box[open] { + display: block; +} + +.event-tooltip-source-container { + margin-top: 5px; + margin-bottom: 10px; + -moz-margin-start: 5px; + -moz-margin-end: 0; +} + +.event-tooltip-source { + margin-bottom: 0; +} + +.event-tooltip-attributes-container { + background-color: #000000; + color: #9C9CFF; +} + +.event-tooltip-attributes-container { + display: flex; + flex-shrink: 0; + align-items: center; + border-radius: 3px; + padding: 2px; + -moz-margin-start: 5px; +} + +.event-tooltip-attributes { + margin: 0; + font-size: 9px; + padding-top: 2px; +} diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 0fdaa3cd..e01d97ed 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -25,19 +25,13 @@ treecol { } caption { - -moz-appearance: none; - margin: 0; } caption > label { - font-size: 1.3rem; - font-weight: bold; - line-height: 22px; - margin: 0 !important; } .main-content { - padding: 40px 48px 48px; + padding: 10px 20px 0px; overflow: auto; } @@ -51,6 +45,7 @@ prefpane { } prefpane > .content-box { + max-width: 800px; overflow: visible; } diff --git a/LCARStrek/browser/webRTC-camera-16.png b/LCARStrek/browser/webRTC-camera-16.png new file mode 100644 index 0000000000000000000000000000000000000000..f7e240119401632ca28b58225b8f28e9daaa0c68 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9Yk)^Rkon0>s0v6imIV0) zGdMiEkp|)?NMQuI%@?xJ7yR$;OXk;vd$@?2>_B+Gfn^i literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/webRTC-indicator.css b/LCARStrek/browser/webRTC-indicator.css new file mode 100644 index 00000000..df39570c --- /dev/null +++ b/LCARStrek/browser/webRTC-indicator.css @@ -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 #9C9CFF; +} + +#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: #000000; +} + +#firefoxButton:hover { + background-color: #FFCF00; +} + +#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-16.png"); +} + +window[sharingaudio] > #audioVideoButton { + background-image: url("webRTC-microphone-16.png"); +} + +/* Multi-icon button: */ +window[sharingaudio][sharingvideo] > #audioVideoButton { + background-image: url("webRTC-camera-16.png"), + url("webRTC-microphone-16.png"); + background-position: 6px center, 26px center; + background-size: 16px, 16px; + min-width: 46px; +} + +/* Hover styles */ +#audioVideoButton, +#screenShareButton { +/* background-color: #C09070;*/ +} + +#audioVideoButton:hover, +#screenShareButton:hover { +/* background-color: #FFCF00;*/ +} + +/* 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: #A09090; + /* 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; +} diff --git a/LCARStrek/browser/webRTC-microphone-16.png b/LCARStrek/browser/webRTC-microphone-16.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e6f8766d7470420f9446c9ecb5636c16a5b723 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9YrI!IkXgCl^LZe}SQ6wH z%;50sMjD8d8C#*!ev zUYh7ML)4Eal|aXmS~f#DgmL(_leo(caQnF{}#+dcYQt}yXGuZPHdW+5{(gWNa#3E!GH gH_Z4euVT)~u(VOBebL6%K;wbVbM@Jbx07{A*@pV{p*mSs!NnY#LAl NgQu&X%Q~loCIGRlE13WQ literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/webRTC-screen-16@2x.png b/LCARStrek/browser/webRTC-screen-16@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7e3b5e76ef4f624ca947c29b681b31f9b25d3aec GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)TxYzl2Qn?VvY!Ge#*!ev zUYh7ML)4Eal|aXmTV0PBqZ{}U4u{{Qc9Z2bSfUg08x$YXZT4=4ZEA2^Wy|35Qx{NMlb qM+9;dnmAny76>W?OE^4x$i%?PtUp86%4|K*ECx?kKbLh*2~7ZQtUMzC literal 0 HcmV?d00001 diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css index 2696d120..5e9baf32 100644 --- a/LCARStrek/global/in-content/common.css +++ b/LCARStrek/global/in-content/common.css @@ -6,13 +6,13 @@ @namespace html "http://www.w3.org/1999/xhtml"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -/* + html|body, xul|page { - font: message-box; + font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; -moz-appearance: none; - background-color: #f1f1f1; - color: #424e5a; + background-color: #000000; + color: #FF9F00; } html|body { @@ -30,15 +30,11 @@ html|h1 { } xul|caption { - -moz-appearance: none; - margin: 0; } xul|caption > xul|label { - font-size: 1.3rem; - font-weight: bold; - line-height: 22px; - margin: 0 !important; + margin-top: 0; + margin-bottom: 0; } *|*.main-content { @@ -49,7 +45,7 @@ xul|caption > xul|label { xul|prefpane > xul|*.content-box { overflow: visible; } -*/ + /* groupboxes */ /* xul|groupbox { @@ -118,13 +114,16 @@ xul|*.tab-text { } */ /* html buttons */ -/* + html|button { - padding: 3px; + border-radius: 300px; + border: none; + background-color: #C09070; + color: #000000; / * override forms.css * / font: inherit; } -*/ + /* xul buttons and menulists */ /* *|button, @@ -143,19 +142,21 @@ xul|menulist { border-radius: 2px; background-color: #fbfbfb; } - +*/ html|button:enabled:hover, xul|button:not([disabled="true"]):hover, xul|colorpicker[type="button"]:not([disabled="true"]):hover, xul|menulist:not([disabled="true"]):hover { - background-color: #ebebeb; + background-color: #FFCF00; + color: #000000; } html|button:enabled:hover:active, xul|button:not([disabled="true"]):hover:active, xul|colorpicker[type="button"]:not([disabled="true"]):hover:active, xul|menulist[open="true"]:not([disabled="true"]) { - background-color: #dadada; + background-color: #FF9F00; + color: #000000; } html|button:disabled, @@ -163,9 +164,10 @@ xul|button[disabled="true"], xul|colorpicker[type="button"][disabled="true"], xul|menulist[disabled="true"] { cursor: not-allowed; - opacity: 0.5; + background-color: #402858; + color: #000000; } - +/* xul|colorpicker[type="button"] { padding: 6px; width: 50px; -- 2.35.3