From cac2a998599d19515fc59e7a93b9f8db9ca3a903 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 23 Nov 2014 21:01:54 +0100 Subject: [PATCH] third part of syncing LCARStrek with Firefox 34 windows theme changes --- LCARStrek/browser/browser.css | 100 ++++++++++++++++-- .../browser/customizableui/panelUIOverlay.css | 4 - LCARStrek/browser/devtools/command-frames.png | Bin 0 -> 195 bytes .../browser/devtools/command-frames@2x.png | Bin 0 -> 205 bytes LCARStrek/browser/devtools/common.css | 10 +- LCARStrek/browser/devtools/dark-theme.css | 31 ++++-- LCARStrek/browser/devtools/inspector.css | 12 ++- LCARStrek/browser/devtools/storage.css | 48 +++++++++ LCARStrek/browser/devtools/tool-storage.svg | 7 ++ LCARStrek/browser/devtools/webconsole.css | 17 ++- LCARStrek/browser/devtools/widgets.css | 1 + LCARStrek/browser/mask.png | Bin 0 -> 264 bytes LCARStrek/browser/mask@2x.png | Bin 0 -> 364 bytes .../preferences/in-content/preferences.css | 15 +-- LCARStrek/global/in-content/common.css | 23 ++-- 15 files changed, 222 insertions(+), 46 deletions(-) create mode 100755 LCARStrek/browser/devtools/command-frames.png create mode 100755 LCARStrek/browser/devtools/command-frames@2x.png create mode 100644 LCARStrek/browser/devtools/storage.css create mode 100644 LCARStrek/browser/devtools/tool-storage.svg create mode 100644 LCARStrek/browser/mask.png create mode 100644 LCARStrek/browser/mask@2x.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index a9c2f353..a681345e 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -899,6 +899,7 @@ menuitem.bookmark-item { -moz-image-region: rect(0, 90px, 18px, 72px); } +#loop-call-button[state="disabled"] > .toolbarbutton-badge-container, #loop-call-button[disabled="true"] > .toolbarbutton-badge-container { -moz-image-region: rect(0, 36px, 18px, 18px); } @@ -1255,6 +1256,7 @@ toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-c -moz-image-region: rect(0, 160px, 32px, 128px); } +#loop-call-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, #loop-call-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { -moz-image-region: rect(0, 64px, 32px, 32px); } @@ -3083,7 +3085,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://global/skin/icons/webapps-64.png"); } -.popup-notification-icon[popupid="mixed-content-blocked"], .popup-notification-icon[popupid="bad-content"] { list-style-image: url("chrome://browser/skin/bad-content-blocked-64.png"); } @@ -3224,8 +3225,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled } } -.mixed-content-blocked-notification-icon, -#mixed-content-blocked-notification-icon, .bad-content-blocked-notification-icon, #bad-content-blocked-notification-icon { list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png"); @@ -4840,12 +4839,13 @@ notification.pluginVulnerable .messageImage { } #customization-header { - font-size: 1.5em; - line-height: 1.5em; + font-size: 1.75em; + line-height: 1.75em; color: #9C9CFF; - font-weight: lighter; - margin-bottom: 1em; - padding: 15px 15px 0; + font-weight: 200; + margin: 25px 25px 12px; + padding-bottom: 12px; + border-bottom: 1px solid #A09090; } #customization-panel-container { @@ -5032,6 +5032,90 @@ toolbarpaletteitem[place="toolbar"] { margin-right: 0; } +#customization-lwtheme-menu > .panel-arrowcontainer > .panel-arrowcontent { + -moz-box-orient: vertical; + /* Make the panel padding uniform across all platforms due to the + styling of the section headers and footer. */ + padding: 10px; +} + +.customization-lwtheme-menu-theme > .toolbarbutton-icon { + width: 32px; + height: 32px; +} + +.customization-lwtheme-menu-theme { + -moz-appearance: none; + margin: 0 -5px 5px; + padding-top: 0; + -moz-padding-end: 5px; + padding-bottom: 0; + -moz-padding-start: 0; +} + +.customization-lwtheme-menu-theme[active="true"] { + background-color: #008484; +} + +.customization-lwtheme-menu-theme > .toolbarbutton-icon { + margin: 5px; +} + +.customization-lwtheme-menu-theme > .toolbarbutton-text { + text-align: start; +} + +#customization-lwtheme-menu-header, +#customization-lwtheme-menu-recommended { + padding: 10px; + margin-bottom: 5px; +} + +#customization-lwtheme-menu-header, +#customization-lwtheme-menu-recommended, +#customization-lwtheme-menu-footer { + background-color: #A09090; + color: #000000; + margin-right: -10px; + margin-left: -10px; +} + +#customization-lwtheme-menu-header { + margin-top: -10px; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +#customization-lwtheme-menu-recommended { +} + +#customization-lwtheme-menu-footer { + margin-bottom: -10px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} + +.customization-lwtheme-menu-footeritem { + -moz-appearance: none; + -moz-box-flex: 1; + background-color: #C09070; + color: #000000; + border: 1px solid transparent; + padding: 10px; + margin-left: 0; + margin-right: 0; +} + +.customization-lwtheme-menu-footeritem:hover { + background-color: #FFCF00; +} + +#customization-lwtheme-menu-footer:not(:hover) > .customization-lwtheme-menu-footeritem:first-child { +} + +#customization-lwtheme-menu-footer:hover > .customization-lwtheme-menu-footeritem:first-child { +} + /* === END customizeMode.inc.css === */ /* === BEGIN customizeTip.inc.css === */ diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 01cedd1c..ebf9e32d 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -1247,10 +1247,6 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { /* padding-top: 4px;*/ } -#BMB_bookmarksPopup .menu-text { -/* color: #000;*/ -} - /* bookmark panel separator */ #BMB_bookmarksPopup menuseparator { padding-top: 0; diff --git a/LCARStrek/browser/devtools/command-frames.png b/LCARStrek/browser/devtools/command-frames.png new file mode 100755 index 0000000000000000000000000000000000000000..03facefcdf3bd1c84064fc4d4f724b992f16b625 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et#0(_4@}`~wQk(%kA+9?aDuB%Y=NY_i{!;_8 z7)yfuf*Bm1-ADs*lDyqr7&=&GJwVC}JR*x37`TN&n2}-D90{Nxdx@v7EBifeabXP= z#RKbP0l+XkKN~kYg literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/devtools/command-frames@2x.png b/LCARStrek/browser/devtools/command-frames@2x.png new file mode 100755 index 0000000000000000000000000000000000000000..e09015a733b15bba85c6b73a69a6b89799200403 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q&Ne7LR_yiQ~;U(&okVsSRw#q zF_r}R1v5B2yO9RsBze2LFm$lWdVrJ{ctjR6FmMZlFeAgPITAoY_7YEDSN40{;=)>d zCwxoK0flTmT^vI+&L<}*aO? .toolbarbutton-menu-dropmarker { + padding: 0 2px; +} + .devtools-toolbarbutton:not([label]) > .toolbarbutton-text { display: none; } @@ -634,16 +643,7 @@ div.CodeMirror span.eval-text { -moz-border-end-width: 0; } -.devtools-sidebar-tabs > tabs > tab { -} - -.devtools-sidebar-tabs > tabs > tab:not(:last-of-type) { -} - -.devtools-sidebar-tabs:-moz-locale-dir(rtl) > tabs > tab { -} - -.devtools-sidebar-tabs > tabs > tab { +.devtools-sidebar-tabs > tabs > tab:first-child { } .devtools-sidebar-tabs > tabs > tab:hover { @@ -745,7 +745,8 @@ div.CodeMirror span.eval-text { .command-button:hover > image, .command-button:hover:active > image, -.command-button[checked=true] > image { +.command-button[checked=true] > image, +.command-button[open=true] > image { background-position: -16px center; } @@ -773,6 +774,10 @@ div.CodeMirror span.eval-text { background-image: url("chrome://browser/skin/devtools/command-pick.png"); } +#command-button-frames > image { + background-image: url("chrome://browser/skin/devtools/command-frames.png"); +} + #command-button-splitconsole > image { background-image: url("chrome://browser/skin/devtools/command-console.png"); } @@ -806,6 +811,10 @@ div.CodeMirror span.eval-text { background-image: url("chrome://browser/skin/devtools/command-pick@2x.png"); } + #command-button-frames > image { + background-image: url("chrome://browser/skin/devtools/command-frames@2x.png"); + } + #command-button-splitconsole > image { background-image: url("chrome://browser/skin/devtools/command-console@2x.png"); } diff --git a/LCARStrek/browser/devtools/inspector.css b/LCARStrek/browser/devtools/inspector.css index cb1b5409..c86492b5 100644 --- a/LCARStrek/browser/devtools/inspector.css +++ b/LCARStrek/browser/devtools/inspector.css @@ -292,7 +292,8 @@ window { #devtools-tooltip-events-container { margin: -4px; /* Compensate for the .panel-arrowcontent padding. */ - max-width: 390px; + max-width: 590px; + overflow-y: auto; } .event-header { @@ -353,12 +354,19 @@ window { margin-bottom: 0; } -.event-tooltip-attributes-container { +.event-tooltip-attributes-box { background-color: #000000; color: #9C9CFF; } .event-tooltip-attributes-container { + display: flex; + flex-shrink: 0; + flex-grow: 1; + justify-content: flex-end; +} + +.event-tooltip-attributes-box { display: flex; flex-shrink: 0; align-items: center; diff --git a/LCARStrek/browser/devtools/storage.css b/LCARStrek/browser/devtools/storage.css new file mode 100644 index 00000000..a800b3f7 --- /dev/null +++ b/LCARStrek/browser/devtools/storage.css @@ -0,0 +1,48 @@ +/* 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/. */ + +/* Storage Host Tree */ + +#storage-tree { + min-width: 220px; + max-width: 500px; + overflow: auto; +} + +.theme-dark #storage-tree { + background: #000000; /* Toolbars */ +} + +#storage-tree .tree-widget-item[type="store"]:after { + background-image: url("chrome://browser/skin/devtools/filetype-store.svg"); + background-size: 18px 18px; + background-position: -1px 0; +} + +/* Columns with date should have a min width so that date is visible */ +#expires, #lastAccessed, #creationTime { + min-width: 150px; +} + +/* Variables View Sidebar */ + +#storage-sidebar { + max-width: 500px; + min-width: 250px; +} + +/* Responsive sidebar */ +@media (max-width: 700px) { + #storage-tree { + max-width: 100%; + } + + #storage-table #path { + display: none; + } + + #storage-table .table-widget-cell { + min-width: 100px; + } +} diff --git a/LCARStrek/browser/devtools/tool-storage.svg b/LCARStrek/browser/devtools/tool-storage.svg new file mode 100644 index 00000000..66d94cb8 --- /dev/null +++ b/LCARStrek/browser/devtools/tool-storage.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index c2daa2ff..58f15d15 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -78,6 +78,10 @@ a { margin: 3px; } +.message-body-wrapper .table-widget-body { + overflow: visible; +} + /* The red bubble that shows the number of times a message is repeated */ .message-repeats { -moz-user-select: none; @@ -237,6 +241,13 @@ a { color: #FF0000; } +.theme-selected .console-string, +.theme-selected .cm-number, +.theme-selected .cm-variable, +.theme-selected .kind-ArrayLike { + color: #000000 !important; /* Selection Text Color */ +} + .message[category=network] > .indent { -moz-border-end: solid #FF0000 6px; } @@ -442,7 +453,11 @@ a { border: 1px solid #A09090; border-radius: 3px; } - + +.consoletable { + margin: 5px 0 0 0; +} + .message[severity=error] .stacktrace { background-color: #000000; } diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 2a0f70cf..7e3c1807 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -1232,6 +1232,7 @@ padding: 10px 20px; font-size: medium; background: transparent; + pointer-events: none; } /* Tree Item */ diff --git a/LCARStrek/browser/mask.png b/LCARStrek/browser/mask.png new file mode 100644 index 0000000000000000000000000000000000000000..00b1c3d5b465370e07d77202ffdf85ace7668032 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^x**KR3?vz@6x;-oYymzYu9jBybLRYyQkdca6k#k0 z@(X5gcy=QV#7XjYcVXyYl?BOg7I;J!Gca%qgD@k*tT_@uLG}_)Usv{f+~UG2vX=@Z z=K+PPJzX3_BrY#KzmfN_0|)Dc{GA26q#s`MIGz;t&MjGF6JxAjSMsOM64xx{Ba<~Q zu|!zlvuuB@J4>VM4@nX{9d3l7(8A5T-G@yGywqm C23phr literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/mask@2x.png b/LCARStrek/browser/mask@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..86d48e0ca7265f105f71f94c0edc854a5f522e32 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S973?!M-E;|A#wg8_H*Si<$=gj%Pb)wKBpa^40 zkY6x^!?PP{AWo9Ey9+}HtE>l*!&%@FS2H46!)6n!?xJ4YcFGv6xWf{e-m^fyH1-}a+b*d z*uh?<_UpETV!KY{BGFLxy&Ay|*AHeYGHhYInVQw7=(^yC&g(r{n-6{zy~nJSwnX0P z>zplD74&(mB~_$$3FX#Q?omdKI;Vst E0DIzy^8f$< literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index e4c7e337..397f8a54 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -192,12 +192,6 @@ prefpane { height: 500px; } -#handlersView > listheader { - border: none; - background: transparent; - padding: 0; -} - #handlersView > listheader > treecol { } @@ -207,6 +201,12 @@ prefpane { border-bottom: 1px solid #9C9CFF; } +#handlersView > listheader { + background: transparent; + border: 0; + padding: 0; +} + #typeColumn, #actionColumn { line-height: 20px; @@ -307,7 +307,8 @@ description > html|a { #weavePrefsDeck > vbox > description, #weavePrefsDeck > vbox > #pairDevice > label, #weavePrefsDeck > #needsUpdate > hbox > #loginError, -#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP) > label { +#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label, +#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-small) > label { /* no margin-start for elements at the begin of a line */ -moz-margin-start: 0; } diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css index fad3be94..3cd62d97 100644 --- a/LCARStrek/global/in-content/common.css +++ b/LCARStrek/global/in-content/common.css @@ -379,30 +379,30 @@ xul|textbox[disabled="true"] { } */ /* Links */ -/* + html|a, xul|*.text-link, xul|*.inline-link { - font-size: 1.25rem; - line-height: 22px; - color: #0095dd; +/* font-size: 1.25rem; + line-height: 22px;*/ + color: #3333FF; text-decoration: none; } html|a:hover, xul|*.text-link:hover, xul|*.inline-link:hover { - color: #4cb1ff; - text-decoration: none; + color: #FFCF00; + text-decoration: underline; } html|a:hover:active, xul|*.text-link:hover:active, xul|*.inline-link:hover:active { - color: #ff9500; - text-decoration: none; + color: #FF9F00; + text-decoration: underline; } -*/ + /* Checkboxes and radio buttons */ /* xul|checkbox { @@ -620,10 +620,9 @@ xul|*.radio-icon, xul|*.checkbox-icon { -moz-margin-end: 0; } - +*/ html|a:-moz-focusring, xul|*.text-link:-moz-focusring, xul|*.inline-link:-moz-focusring { - border: 1px dotted -moz-DialogText; + border: 1px dotted #3333FF; } -*/ \ No newline at end of file -- 2.35.3