From: Robert Kaiser Date: Sun, 3 May 2015 19:04:04 +0000 (+0200) Subject: second part of syncing LCARStrek with Firefox 38 windows theme changes X-Git-Tag: LCARStrek-2.35~5 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=d533ec21de421974d60dc2614105c2e439f34b49 second part of syncing LCARStrek with Firefox 38 windows theme changes --- diff --git a/LCARStrek/browser/aboutSessionRestore.css b/LCARStrek/browser/aboutSessionRestore.css index b7d1dab7..c6db9975 100644 --- a/LCARStrek/browser/aboutSessionRestore.css +++ b/LCARStrek/browser/aboutSessionRestore.css @@ -2,39 +2,8 @@ * 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/. */ -html { - height: 100%; -} - -body { - height: 100%; - text-align: center; -} - -#errorPageContainer { - background-image: url("chrome://global/skin/icons/alert-exclam.gif"); - display: -moz-box; - width: -moz-available; - height: 70%; - -moz-box-orient: vertical; - text-align: start; -} - -#errorShortDesc > p { - margin-top: 0.4em; - margin-bottom: 0; -} - -#errorLongContent, #errorTrailerDesc { - display: -moz-box; - -moz-box-flex: 1; - -moz-box-orient: vertical; -} - -#tabList { - margin-top: 2.5em; - width: 100%; - min-height: 12em; +.title { + background-image: url("chrome://browser/skin/session-restore.svg"); } treechildren::-moz-tree-image(icon), @@ -54,6 +23,9 @@ treechildren::-moz-tree-image(container, noicon) { treechildren::-moz-tree-image(checked) { list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); } +treechildren::-moz-tree-image(checked, selected) { + list-style-image: url("chrome://global/skin/checkbox/cbox-check-inverted.gif"); +} treechildren::-moz-tree-image(partial) { list-style-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif"); } @@ -66,10 +38,3 @@ treechildren::-moz-tree-row(alternate, selected) { background-color: #008484; color: #000000; } - -#buttons { - width: 100%; -} -#buttons > button { - margin-top: 2em; -} diff --git a/LCARStrek/browser/aboutTabCrashed.css b/LCARStrek/browser/aboutTabCrashed.css index 87f69804..2ef767eb 100644 --- a/LCARStrek/browser/aboutTabCrashed.css +++ b/LCARStrek/browser/aboutTabCrashed.css @@ -1,77 +1,11 @@ -body { - background-color: #000000; - margin-top: 2em; - font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; -} - -p { - font-size: .8em; -} - -#error-box { - border: 2px solid #FFCF00; - border-radius: 10px; - background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px; - -moz-padding-start: 30px; -} +/* 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/. */ -#error-box:-moz-locale-dir(rtl) { - background-position: right 4px; +.title { + background-image: url("chrome://browser/skin/tab-crashed.svg"); } -#main-error-msg { - color: #A09090; +#reportSent { font-weight: bold; } - -#report-box { - text-align: center; - width: 75%; - margin: 0 auto; - display: none; -} - -.crashDumpAvailable #report-box { - display: block; -} - -#button-box { - text-align: center; - width: 75%; - margin: 0 auto; -} - -@media all and (min-width: 300px) { - #error-box { - max-width: 50%; - margin: 0 auto; - background-image: url('chrome://global/skin/icons/information-32.png'); - min-height: 36px; - -moz-padding-start: 38px; - } - - button { - width: auto !important; - min-width: 150px; - } -} - -@media all and (min-width: 780px) { - #error-box { - max-width: 30%; - } -} - -button { - border-radius: 10px; - background: #C09070; - color: #000000; - border: none; - padding: 0 .5em; -} - -button:hover, -button:hover:active { - background-color: #FFCF00; - color: #000000; -} diff --git a/LCARStrek/browser/aboutWelcomeBack.css b/LCARStrek/browser/aboutWelcomeBack.css index 3e11e824..34368b30 100644 --- a/LCARStrek/browser/aboutWelcomeBack.css +++ b/LCARStrek/browser/aboutWelcomeBack.css @@ -2,9 +2,12 @@ * 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/. */ -#errorPageContainer { - background-image: url("chrome://global/skin/icons/information-64.png"); - height: auto; +.title { + background-image: url("chrome://browser/skin/welcome-back.svg"); +} + +.radioRestoreContainer:not(:last-child) { + margin-bottom: 0.2em; } /* tablist starts out hidden, but JS may make it visible in response to @@ -18,25 +21,35 @@ display: -moz-box; } -.radioRestoreContainer { - display: flex; +treechildren::-moz-tree-image(icon), +treechildren::-moz-tree-image(noicon) { + padding-right: 2px; + margin: 0 2px; + width: 16px; + height: 16px; } -.radioRestoreButton { - flex: 0 0 auto; +treechildren::-moz-tree-image(noicon) { + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } - -.radioRestoreButton:-moz-focusring { - outline: 1px dotted #008484; +treechildren::-moz-tree-image(container, noicon) { + list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png"); +} +treechildren::-moz-tree-image(checked) { + list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); +} +treechildren::-moz-tree-image(checked, selected) { + list-style-image: url("chrome://global/skin/checkbox/cbox-check-inverted.gif"); +} +treechildren::-moz-tree-image(partial) { + list-style-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif"); } -.radioChooseLabel { - flex: 1 1 auto; +treechildren::-moz-tree-row(alternate) { + background-color: #404000; } -/* We want errorTrailerDesc to have the same padding-top as errorShortDesc - has padding-bottom -*/ -#errorTrailerDesc { - padding-top: 1em; +treechildren::-moz-tree-row(alternate, selected) { + background-color: #008484; + color: #000000; } diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 737c4bbd..2d5f38cd 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2658,6 +2658,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { :root { /* --tab-toolbar-navbar-overlap: 1px; */ /* --tab-min-height: 31px; */ + /* --tab-curve-width: 30px; */ + /* --tab-curve-half-width: 15px; */ } .tabbrowser-tab, @@ -2701,7 +2703,10 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { .tab-content { } -.tab-/*throbber*/, +.tab-content[pinned] { +} + +.tab-throbber, .tab-icon-image, .tab-close-button { } @@ -2710,12 +2715,26 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { .tab-icon-image { height: 16px; width: 16px; + -moz-margin-end: 3px; } .tab-icon-image { list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } +.tab-icon-overlay { + width: 16px; + height: 16px; + /* margin-top: 10px; */ + -moz-margin-start: -16px; + display: none; +} + +.tab-icon-overlay[crashed] { + display: -moz-box; + list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); +} + .tab-throbber[busy] { list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png"); } @@ -2724,11 +2743,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png"); } -.tab-throbber:not([pinned]), -.tab-icon-image:not([pinned]) { - -moz-margin-end: 3px; -} - .tab-throbber[pinned], .tab-icon-image[pinned] { -moz-margin-start: 2px; @@ -2835,7 +2849,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { .tabs-newtab-button { width: 28px; - /* width: calc(36px + @tabCurveWidth@); */ + /* width: calc(36px + var(--tab-curve-width)); */ } /* === END tabs.inc.css === */ @@ -3209,7 +3223,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], -.popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], .popup-notification-icon[popupid="offline-app-usage"] { list-style-image: url("chrome://global/skin/icons/alert-question.gif"); diff --git a/LCARStrek/browser/devtools/animationinspector.css b/LCARStrek/browser/devtools/animationinspector.css index 592239c2..feb2637a 100644 --- a/LCARStrek/browser/devtools/animationinspector.css +++ b/LCARStrek/browser/devtools/animationinspector.css @@ -99,6 +99,13 @@ body { } } +/* Disabled playerWidget when the animation has ended */ + +.finished { + pointer-events: none; + opacity: .5; +} + /* Animation title gutter, contains the name, duration, iteration */ .animation-title { diff --git a/LCARStrek/browser/devtools/canvasdebugger.css b/LCARStrek/browser/devtools/canvasdebugger.css index ab9e9b06..b852703a 100644 --- a/LCARStrek/browser/devtools/canvasdebugger.css +++ b/LCARStrek/browser/devtools/canvasdebugger.css @@ -107,14 +107,8 @@ pointer-events: none; } -.snapshot-item-footer[saving]::before { - display: inline-block; - content: ""; - background: url("chrome://global/skin/icons/loading.gif") center no-repeat; - width: 16px; - height: 16px; +.snapshot-item-footer.devtools-throbber::before { margin-top: -2px; - -moz-margin-end: 4px; } #snapshots-list .selected label { diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index acb0cb52..b22769f3 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -1043,5 +1043,28 @@ div.CodeMirror span.eval-text { /* -moz-border-end: 1px solid var(--theme-splitter-color); border-color: var(--theme-splitter-color); / Needed for responsive container at low width. */ } +/* Throbbers */ + +.devtools-throbber::before { + content: ""; + display: inline-block; + vertical-align: bottom; + -moz-margin-end: 0.5em; + width: 1em; + height: 1em; + border: 2px solid currentColor; + border-right-color: transparent; + border-radius: 50%; + animation: 1.1s linear throbber-spin infinite; +} + +@keyframes throbber-spin { + from { + transform: none; + } + to { + transform: rotate(360deg); + } +} /* === END toolbars.inc.css === */ diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index f73ddf94..c6c1860f 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -179,6 +179,11 @@ window { list-style-image: url("chrome://browser/skin/identity-icons-https.png"); } +.security-state-weak { + cursor: pointer; + list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png"); +} + .security-state-broken { cursor: pointer; list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-active.png"); @@ -520,6 +525,21 @@ box.requests-menu-status[code^="5"] { white-space: pre-wrap; } +.security-warning-icon { + background-image: url("alerticon-warning.png"); + background-size: 13px 12px; + -moz-margin-start: 5px; + vertical-align: top; + width: 13px; + height: 12px; +} + +@media (min-resolution: 2dppx) { + .security-warning-icon { + background-image: url("alerticon-warning@2x.png"); + } +} + /* Custom request form */ #custom-pane { diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css index 413d8943..3e28dafb 100644 --- a/LCARStrek/browser/devtools/performance.css +++ b/LCARStrek/browser/devtools/performance.css @@ -107,15 +107,11 @@ list-style-image: url(performance-icons.svg#details-waterfall-active); } -#select-calltree-view, #select-js-calltree-view, #select-memory-calltree-view { list-style-image: url(performance-icons.svg#details-call-tree); } -#select-calltree-view:hover, -#select-calltree-view:hover:active, -#select-calltree-view[checked], #select-js-calltree-view:hover, #select-js-calltree-view:hover:active, #select-js-calltree-view[checked], @@ -125,15 +121,11 @@ list-style-image: url(performance-icons.svg#details-call-tree-active); } -#select-flamegraph-view, #select-js-flamegraph-view, #select-memory-flamegraph-view { list-style-image: url(performance-icons.svg#details-flamegraph); } -#select-flamegraph-view:hover, -#select-flamegraph-view:hover:active, -#select-flamegraph-view[checked], #select-js-flamegraph-view:hover, #select-js-flamegraph-view:hover:active, #select-js-flamegraph-view[checked], diff --git a/LCARStrek/browser/devtools/profiler.css b/LCARStrek/browser/devtools/profiler.css index bb0e0a11..1144440e 100644 --- a/LCARStrek/browser/devtools/profiler.css +++ b/LCARStrek/browser/devtools/profiler.css @@ -193,6 +193,8 @@ window { overflow: auto; } +.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="allocations"], +.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="self-allocations"], .call-tree-cells-container[categories-hidden] .call-tree-category { display: none; } @@ -280,7 +282,8 @@ window { .call-tree-item:not([origin="content"]) .call-tree-name, .call-tree-item:not([origin="content"]) .call-tree-url, -.call-tree-item:not([origin="content"]) .call-tree-line { +.call-tree-item:not([origin="content"]) .call-tree-line, +.call-tree-item:not([origin="content"]) .call-tree-column { /* Style chrome and non-JS nodes differently. */ opacity: 0.6; } @@ -302,6 +305,11 @@ window { color: var(--theme-content-color2); } +.call-tree-column { + color: var(--theme-highlight-orange); + opacity: 0.6; +} + .call-tree-host { -moz-margin-start: 8px !important; font-size: 90%; @@ -311,8 +319,10 @@ window { color: var(--theme-highlight-pink); } +.call-tree-name[value=""], .call-tree-url[value=""], .call-tree-line[value=""], +.call-tree-column[value=""], .call-tree-host[value=""] { display: none; } diff --git a/LCARStrek/browser/devtools/shadereditor.css b/LCARStrek/browser/devtools/shadereditor.css index 9e034b06..9cdc3e4b 100644 --- a/LCARStrek/browser/devtools/shadereditor.css +++ b/LCARStrek/browser/devtools/shadereditor.css @@ -24,15 +24,6 @@ window { font-size: 110%; } -#waiting-notice::before { - display: inline-block; - content: ""; - background: url("chrome://global/skin/icons/loading_16.png") center no-repeat; - width: 16px; - height: 16px; - -moz-margin-end: 6px; -} - /* Shaders pane */ #shaders-pane { diff --git a/LCARStrek/browser/devtools/splitview.css b/LCARStrek/browser/devtools/splitview.css index 38963094..b3a7fbdf 100644 --- a/LCARStrek/browser/devtools/splitview.css +++ b/LCARStrek/browser/devtools/splitview.css @@ -8,10 +8,13 @@ color: var(--theme-body-color); } -.loading .splitview-nav-container { - background-image: url("chrome://global/skin/icons/loading.gif"); - background-repeat: no-repeat; - background-position: center center; +.splitview-nav-container .devtools-throbber { + display: none; + text-align: center; +} + +.loading .splitview-nav-container .devtools-throbber { + display: block; } .splitview-nav { diff --git a/LCARStrek/browser/devtools/webaudioeditor.css b/LCARStrek/browser/devtools/webaudioeditor.css index 9acb10d9..70fa57c7 100644 --- a/LCARStrek/browser/devtools/webaudioeditor.css +++ b/LCARStrek/browser/devtools/webaudioeditor.css @@ -20,15 +20,6 @@ font-size: 110%; } -#waiting-notice::before { - display: inline-block; - content: ""; - background: url("chrome://global/skin/icons/loading.gif") center no-repeat; - width: 16px; - height: 16px; - -moz-margin-end: 6px; -} - /* Context Graph */ svg { overflow: hidden; diff --git a/LCARStrek/browser/pageInfo.css b/LCARStrek/browser/pageInfo.css index afa04c16..db5de41d 100644 --- a/LCARStrek/browser/pageInfo.css +++ b/LCARStrek/browser/pageInfo.css @@ -121,7 +121,7 @@ textbox[disabled] { } /* General Tab */ -groupbox.collapsable caption .caption-icon { +groupbox.collapsable caption .caption-icon { width: 9px; height: 9px; background-repeat: no-repeat; @@ -137,7 +137,7 @@ groupbox.collapsable[closed="true"] { -moz-appearance: none; } -groupbox.collapsable[closed="true"] > caption > .caption-icon { +groupbox.collapsable[closed="true"] > caption > .caption-icon { background-image: url("chrome://global/skin/tree/twisty-closed-selected.gif"); } @@ -145,11 +145,11 @@ groupbox.collapsable > caption:hover { background-color: #FFCF00; } -groupbox.treebox { +groupbox.treebox { padding: 0; } -groupbox.treebox > tree { +groupbox.treebox > tree { margin: 2px; margin-top: 0; border: none; @@ -157,7 +157,7 @@ groupbox.treebox > tree { border-top-left-radius: 0; } -groupbox.treebox > tree > treecols > treecol { +groupbox.treebox > tree > treecols > treecol { border: none; border-bottom: 1px solid #FF9F00; background-color: #A09090; @@ -168,7 +168,7 @@ groupbox.treebox > tree > treechildren::-moz-tree-cell { padding: 0 3px; } -#securityBox description { +#securityBox description { -moz-margin-start: 10px; } @@ -233,7 +233,7 @@ treechildren::-moz-tree-cell-text(broken) { -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; } */ -.feedTitle { +.feedTitle { font-weight: bold; } @@ -276,10 +276,14 @@ treechildren::-moz-tree-cell-text(broken) { } #securityPanel .fieldLabel { - margin: 2px 10px 3px 10px; + margin: 2px 10px 3px; } #securityPanel .fieldValue { font-weight: bold; - margin: 2px 10px 0px 10px; + margin: 2px 10px 0px; +} + +#securityPanel row { + -moz-box-align: center; } diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 948d9a7b..8a37aff2 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -45,6 +45,8 @@ treecol { /* Category List */ #categories { + max-height: 100vh; + background-color: #A09090; padding-top: 4em; margin: 0; @@ -52,6 +54,10 @@ treecol { border: none; } +#categories > scrollbox { + overflow-x: hidden !important; +} + .category { background-color: #000000; color: #FFCF00; @@ -85,6 +91,16 @@ treecol { margin: 0; } +/** + * We want the last category to always have non-0 getBoundingClientRect().bottom + * so we can use the value to figure out the max-height of the list in + * preferences.js, so use collapse instead of display: none; if it's hidden + */ +#categories > .category[hidden="true"] { + display: -moz-box; + visibility: collapse; +} + .category-icon { width: 24px; height: 24px; @@ -183,6 +199,43 @@ treecol { /* General Pane */ +#startupTable { + border-collapse: collapse; +} + +#startupTable > tr > td { + padding: 0; /* remove the padding from html.css */ +} + +#startupTable > tr:not(:first-child) > td { + padding-top: 0.5em; /* add a spacing between the rows */ +} + +#startupTable > tr > .label-cell { + text-align: end; + width: 0; /* make the column as small as possible */ +} + +#startupTable > tr > .label-cell > label { + white-space: nowrap; +} + +#startupTable > tr > .content-cell > menulist, +#startupTable > tr > .content-cell > textbox { + width: calc(100% - 8px); + margin-left: 4px; + margin-right: 4px; +} + +#startupTable > tr > .homepage-buttons { + display: flex; + flex-wrap: wrap; +} + +#startupTable > tr > .homepage-buttons > .content-cell-item { + flex-grow: 1; +} + #useFirefoxSync { font-size: 90%; -moz-margin-end: 8px !important; diff --git a/LCARStrek/browser/preferences/in-content/search.css b/LCARStrek/browser/preferences/in-content/search.css index b837e8d3..c18749ef 100644 --- a/LCARStrek/browser/preferences/in-content/search.css +++ b/LCARStrek/browser/preferences/in-content/search.css @@ -2,6 +2,9 @@ * 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/. */ +#defaultEngine { +} + #defaultEngine > .menulist-label-box > .menulist-icon { height: 16px; } @@ -12,7 +15,7 @@ } #engineList { - margin: .5em 6px; + margin: .5em 2px; } /* #engineList treechildren::-moz-tree-image(engineShown, checked) { diff --git a/LCARStrek/browser/session-restore.svg b/LCARStrek/browser/session-restore.svg new file mode 100644 index 00000000..721fc244 --- /dev/null +++ b/LCARStrek/browser/session-restore.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/LCARStrek/browser/tab-crashed.svg b/LCARStrek/browser/tab-crashed.svg new file mode 100644 index 00000000..d97ab740 --- /dev/null +++ b/LCARStrek/browser/tab-crashed.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/LCARStrek/browser/tabbrowser/crashed.svg b/LCARStrek/browser/tabbrowser/crashed.svg new file mode 100644 index 00000000..efa68f7d --- /dev/null +++ b/LCARStrek/browser/tabbrowser/crashed.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/LCARStrek/browser/welcome-back.svg b/LCARStrek/browser/welcome-back.svg new file mode 100644 index 00000000..2cc4cdcf --- /dev/null +++ b/LCARStrek/browser/welcome-back.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/LCARStrek/global/groupbox.css b/LCARStrek/global/groupbox.css index 7acaa3af..b10b0b8d 100644 --- a/LCARStrek/global/groupbox.css +++ b/LCARStrek/global/groupbox.css @@ -17,7 +17,7 @@ groupbox { padding-top: 3px; padding-bottom: 5px; -moz-padding-start: 5px; - -moz-padding-end: 3px; + -moz-padding-end: 5px; } .groupbox-body {