From 7c0a01f2b6f2d4daeff8216e5ca2bbbcde496d2a Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 19 Oct 2015 13:59:47 +0200 Subject: [PATCH] first part of syncing LCARStrek with Firefox 41 windows theme changes --- .../browser/addons/addon-install-anchor.svg | 27 ++++++++ .../browser/addons/addon-install-blocked.svg | 34 ++++++++++ .../browser/addons/addon-install-confirm.svg | 15 +++++ .../addons/addon-install-downloading.svg | 38 +++++++++++ .../browser/addons/addon-install-error.svg | 34 ++++++++++ .../addons/addon-install-installed.svg | 34 ++++++++++ .../browser/addons/addon-install-restart.svg | 42 ++++++++++++ .../browser/addons/addon-install-warning.svg | 34 ++++++++++ LCARStrek/browser/browser.css | 65 +++++++++++++++---- .../browser/devtools/floating-scrollbars.css | 6 +- LCARStrek/browser/devtools/performance.css | 7 ++ LCARStrek/browser/newtab/newTab.css | 2 +- .../preferences/in-content/preferences.css | 1 - LCARStrek/browser/searchbar.css | 6 +- LCARStrek/browser/syncProgress.css | 46 ------------- 15 files changed, 328 insertions(+), 63 deletions(-) create mode 100644 LCARStrek/browser/addons/addon-install-anchor.svg create mode 100644 LCARStrek/browser/addons/addon-install-blocked.svg create mode 100644 LCARStrek/browser/addons/addon-install-confirm.svg create mode 100644 LCARStrek/browser/addons/addon-install-downloading.svg create mode 100644 LCARStrek/browser/addons/addon-install-error.svg create mode 100644 LCARStrek/browser/addons/addon-install-installed.svg create mode 100644 LCARStrek/browser/addons/addon-install-restart.svg create mode 100644 LCARStrek/browser/addons/addon-install-warning.svg delete mode 100644 LCARStrek/browser/syncProgress.css diff --git a/LCARStrek/browser/addons/addon-install-anchor.svg b/LCARStrek/browser/addons/addon-install-anchor.svg new file mode 100644 index 00000000..c16fb3e8 --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-anchor.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-blocked.svg b/LCARStrek/browser/addons/addon-install-blocked.svg new file mode 100644 index 00000000..3d38f69e --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-blocked.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-confirm.svg b/LCARStrek/browser/addons/addon-install-confirm.svg new file mode 100644 index 00000000..f33f7cf1 --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-confirm.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-downloading.svg b/LCARStrek/browser/addons/addon-install-downloading.svg new file mode 100644 index 00000000..234712a5 --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-downloading.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-error.svg b/LCARStrek/browser/addons/addon-install-error.svg new file mode 100644 index 00000000..e8912673 --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-error.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-installed.svg b/LCARStrek/browser/addons/addon-install-installed.svg new file mode 100644 index 00000000..f5230165 --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-installed.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-restart.svg b/LCARStrek/browser/addons/addon-install-restart.svg new file mode 100644 index 00000000..5f7eb432 --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-restart.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/addons/addon-install-warning.svg b/LCARStrek/browser/addons/addon-install-warning.svg new file mode 100644 index 00000000..d47db18a --- /dev/null +++ b/LCARStrek/browser/addons/addon-install-warning.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 3fe80e9a..b52c2d46 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -3194,14 +3194,32 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="xpinstall-disabled"], -.popup-notification-icon[popupid="addon-progress"], -.popup-notification-icon[popupid="addon-install-blocked"], -.popup-notification-icon[popupid="addon-install-failed"], -.popup-notification-icon[popupid="addon-install-confirmation"], +.popup-notification-icon[popupid="addon-install-blocked"] { + list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg); +} + +.popup-notification-icon[popupid="addon-progress"] { + list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg); +} + +.popup-notification-icon[popupid="addon-install-failed"] { + list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg); +} + +.popup-notification-icon[popupid="addon-install-confirmation"] { + list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg); +} + +#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] { + list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg); +} + .popup-notification-icon[popupid="addon-install-complete"] { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); - width: 32px; - height: 32px; + list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg); +} + +.popup-notification-icon[popupid="addon-install-restart"] { + list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg); } .popup-notification-icon[popupid="click-to-play-plugins"] { @@ -3311,7 +3329,15 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled } #addons-notification-icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); +} + +#addons-notification-icon:hover { + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover); +} + +#addons-notification-icon:hover:active { + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active); } .indexedDB-notification-icon, @@ -3323,6 +3349,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png"); } +#login-fill-notification-icon { + /* Temporary icon until the capture and fill doorhangers are unified. */ + list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); + transform: scaleX(-1); +} + #webapps-notification-icon { list-style-image: url("chrome://gobal/skin/icons/webapps-16.png"); } @@ -3415,9 +3447,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled #pointerLock-notification-icon { list-style-image: url("chrome://browser/skin/pointerLock-16.png"); } -#pointerLock-cancel { - margin: 0px; -} .translate-notification-icon, #translate-notification-icon { @@ -4811,11 +4840,25 @@ notification.pluginVulnerable .messageImage { max-height: 20em; } +.login-fill-item[disabled] { + color: #8050B0; + background-color: #000000; +} + +.login-fill-item[disabled][selected] { + background-color: #008484; +} + .login-hostname { margin: 4px; font-weight: bold; } +.login-fill-item.different-hostname > .login-hostname { + color: #A09090; + font-style: italic; +} + .login-username { margin: 4px; color: #A09090; diff --git a/LCARStrek/browser/devtools/floating-scrollbars.css b/LCARStrek/browser/devtools/floating-scrollbars.css index b927c687..09ec5cf0 100644 --- a/LCARStrek/browser/devtools/floating-scrollbars.css +++ b/LCARStrek/browser/devtools/floating-scrollbars.css @@ -8,8 +8,10 @@ scrollbar { padding: 2px; } +/* Scrollbar code will reset the margin to the correct side depending on + where layout actually puts the scrollbar */ scrollbar[orient="vertical"] { - -moz-margin-start: -10px; + margin-left: -10px; min-width: 3px; max-width: 3px; } @@ -41,5 +43,5 @@ scrollbar:not(:hover) thumb { } scrollbar scrollbarbutton, scrollbar gripper { - display: none; + display: none !important; /* need !important to override forced display in LCARStrek */ } diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css index 3583d718..88b0a974 100644 --- a/LCARStrek/browser/devtools/performance.css +++ b/LCARStrek/browser/devtools/performance.css @@ -540,6 +540,13 @@ menuitem.marker-color-graphs-blue:before, background-color: var(--theme-graphs-blue); } +#performance-filter-menupopup > menuitem.highlight-purple:before, +.marker-details-bullet.highlight-purple, +.waterfall-marker-bar.highlight-purple, +.waterfall-marker-bullet.highlight-purple { + background-color: var(--theme-highlight-purple); +} + #waterfall-details > * { padding-top: 3px; } diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index f1455c73..56fef1b8 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -123,7 +123,7 @@ body { .newtab-intro-cell .newtab-thumbnail, .newtab-intro-cell-hover .newtab-thumbnail { - background-color: #cae1f4; + background-color: #9C9CFF; background-image: url("chrome://browser/skin/newtab/whimsycorn.png"); } diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 2364c80b..f54c5809 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -28,7 +28,6 @@ max-width: 800px; font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; font-size: 1.25rem; - line-height: 22px; color: #FF9F00; } diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index 7918cfa7..deecadfe 100644 --- a/LCARStrek/browser/searchbar.css +++ b/LCARStrek/browser/searchbar.css @@ -135,9 +135,7 @@ searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon .search-panel-current-engine { border-top: none !important; -moz-box-align: center; -} -.search-panel-current-engine:not([showonlysettings]) { border-bottom: none; } @@ -150,6 +148,10 @@ searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon color: #000000; } +.search-panel-tree[collapsed=true] + .search-panel-header { + border-top: none; +} + .search-panel-current-input > label { margin: 0 0 !important; } diff --git a/LCARStrek/browser/syncProgress.css b/LCARStrek/browser/syncProgress.css deleted file mode 100644 index b659c2e5..00000000 --- a/LCARStrek/browser/syncProgress.css +++ /dev/null @@ -1,46 +0,0 @@ -/* 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/. */ -@import url("chrome://global/skin/inContentUI.css"); - -:root { - height: 100%; - width: 100%; - padding: 0; -} - -body { - margin: 0; - padding: 0 2em; -} - -#floatingBox { - margin: 4em auto; - max-width: 40em; - min-width: 23em; - padding: 1em 1.5em; - position: relative; - text-align: center; -} - -#successLogo { - margin: 1em 2em; -} - -#loadingText { - margin: 2em 6em; -} - -#progressBar { - margin: 2em 10em; -} - -#uploadProgressBar{ - width: 100%; -} - -#bottomRow { - margin-top: 2em; - padding: 0; - text-align: end; -} -- 2.35.3