From c1d2ce3eaa44d719906dbac174a64279a4094b47 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 15 Jun 2014 21:02:10 +0200 Subject: [PATCH] second part of syncing LCARStrek with Firefox 30 windows theme changes --- LCARStrek/browser/browser.css | 20 +++++-- .../browser/customizableui/panelUIOverlay.css | 29 +++++----- .../browser/devtools/app-manager/projects.css | 9 ++++ LCARStrek/browser/devtools/computedview.css | 9 ++-- LCARStrek/browser/devtools/netmonitor.css | 51 ++++++++++++------ LCARStrek/browser/devtools/widgets.css | 34 ++++++++++++ .../browser/preferences/aboutPermissions.css | 6 +++ .../browser/webRTC-shareMicrophone-16.png | Bin 0 -> 176 bytes .../browser/webRTC-shareMicrophone-64.png | Bin 0 -> 259 bytes .../browser/webRTC-sharingMicrophone-16.png | Bin 0 -> 176 bytes 10 files changed, 121 insertions(+), 37 deletions(-) create mode 100644 LCARStrek/browser/webRTC-shareMicrophone-16.png create mode 100644 LCARStrek/browser/webRTC-shareMicrophone-64.png create mode 100644 LCARStrek/browser/webRTC-sharingMicrophone-16.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index ce3c42fe..b40dde75 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -1251,7 +1251,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri } #nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel { -/* margin-top: -8px;*/ + margin-top: -4px; } #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button { @@ -2923,6 +2923,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png"); } +.popup-notification-icon[popupid="webRTC-sharingMicrophone"], +.popup-notification-icon[popupid="webRTC-shareMicrophone"] { + list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png"); +} + .popup-notification-icon[popupid="pointerLock"] { list-style-image: url("chrome://browser/skin/pointerLock-64.png"); } @@ -3052,6 +3057,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper[forwarddisabled] > #urlbar list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png"); } +.webRTC-shareMicrophone-notification-icon, +#webRTC-shareMicrophone-notification-icon { + list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-16.png"); +} + +.webRTC-sharingMicrophone-notification-icon, +#webRTC-sharingMicrophone-notification-icon { + list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png"); +} + .web-notifications-notification-icon, #web-notifications-notification-icon { list-style-image: url("chrome://browser/skin/notification-16.png"); @@ -3747,8 +3762,7 @@ html|*#gcli-output-frame { #servicesInstall-notification-icon { list-style-image: url("chrome://browser/skin/social/services-16.png"); } -#social-undoactivation-button, -#servicesInstall-learnmore-link { +#social-undoactivation-button { -moz-margin-start: 0; /* override default label margin to match description margin */ } diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 4ca9372d..4366f625 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -75,6 +75,10 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan -moz-box-flex: 1; } +.subviewbutton:not(:-moz-any([image],[targetURI],.cui-withicon)) > .toolbarbutton-text { + -moz-margin-start: 0; +} + .panel-subview-body { overflow-y: auto; overflow-x: hidden; @@ -189,7 +193,6 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan panelview:not([mainview]) .toolbarbutton-text, .cui-widget-panel toolbarbutton > .toolbarbutton-text { text-align: start; - -moz-padding-start: 8px; display: -moz-box; } @@ -677,28 +680,28 @@ panelview .toolbarbutton-1, } /* -panelview .toolbarbutton-1:not(:-moz-any([disabled],[checked="true"],[open],:active)):-moz-any(:hover,[_moz-menuactive]), -toolbarbutton.subviewbutton:not(:-moz-any([disabled],[checked="true"],[open],:active)):-moz-any(:hover,[_moz-menuactive]), -menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], -menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], -.widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[checked="true"],[open],:active)):-moz-any(:hover,[_moz-menuactive]), +panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],[checked="true"],:active)):hover, +toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],[checked="true"],:active)):hover, +menu.subviewbutton:not(:-moz-any([disabled],[checked="true"],:active))[_moz-menuactive], +menuitem.subviewbutton:not(:-moz-any([disabled],[checked="true"],:active))[_moz-menuactive], +.widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],[checked="true"],:active)):hover, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(:-moz-any([disabled],[checked="true"],[open],:active)):hover { background-color: hsla(210,4%,10%,.08); border-color: hsla(210,4%,10%,.11); } -.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]):not(:-moz-any([disabled],[checked="true"],[open],:active)):-moz-any(:hover,[_moz-menuactive]) { +.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]):not(:-moz-any([disabled],[open],[checked="true"],:active)):hover { border-color: hsla(210,4%,10%,.11); } -panelview .toolbarbutton-1:not([disabled]):-moz-any([open],[checked="true"],:hover:active,[_moz-menuactive]:active)), -toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],[checked="true"],:hover:active,[_moz-menuactive]:active)), -menu.subviewbutton:not([disabled])[_moz-menuactive]:active, -menuitem.subviewbutton:not([disabled])[_moz-menuactive]:active, -.widget-overflow-list .toolbarbutton-1:not([disabled]):-moz-any([open],[checked="true"],:hover:active,[_moz-menuactive]:active)), +panelview .toolbarbutton-1:not([disabled]):-moz-any([open],[checked="true"],:hover:active), +toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],[checked="true"],:hover:active), +menu.subviewbutton:not([disabled]):-moz-any([checked="true"],[_moz-menuactive]:active), +menuitem.subviewbutton:not([disabled]):-moz-any([checked="true"],[_moz-menuactive]:active), +.widget-overflow-list .toolbarbutton-1:not([disabled]):-moz-any([open],[checked="true"],:hover:active), .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) - > toolbarbutton:not([disabled]):-moz-any([open],[checked="true"],:hover:active,[_moz-menuactive]:active)) { + > toolbarbutton:not([disabled]):-moz-any([open],[checked="true"],:hover:active) { background-color: hsla(210,4%,10%,.12); border-color: hsla(210,4%,10%,.14); box-shadow: 0 1px 0 hsla(210,4%,10%,.03) inset; diff --git a/LCARStrek/browser/devtools/app-manager/projects.css b/LCARStrek/browser/devtools/app-manager/projects.css index 5134cda6..7eea30c0 100644 --- a/LCARStrek/browser/devtools/app-manager/projects.css +++ b/LCARStrek/browser/devtools/app-manager/projects.css @@ -342,6 +342,15 @@ strong { display: inline; } +.project-type { + display: none; + margin-left: 10px; +} +[type="hosted"] > .project-type.hosted, +[type="packaged"] > .project-type.packaged { + display: inline; +} + /********* PROJECT BUTTONS ***********/ diff --git a/LCARStrek/browser/devtools/computedview.css b/LCARStrek/browser/devtools/computedview.css index d168820e..3523ce28 100644 --- a/LCARStrek/browser/devtools/computedview.css +++ b/LCARStrek/browser/devtools/computedview.css @@ -59,7 +59,8 @@ body { } .property-name { - width: 50%; + /* -12px is so the expander triangle isn't pushed up above the property */ + width: calc(100% - 12px); overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -67,8 +68,7 @@ body { } .property-value { - width: 50%; - max-width: 100%; + width: 100%; overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -93,7 +93,8 @@ body { width: 200px; } .property-value { - width: auto; + /* -212px is accounting for the 200px property-name and the 12px triangle */ + width: calc(100% - 212px); } } diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index b03f930d..6b514636 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -125,12 +125,30 @@ window { font-weight: 600; } +.requests-menu-icon-and-file { + width: 20vw; + min-width: 4em; +} + +.requests-menu-icon { + background: #FFCF00; + width: calc(1em + 4px); + height: calc(1em + 4px); + margin: -4px 0px; + -moz-margin-end: 4px; +} + +.requests-menu-icon { + outline: 1px solid #A09090; +} + .requests-menu-file { - width: 16em; + text-align: start; } .requests-menu-domain { - width: 16em; + width: 14vw; + min-width: 10em; } .requests-menu-type { @@ -246,8 +264,6 @@ box.requests-menu-status[code^="5"] { -moz-padding-end: 4px; background-repeat: repeat-y; /* Background created on a in js. */ background-position: -1px center; - margin-top: -1px; /* Compensate borders. */ - margin-bottom: -1px; } .requests-menu-subitem.requests-menu-waterfall:-moz-locale-dir(rtl) { @@ -320,10 +336,6 @@ box.requests-menu-status[code^="5"] { /* Network request details */ -#details-pane { - max-width: 500px; -} - #details-pane-toggle { list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png"); -moz-image-region: rect(0px,16px,16px,0px); @@ -398,6 +410,17 @@ box.requests-menu-status[code^="5"] { margin-bottom: 10px; } +/* Preview tabpanel */ + +#preview-tabpanel { + background: #fff; +} + +#response-preview { + display: -moz-box; + -moz-box-flex: 1; +} + /* Timings tabpanel */ #timings-tabpanel .tabpanel-summary-label { @@ -445,7 +468,7 @@ box.requests-menu-status[code^="5"] { margin: 0; -moz-margin-end: 3px; border: none; - padding: 0px 0.75vw; + padding: 0px 1vw; /* color: #fff;*/ } @@ -597,13 +620,7 @@ box.requests-menu-status[code^="5"] { min-height: 24px; } - .requests-menu-footer-button, - .requests-menu-footer-label { - padding: 0px 1vw; - } - #details-pane { - max-width: none; margin: 0 !important; /* To prevent all the margin hacks to hide the sidebar. */ } @@ -612,7 +629,7 @@ box.requests-menu-status[code^="5"] { width: 16vw; } - .requests-menu-file, + .requests-menu-icon-and-file, .requests-menu-domain { width: 30vw; } @@ -638,7 +655,7 @@ box.requests-menu-status[code^="5"] { right border and box-shadow of "Domain" column should be hidden. */ } - #network-table[domain-overflows] .requests-menu-file { + #network-table[domain-overflows] .requests-menu-icon-and-file { border-width: 0 !important; box-shadow: none !important; /* The "Domain" header is not visible anymore, and thus the diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 350fe883..7fff58c4 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -18,6 +18,33 @@ transition: margin 0.25s ease-in-out; } +/* Responsive container */ + +.devtools-responsive-container { + -moz-box-orient: horizontal; +} + +@media (max-width: 700px) { + .devtools-responsive-container { + -moz-box-orient: vertical; + } + + .devtools-responsive-container > .devtools-side-splitter { + border: 0; + margin: 0; + min-height: 3px; + height: 3px; + margin-bottom: -3px; + /* In some edge case the cursor is not changed to n-resize */ + cursor: n-resize; + } + + .devtools-responsive-container > .devtools-sidebar-tabs { + min-height: 35vh; + max-height: 75vh; + } +} + /* BreacrumbsWidget */ .breadcrumbs-widget-container { @@ -457,6 +484,12 @@ padding: 2px; } +.variables-view-scope:focus > .title, +.theme-dark .variable-or-property:focus > .title { + background-color: #008484; /* Selection colors */ + color: #FFCF00; +} + .variables-view-scope > .title { background-color: #A09090; color: #000000; @@ -905,6 +938,7 @@ .manifest-editor .variables-view-delete:hover, .manifest-editor .variables-view-delete:active, .manifest-editor .variable-or-property:focus .variables-view-delete, +.manifest-editor .variables-view-add-property, .manifest-editor .variables-view-add-property:hover, .manifest-editor .variables-view-add-property:active, .manifest-editor .variable-or-property:focus .variables-view-add-property { diff --git a/LCARStrek/browser/preferences/aboutPermissions.css b/LCARStrek/browser/preferences/aboutPermissions.css index 01a8aef5..879613f0 100644 --- a/LCARStrek/browser/preferences/aboutPermissions.css +++ b/LCARStrek/browser/preferences/aboutPermissions.css @@ -95,6 +95,12 @@ .pref-icon[type="fullscreen"] { list-style-image: url("chrome://global/skin/icons/alert-question.gif"); } +.pref-icon[type="camera"] { + list-style-image: url("chrome://global/skin/icons/alert-question.gif"); +} +.pref-icon[type="microphone"] { + list-style-image: url("chrome://global/skin/icons/alert-question.gif"); +} .pref-title { font-size: 125%; diff --git a/LCARStrek/browser/webRTC-shareMicrophone-16.png b/LCARStrek/browser/webRTC-shareMicrophone-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%;50sMjD8d)^mS#w$Hp&YW-PUK zYY9+D+0(@_gyVX00ubaRB-k}H?a+4+e9poq#yWu`fcH1^f+&Vpww$N9Orzs~${9Re L{an^LB{Ts5WuYkz literal 0 HcmV?d00001 -- 2.35.3