From e0f773b9afa645a35d6d7949bcc366f651fb1093 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 15 Jul 2016 21:38:37 +0200 Subject: [PATCH] first part of syncing LCARStrek with Firefox 45-48 windows theme changes --- LCARStrek/browser/aboutCertError.css | 7 - LCARStrek/browser/browser.css | 21 ++- .../downloads/contentAreaDownloadsView.css | 3 +- .../browser/preferences/aboutPermissions.css | 140 ------------------ LCARStrek/browser/tabbrowser/newtab.svg | 7 + LCARStrek/browser/tabbrowser/newtabFx.png | Bin 191 -> 0 bytes 6 files changed, 22 insertions(+), 156 deletions(-) delete mode 100644 LCARStrek/browser/preferences/aboutPermissions.css create mode 100644 LCARStrek/browser/tabbrowser/newtab.svg delete mode 100644 LCARStrek/browser/tabbrowser/newtabFx.png diff --git a/LCARStrek/browser/aboutCertError.css b/LCARStrek/browser/aboutCertError.css index 1abab09e..d5737981 100644 --- a/LCARStrek/browser/aboutCertError.css +++ b/LCARStrek/browser/aboutCertError.css @@ -53,13 +53,6 @@ body { flex: 1; } -/* Pressing the retry button will cause the cursor to flicker from a pointer to - * not-allowed. Override the disabled cursor behaviour since we will never show - * the button disabled as the initial state. Remove this in Bug 1219861. */ -button:disabled { - cursor: pointer; -} - #returnButton { background-color: var(--in-content-primary-button-background); border: none; diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 109c9220..0ebd3ecb 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2056,6 +2056,8 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, /* === BEGIN identity-block.inc.css === */ #identity-box { +/* --identity-box-hover-background-color: #FFCF00; + --identity-box-selected-background-color: #FF9F00; */ --identity-box-verified-color: #008484; /* Default theme does different color per channel, we can't as they do it build-time. */ --identity-box-chrome-color: #9C9CFF; @@ -2316,7 +2318,7 @@ richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-si color: #9C9CFF; } -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab.png"); -moz-image-region: rect(0, 16px, 16px, 0); padding: 0 3px; @@ -2325,13 +2327,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- } @media (min-resolution: 1.1dppx) { - richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { + richlistitem[type~="action"][actiontype="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab@2x.png"); -moz-image-region: rect(0, 32px, 32px, 0); } } -richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype="tab"][selected="true"] > .ac-url-box > .ac-action-icon { -moz-image-region: rect(16px, 16px, 32px, 0); } @@ -2769,13 +2771,17 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- } .tabs-newtab-button, -#TabsToolbar > #new-tab-button { +#TabsToolbar > #new-tab-button, +#TabsToolbar > toolbarpaletteitem > #new-tab-button, +#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] { border-radius: 8px 8px 0px 0px; -moz-margin-start: 0; } .tabs-newtab-button:not(:hover), -#TabsToolbar > #new-tab-button:not(:hover) { +#TabsToolbar > #new-tab-button:not(:hover), +#TabsToolbar > toolbarpaletteitem > #new-tab-button, +#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] { background-color: #C09070; } @@ -3208,15 +3214,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- #TabsToolbar > #new-tab-button, #TabsToolbar > toolbarpaletteitem > #new-tab-button, #TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] { - list-style-image: url("chrome://browser/skin/tabbrowser/newtabFx.png"); - -moz-image-region: rect(0, 16px, 18px, 0); + list-style-image: url("chrome://browser/skin/tabbrowser/newtab.svg"); + -moz-image-region: auto; } .tabs-newtab-button, .tabs-newtab-button:hover, #TabsToolbar > #new-tab-button, #TabsToolbar > #new-tab-button:hover { - -moz-image-region: rect(0, 32px, 18px, 16px); } #main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme), diff --git a/LCARStrek/browser/downloads/contentAreaDownloadsView.css b/LCARStrek/browser/downloads/contentAreaDownloadsView.css index 9e42a686..fb652e24 100644 --- a/LCARStrek/browser/downloads/contentAreaDownloadsView.css +++ b/LCARStrek/browser/downloads/contentAreaDownloadsView.css @@ -13,8 +13,9 @@ box-shadow: none; } -#downloadsRichListBox:not(:-moz-focusring) { +#downloadsRichListBox:empty { border-color: transparent; + background-color: transparent; } .downloadButton:not([disabled="true"]):hover, diff --git a/LCARStrek/browser/preferences/aboutPermissions.css b/LCARStrek/browser/preferences/aboutPermissions.css deleted file mode 100644 index 5e011eeb..00000000 --- a/LCARStrek/browser/preferences/aboutPermissions.css +++ /dev/null @@ -1,140 +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/in-content/common.css"); - -#permissions-content { - padding-top: 48px; - -moz-padding-end: 0; /* no padding to move the scroll bar to the edge */ -} - -/* sites box */ - -#sites-box { - width: 25em; -} - -#sites-filter { - margin: 0; -} - -#sites-list { - margin: 5px 0 0 0; -} - -.site { - padding: 4px; - border-bottom: 1px solid #9C9CFF; -} - -.site-favicon { - height: 16px; - width: 16px; - -moz-margin-end: 4px; - list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); -} - -#all-sites-item > .site-container > .site-favicon { - list-style-image: none; -} - -/* permissions box */ - -#permissions-box { - -moz-padding-start: 10px; -} - -#permissions-list { - overflow-y: auto; - padding-top: 5px; - -moz-padding-end: 44px; -} - -#site-description { - font-size: 125%; -} - -#site-label { - font-weight: bold; - margin-top: 0; - margin-bottom: 0; -} - -#site-visit-count { - margin-bottom: 0; -} - -#defaults-description { - font-size: 125%; - font-weight: bold; -} - -#header-deck { - -moz-margin-end: 44px; -} - -#site-header, -#defaults-header { - margin-bottom: 1px; -} - -.pref-item { - margin-bottom: 10px; -} - -.pref-icon { - width: 36px; - height: 36px; - -moz-margin-end: 10px; -} - -.pref-icon[type="password"] { - list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png"); -} -.pref-icon[type="cookie"] { - list-style-image: url("chrome://global/skin/icons/alert-question.gif"); -} -.pref-icon[type="geo"] { - list-style-image: url("chrome://browser/skin/Geolocation-64.png"); -} -.pref-icon[type="desktop-notification"] { - list-style-image: url("chrome://browser/skin/web-notifications-icon.svg"); -} -.pref-icon[type="indexedDB"] { - list-style-image: url("chrome://global/skin/icons/alert-question.gif"); -} -.pref-icon[type="install"] { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); -} -.pref-icon[type="popup"] { - list-style-image: url("chrome://global/skin/icons/alert-question.gif"); -} -.pref-icon[type="image"] { - list-style-image: url("chrome://global/skin/icons/alert-question.gif"); -} -.pref-icon[type="plugins"] { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); -} -.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%; - -moz-margin-start: 4px; - margin-bottom: 0; - font-weight: bold; -} - -.pref-menulist { - min-width: 10em; -} - -#cookies-label, -#passwords-label { - -moz-margin-start: 4px; /* align with the menulists */ -} diff --git a/LCARStrek/browser/tabbrowser/newtab.svg b/LCARStrek/browser/tabbrowser/newtab.svg new file mode 100644 index 00000000..6c8b8dd3 --- /dev/null +++ b/LCARStrek/browser/tabbrowser/newtab.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/LCARStrek/browser/tabbrowser/newtabFx.png b/LCARStrek/browser/tabbrowser/newtabFx.png deleted file mode 100644 index 7f3e773e1e364f6048da4327c25a13721d2c9b93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ex#0(_emzf*{QjEnx?oJHr&dIz4aySEgLR=Xb z(t*tX=NarfQjUXElmz(&GdMiEkp|)4nJa0`PlBg3pY5H=O_S-B%Tp|oJT6Cp>LQ0-4jv*Y^lM@u!3``9S46Gic8mx`FdO$+zRYQWn;%*KG ZhV@e1vwJ=&Tm-6S@O1TaS?83{1OWPeEocA$ -- 2.43.0