From: Robert Kaiser Date: Mon, 15 Aug 2016 18:06:54 +0000 (+0200) Subject: fifth and last part of syncing LCARStrek with Firefox 45-48 windows theme changes X-Git-Tag: LCARStrek-2.45~9 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=7c1e433be6221f02302397a7d5bcf1e25b949a75 fifth and last part of syncing LCARStrek with Firefox 45-48 windows theme changes --- diff --git a/LCARStrek/browser/Privacy-16.png b/LCARStrek/browser/Privacy-16.png deleted file mode 100644 index f4d85894..00000000 Binary files a/LCARStrek/browser/Privacy-16.png and /dev/null differ diff --git a/LCARStrek/browser/aboutCertError.css b/LCARStrek/browser/aboutCertError.css deleted file mode 100644 index d5737981..00000000 --- a/LCARStrek/browser/aboutCertError.css +++ /dev/null @@ -1,91 +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"); - -body { - display: flex; - box-sizing: border-box; - min-height: 100vh; - padding: 0 48px; - align-items: center; - justify-content: center; -} - -#errorPageContainer { - position: relative; - min-width: 320px; - max-width: 512px; -} - -#errorTitle { - background: url("chrome://browser/skin/cert-error.svg") left 0 no-repeat; - background-size: 3em; - margin-inline-start: -5em; - padding-inline-start: 5em; -} - -#errorTitle:-moz-dir(rtl) { - background-position: right 0; -} - -#errorTitleText { - border-bottom: 1px solid #A09090; - padding-bottom: 0.4em; -} - -@media (max-width: 675px) { - #errorTitle { - padding-top: 0; - background-image: none; - margin-inline-start: 0; - padding-inline-start: 0; - } -} - -#buttonContainer { - display: flex; - flex-flow: row wrap; -} - -#buttonSpacer { - flex: 1; -} - -#returnButton { - background-color: var(--in-content-primary-button-background); - border: none; - color: var(--in-content-selected-text); - min-width: 250px; - margin-inline-start: 0; -} - -#returnButton:hover { - background-color: var(--in-content-primary-button-background-hover) !important; -} - -#returnButton:hover:active { - background-color: var(--in-content-primary-button-background-active) !important; -} - -#advancedButton { - min-width: 150px; -} - -/* Advanced section is hidden via inline styles until the link is clicked */ -#advancedPanel { - background-color: #000000; - color: var(--in-content-text-color); - border: 1px #A09090 solid; - /* Don't use top padding because the default p style has top padding, and it - * makes the overall div look uneven */ - padding: 0 12px 10px; - margin-top: 10px; -/* box-shadow: 0 0 4px #ddd;*/ - font-size: 0.9em; -} - -.hostname { - font-weight: bold; -} diff --git a/LCARStrek/browser/blockedSite.css b/LCARStrek/browser/blockedSite.css new file mode 100644 index 00000000..3e374519 --- /dev/null +++ b/LCARStrek/browser/blockedSite.css @@ -0,0 +1,64 @@ +/* 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://browser/skin/error-pages.css"); + +body { + background-image: linear-gradient(-45deg, #FF0000, #FF0000 33%, + #000000 33%, #000000 66%, + #FF0000 66%, #FF0000); + background-color: #000000; + color: #FF0000; +} + +.title { + background-image: url("chrome://global/skin/icons/blocked.svg"); +} + +.title-text { + color: #FF0000; +} + +.button-container button:not(.primary) { + background-color: #FF0000; + color: #000000; + margin-inline-end: 0; +} + +.button-container button:not(.primary):hover { + background-color: #FFCF00; +} + +.button-container button:not(.primary):active { + background-color: #FF9F00; +} + +.button-container button { + margin-top: 1.2em; +} + +/* Style warning button to look like a small text link in the + bottom right. This is preferable to just using a text link + since there is already a mechanism in browser.js for trapping + oncommand events from unprivileged chrome pages (BrowserOnCommand).*/ +#ignoreWarningButton { + -moz-appearance: none; + background: transparent; + border: none; + color: white; + text-decoration: underline; + margin: 4px 0 0 0; + padding: 0; + font-size: smaller; + min-width: 0; +} + +#ignoreWarningButton:hover { + cursor: pointer; +} + +#ignoreWarning { + margin-top: 1.2em; + text-align: end; +} diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index b992e398..8581ab03 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -1736,11 +1736,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but color: #FFBFFF; } -/* overlap the urlbar's border */ -#PopupAutoCompleteRichResult { - margin-top: -1px; -} - #urlbar:-moz-lwtheme, .searchbar-textbox:-moz-lwtheme { /* background-color: rgba(255,255,255,.8); @@ -1999,11 +1994,24 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, -moz-border-end: 1px solid var(--identity-box-chrome-color); } +#identity-box:hover > :not(#identity-icon), +#identity-box[open=true] > :not(#identity-icon) { +/* filter: grayscale(100%);*/ +} + #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { color: var(--identity-box-verified-color); -moz-border-end: 1px solid var(--identity-box-verified-color); } +#identity-icon-labels:-moz-locale-dir(ltr) { + padding-left: 2px; +} + +#identity-icon-labels:-moz-locale-dir(rtl) { + padding-right: 2px; +} + #notification-popup-box:not([hidden]) + #identity-box { padding-inline-start: 10px; border-radius: 0; @@ -2183,6 +2191,85 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box max-width: 36px; } +/* +.autocomplete-richlistbox { + padding: 4px; +} + +.autocomplete-richlistitem { + height: 30px; + min-height: 30px; + font: message-box; + border-radius: 2px; + border: 1px solid transparent; +} + +.autocomplete-richlistitem[selected=true] { + background-color: hsl(210, 80%, 52%); +} +*/ +.ac-title { + font-size: 14px; +/* color: hsl(0, 0%, 0%);*/ +} + +.ac-tags { + font-size: 12px; +} +/* +html|span.ac-tag { + background-color: hsl(216, 0%, 88%); + color: hsl(0, 0%, 0%); + border-radius: 2px; + border: 1px solid transparent; + padding: 0 1px; +} +*/ + +.ac-separator, +.ac-url, +.ac-action { + font-size: 12px; +} + +.ac-separator { +/* color: hsl(0, 0%, 50%);*/ +} + +.ac-url { + color: #9C9CFF; +} + +.ac-action { + color: #9C9CFF; +} + +.ac-title[selected=true], +.ac-separator[selected], +.ac-url[selected=true], +.ac-action[selected=true] { + color: #000000; +} + +.ac-tags-text[selected] > html|span.ac-tag { + background-color: #A09090; + color: #000000; +} + +html|span.ac-emphasize-text-title, +html|span.ac-emphasize-text-tag, +html|span.ac-emphasize-text-url { + font-weight: 600; +} + +.ac-type-icon[type=bookmark] { + list-style-image: url("chrome://browser/skin/urlbar-star.svg#star"); +} + +.ac-type-icon[type=bookmark][selected][current] { +/* list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");*/ +} + .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { list-style-image: url("chrome://browser/skin/places/bookmark.png"); @@ -2196,19 +2283,17 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- /* -moz-image-region: rect(0px 48px 16px 32px);*/ } -.ac-result-type-keyword, -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage), -richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon { +.ac-type-icon[type=keyword], +.ac-site-icon[type=searchengine], +.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon"); - width: 16px; - height: 16px; } - .ac-result-type-keyword[selected="true"], - .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected), - richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon { - list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted"); - } +.ac-type-icon[type=keyword][selected], +.ac-site-icon[type=searchengine][selected], +.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { + list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted"); +} .ac-result-type-tag, .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { @@ -2217,50 +2302,14 @@ richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-si height: 16px; } -.ac-comment, -#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description, -#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { - font-size: 1.05em; -} - -.ac-extra > .ac-comment, -.ac-url-text, -.ac-action-text { - font-size: 1em; -} - -.ac-url-text, -.ac-action-text { - color: #9C9CFF; -} - -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; - width: 22px; - height: 16px; -} - -@media (min-resolution: 1.1dppx) { - 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); - } +.ac-type-icon[type=switchtab], +.ac-type-icon[type=remotetab] { + list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); } -richlistitem[type~="action"][actiontype="tab"][selected="true"] > .ac-url-box > .ac-action-icon { - -moz-image-region: rect(16px, 16px, 32px, 0); -} - -.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) { - color: #8050B0; -} - -.ac-comment[selected="true"], -.ac-url-text[selected="true"], -.ac-action-text[selected="true"] { - color: inherit !important; +.ac-type-icon[type=switchtab][selected], +.ac-type-icon[type=remotetab][selected] { + list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab-inverted"); } .autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), @@ -3186,7 +3235,13 @@ richlistitem[type~="action"][actiontype="tab"][selected="true"] > .ac-url-box > } .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); +} + +@media (min-resolution: 1.1dppx) { + .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon { + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } } .alltabs-item[tabIsVisible]:not([_moz-menuactive="true"]) { @@ -3228,10 +3283,17 @@ toolbarbutton.chevron > .toolbarbutton-icon { } #sidebar-throbber[loading="true"] { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); -moz-margin-end: 4px; } +@media (min-resolution: 1.1dppx) { + #sidebar-throbber[loading="true"] { + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + width: 16px; + } +} + /* Bookmarks toolbar */ #PlacesToolbarDropIndicator { list-style-image: url("chrome://communicator/skin/bookmarks/toolbarDropMarker.png"); @@ -4609,7 +4671,7 @@ html|*#gcli-output-frame { } #social-sidebar-button[loading="true"] { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); } #social-sidebar-favico { @@ -5278,6 +5340,14 @@ toolbarpaletteitem[place="toolbar"] { margin-bottom: 25px; } +toolbarpaletteitem[place="palette"]:-moz-focusring, +toolbarpaletteitem[place="panel"]:-moz-focusring, +toolbarpaletteitem[place="toolbar"]:-moz-focusring { + outline: 1px dotted #A09090; + outline-offset: -5px; + -moz-outline-radius: 2.5px; +} + #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton, #wrapper-edit-controls[place="palette"] > #edit-controls > separator, #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton, @@ -5621,21 +5691,16 @@ toolbarpaletteitem[place="toolbar"] { #UITourTooltipBody { -moz-margin-end: 14px; -} - -#UITourTooltipBody > vbox { - padding-top: 4px; -} - -#UITourTooltipIconContainer { - -moz-margin-start: -16px; + -moz-margin-start: 14px; + margin-top: -16px; + margin-bottom: 8px; } #UITourTooltipIcon { width: 48px; height: 48px; - -moz-margin-start: 28px; - -moz-margin-end: 28px; + -moz-margin-start: 14px; + -moz-margin-end: 14px; } #UITourTooltipTitle, @@ -5647,8 +5712,10 @@ toolbarpaletteitem[place="toolbar"] { font-size: 1.45rem; font-weight: bold; -moz-margin-start: 0; - -moz-margin-end: 0; - margin: 0 0 9px 0; + /* Avoid the title overlapping the close button */ + -moz-margin-end: 14px; + margin-top: 0; + margin-bottom: 9px; } #UITourTooltipDescription { @@ -5660,6 +5727,7 @@ toolbarpaletteitem[place="toolbar"] { } #UITourTooltipClose { + position: relative; -moz-appearance: none; border: none; background-color: transparent; @@ -5676,7 +5744,7 @@ toolbarpaletteitem[place="toolbar"] { -moz-box-pack: end; background-color: rgba(0,0,0,.2); border-top: 1px solid rgba(0,0,0,.4); - margin: 24px -16px -16px; + margin: 10px -16px -16px; padding: 2em 15px; } diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index 36debc66..0162861c 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -103,6 +103,7 @@ #identity-popup-permissions-content, #tracking-protection-content { padding: 0.5em 0 1em; + /* .identity-popup-headline.host depends on this width */ -moz-padding-start: calc(2em + 24px); -moz-padding-end: 1em; } @@ -119,7 +120,7 @@ .identity-popup-expander { margin: 0; min-width: auto; - width: 38px; + width: var(--identity-popup-expander-width); background-image: url("chrome://browser/skin/controlcenter/arrow-subview.svg#arrow"); background-size: 16px, auto; background-position: center; @@ -178,6 +179,13 @@ font-size: 150%; } +.identity-popup-headline.host { + word-wrap: break-word; + /* 1em + 2em + 24px is #identity-popup-security-content padding + * 30em is .panel-mainview:not([panelid="PanelUI-popup"]) width */ + max-width: calc(30rem - 3rem - 24px - var(--identity-popup-expander-width)) +} + .identity-popup-warning-gray { -moz-padding-start: 24px; background: url(chrome://browser/skin/controlcenter/warning-gray.svg) no-repeat 0 50%; diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 047f5122..1b302359 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -90,22 +90,36 @@ border: none; } +#PanelUI-menu-button[badge-status="download-success"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + display: none; +} + #PanelUI-menu-button[badge-status="update-succeeded"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #008484 url(chrome://browser/skin/update-badge.svg) no-repeat center; height: 13px; } +#PanelUI-menu-button[badge-status="download-severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #FF0000 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center; height: 13px; } +#PanelUI-menu-button[badge-status="download-warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { - background: transparent url(chrome://browser/skin/warning.svg) no-repeat center; height: 13px; box-shadow: none; } +#PanelUI-menu-button[badge-status="download-warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #FFBF00 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center; +} + +#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: transparent url(chrome://browser/skin/warning.svg) no-repeat center; +} + +#PanelUI-menu-button[badge-status="download-warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive, #PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive { } @@ -239,6 +253,14 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan max-width: 800px; } +.cui-widget-panel[viewId^=PanelUI-webext-] > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; +} + +.cui-widget-panelview[id^=PanelUI-webext-] { + border-radius: 3.5px; +} + panelview:not([mainview]) .toolbarbutton-text, .cui-widget-panel toolbarbutton > .toolbarbutton-text { text-align: start; @@ -646,9 +668,16 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { list-style-image: url("chrome://browser/skin/syncFx-horizontalbar.png"); } -PanelUI-remotetabs-instruction-label, +#PanelUI-remotetabs { + --panel-ui-sync-illustration-height: 157.5px; +} +.PanelUI-remotetabs-instruction-title, +.PanelUI-remotetabs-instruction-label, #PanelUI-remotetabs-mobile-promo { + /* If you change the margin here, the min-height of the synced tabs panel + (e.g. #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, etc) may + need adjusting (see bug 1248506) */ margin: 15px; text-align: center; text-shadow: none; @@ -656,9 +685,16 @@ PanelUI-remotetabs-instruction-label, color: #A09090; } +.PanelUI-remotetabs-instruction-title { + font-size: 1.3em; +} + /* The boxes with "instructions" get extra top and bottom padding for space around the illustration and buttons */ .PanelUI-remotetabs-instruction-box { + /* If you change the padding here, the min-height of the synced tabs panel + (e.g. #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, etc) may + need adjusting (see bug 1248506) */ padding-bottom: 30px; padding-top: 15px; } @@ -671,6 +707,9 @@ PanelUI-remotetabs-instruction-label, is used for buttons in the toolbox overrides. See bug 1238531 for details / color: white !important; border-radius: 2px; + / If you change the margin or padding below, the min-height of the synced tabs + panel (e.g. #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, + etc) may need adjusting (see bug 1248506) / margin-top: 10px; margin-bottom: 10px; padding: 8px; @@ -695,7 +734,7 @@ PanelUI-remotetabs-instruction-label, } .fxaSyncIllustration { - width: 180px; + height: var(--panel-ui-sync-illustration-height); list-style-image: url(chrome://browser/skin/fxa/sync-illustration.svg); } @@ -716,7 +755,12 @@ PanelUI-remotetabs-instruction-label, #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync, #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane, #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane { - min-height: 33em; + min-height: calc(var(--panel-ui-sync-illustration-height) + + 20px + /* margin of .PanelUI-remotetabs-prefs-button */ + 16px + /* padding of .PanelUI-remotetabs-prefs-button */ + 30px + /* margin of .PanelUI-remotetabs-instruction-label */ + 30px + 15px + /* padding of .PanelUI-remotetabs-instruction-box */ + 11em); } #PanelUI-remotetabs-tabslist > label[itemtype="client"] { @@ -731,6 +775,10 @@ PanelUI-remotetabs-instruction-label, visibility: collapse; } +#PanelUI-remotetabs-main[devices-status="single"] > #PanelUI-remotetabs-buttons { + display: none; +} + #PanelUI-fxa-icon[syncstatus="active"] { list-style-image: url("chrome://browser/skin/syncFxProgress-horizontalbar.png"); } @@ -798,7 +846,7 @@ PanelUI-remotetabs-instruction-label, } #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar { - list-style-image: url(chrome://browser/skin/fxa/default-profile-image.svg); + list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg); } #PanelUI-customize:hover, @@ -986,7 +1034,8 @@ panelview .toolbarbutton-1, } panelview .toolbarbutton-1, -.widget-overflow-list .toolbarbutton-1 { +.widget-overflow-list .toolbarbutton-1:not(:first-child), +.widget-overflow-list .toolbaritem-combined-buttons:not(:first-child) { margin-top: 6px; } diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css index d87aa7e4..d4d17a7d 100644 --- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css +++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css @@ -73,61 +73,53 @@ richlistitem.download:not([selected]):hover { /*** Button icons ***/ -.downloadButton.downloadConfirmBlock, -.downloadButton.downloadCancel { +.downloadButton.downloadIconCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } -richlistitem.download:hover > .downloadButton.downloadConfirmBlock, -richlistitem.download:hover > .downloadButton.downloadConfirmBlock:hover, -richlistitem.download:hover > .downloadButton.downloadConfirmBlock:active, -richlistitem.download:hover > .downloadButton.downloadCancel, -richlistitem.download:hover > .downloadButton.downloadCancel:hover, -richlistitem.download:hover > .downloadButton.downloadCancel:active { +richlistitem.download:hover > .downloadButton.downloadIconCancel, +richlistitem.download:hover > .downloadButton.downloadIconCancel:hover, +richlistitem.download:hover > .downloadButton.downloadIconCancel:active { -moz-image-region: rect(0px, 32px, 16px, 16px); } -.downloadButton.downloadShow { +.downloadButton.downloadIconShow { -moz-image-region: rect(16px, 16px, 32px, 0px); } -richlistitem.download:hover > .downloadButton.downloadShow, -richlistitem.download:hover > .downloadButton.downloadShow:hover, -richlistitem.download:hover > .downloadButton.downloadShow:active { +richlistitem.download:hover > .downloadButton.downloadIconShow, +richlistitem.download:hover > .downloadButton.downloadIconShow:hover, +richlistitem.download:hover > .downloadButton.downloadIconShow:active { -moz-image-region: rect(16px, 32px, 32px, 16px); } -.downloadButton.downloadRetry { +.downloadButton.downloadIconRetry { -moz-image-region: rect(32px, 16px, 48px, 0px); } -richlistitem.download:hover > .downloadButton.downloadRetry, -richlistitem.download:hover > .downloadButton.downloadRetry:hover, -richlistitem.download:hover > .downloadButton.downloadRetry:active { +richlistitem.download:hover > .downloadButton.downloadIconRetry, +richlistitem.download:hover > .downloadButton.downloadIconRetry:hover, +richlistitem.download:hover > .downloadButton.downloadIconRetry:active { -moz-image-region: rect(32px, 32px, 48px, 16px); } -richlistitem.download[selected] > .downloadButton.downloadConfirmBlock, -richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock, -richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:hover, -richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:active, -richlistitem.download[selected] > .downloadButton.downloadCancel, -richlistitem.download[selected]:hover > .downloadButton.downloadCancel, -richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover, -richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active { +richlistitem.download[selected] > .downloadButton.downloadIconCancel, +richlistitem.download[selected]:hover > .downloadButton.downloadIconCancel, +richlistitem.download[selected]:hover > .downloadButton.downloadIconCancel:hover, +richlistitem.download[selected]:hover > .downloadButton.downloadIconCancel:active { -moz-image-region: rect(0px, 32px, 16px, 16px); } -richlistitem.download[selected] > .downloadButton.downloadShow, -richlistitem.download[selected]:hover > .downloadButton.downloadShow, -richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover, -richlistitem.download[selected]:hover > .downloadButton.downloadShow:active { +richlistitem.download[selected] > .downloadButton.downloadIconShow, +richlistitem.download[selected]:hover > .downloadButton.downloadIconShow, +richlistitem.download[selected]:hover > .downloadButton.downloadIconShow:hover, +richlistitem.download[selected]:hover > .downloadButton.downloadIconShow:active { -moz-image-region: rect(16px, 32px, 32px, 16px); } -richlistitem.download[selected] > .downloadButton.downloadRetry, -richlistitem.download[selected]:hover > .downloadButton.downloadRetry, -richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover, -richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active { +richlistitem.download[selected] > .downloadButton.downloadIconRetry, +richlistitem.download[selected]:hover > .downloadButton.downloadIconRetry, +richlistitem.download[selected]:hover > .downloadButton.downloadIconRetry:hover, +richlistitem.download[selected]:hover > .downloadButton.downloadIconRetry:active { -moz-image-region: rect(32px, 32px, 48px, 16px); } diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css index 31c02e6c..0dbd66b1 100644 --- a/LCARStrek/browser/downloads/downloads.css +++ b/LCARStrek/browser/downloads/downloads.css @@ -183,6 +183,14 @@ richlistitem[type="download"]:first-child { border: 1px dotted #008484; } +richlistitem[type="download"][verdict="PotentiallyUnwanted"] .blockedIcon { + list-style-image: url("chrome://global/skin/icons/warning.svg"); +} + +richlistitem[type="download"][verdict="Uncommon"] .blockedIcon { + list-style-image: url("chrome://global/skin/icons/information-32.png"); +} + /*** Highlighted list items ***/ #downloadsListBox:-moz-focusring > richlistitem[type="download"][selected] { @@ -204,33 +212,29 @@ richlistitem[type="download"]:first-child { /*** Button icons ***/ -.downloadButton.downloadConfirmBlock, -.downloadButton.downloadCancel { +.downloadButton.downloadIconCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:active, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active { +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconCancel, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconCancel:hover, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconCancel:active { -moz-image-region: rect(0px, 32px, 16px, 16px); } -.downloadButton.downloadShow { +.downloadButton.downloadIconShow { -moz-image-region: rect(16px, 16px, 32px, 0px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:active { +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconShow, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconShow:hover, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconShow:active { -moz-image-region: rect(16px, 32px, 32px, 16px); } -.downloadButton.downloadRetry { +.downloadButton.downloadIconRetry { -moz-image-region: rect(32px, 16px, 48px, 0px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:active { +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconRetry, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconRetry:hover, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconRetry:active { -moz-image-region: rect(32px, 32px, 48px, 16px); } diff --git a/LCARStrek/browser/downloads/indicator.css b/LCARStrek/browser/downloads/indicator.css index a9274484..12649c81 100644 --- a/LCARStrek/browser/downloads/indicator.css +++ b/LCARStrek/browser/downloads/indicator.css @@ -42,15 +42,39 @@ color: #000000; } -toolbar[brighttext] #downloads-button:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon { +toolbar[brighttext] #downloads-button:not([attention="success"]) > #downloads-indicator-anchor > #downloads-indicator-icon { /* background-image: var(--downloads-indicator-icon-inverted); */ } -#downloads-button[attention] > #downloads-indicator-anchor > #downloads-indicator-icon { +#downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + display: -moz-box; + height: 13px; + width: 13px; + background-size: contain; + border: none; + box-shadow: none; +/* filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));*/ +} + +#downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #FF0000 url("chrome://browser/skin/update-badge-failed.svg") no-repeat center; +} + +#downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #FFCF00 url("chrome://browser/skin/update-badge-failed.svg") no-repeat center; +} + +#downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive, +#downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive { + filter: none; +} + +#downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon { background-image: var(--downloads-indicator-icon-attention); } -#downloads-button[cui-areatype="menu-panel"][attention] { +#downloads-button[cui-areatype="menu-panel"][attention="success"] { list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel.png"); -moz-image-region: auto; } @@ -63,13 +87,13 @@ toolbar[brighttext] #downloads-button:not([attention]) > #downloads-indicator-an background-size: 12px; } -#downloads-button:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { +#downloads-button:not([counter])[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { background-image: var(--downloads-indicator-icon-attention); } #downloads-button:not([counter]):hover > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter, #downloads-button[open="true"]:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter, -#downloads-button:not([counter])[attention]:hover > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { +#downloads-button:not([counter])[attention="success"]:hover > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { background-image: var(--downloads-indicator-icon-hover); background-size: 12px; } diff --git a/LCARStrek/browser/fxa/default-avatar.png b/LCARStrek/browser/fxa/default-avatar.png deleted file mode 100644 index 68ee0411..00000000 Binary files a/LCARStrek/browser/fxa/default-avatar.png and /dev/null differ diff --git a/LCARStrek/browser/fxa/default-avatar.svg b/LCARStrek/browser/fxa/default-avatar.svg new file mode 100644 index 00000000..209ff9b6 --- /dev/null +++ b/LCARStrek/browser/fxa/default-avatar.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/LCARStrek/browser/fxa/default-avatar@2x.png b/LCARStrek/browser/fxa/default-avatar@2x.png deleted file mode 100644 index aa9f5926..00000000 Binary files a/LCARStrek/browser/fxa/default-avatar@2x.png and /dev/null differ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 432b6223..e8fc6589 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -459,8 +459,13 @@ description > html|a { #fxaProfileImage { max-width: 60px; border-radius: 50%; - list-style-image: url(chrome://browser/skin/fxa/default-avatar.png); + list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg); margin-inline-end: 15px; + image-rendering: -moz-crisp-edges; +} + +#fxaLoginStatus[hasName] #fxaProfileImage { + max-width: 80px; } #fxaProfileImage.actionable { @@ -689,6 +694,10 @@ description > html|a { list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png) } +#fxaLoginStatus[hasName] #fxaEmailAddress1 { + font-size: 1.1rem; +} + #fxaEmailAddress1, #fxaEmailAddress2, #fxaEmailAddress3 { @@ -752,9 +761,6 @@ description > html|a { .fxaFirefoxLogo { list-style-image: url(chrome://browser/skin/fxa/logo@2x.png); } - #fxaProfileImage { - list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png); - } } /* === END shared/incontentprefs/preferences.inc.css === */ diff --git a/LCARStrek/browser/privatebrowsing/aboutPrivateBrowsing.css b/LCARStrek/browser/privatebrowsing/aboutPrivateBrowsing.css new file mode 100644 index 00000000..bd3ee919 --- /dev/null +++ b/LCARStrek/browser/privatebrowsing/aboutPrivateBrowsing.css @@ -0,0 +1,219 @@ +/* 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/info-pages.css"); + +:root { + --color-grey-lightest: #FFCF00; + --color-grey: #A09090; + + --color-blue: #336699; + --color-blue-dark: #FFCF00; + --color-blue-darker: #6000CF; + + --icon-margin: 64px; +} + +html.private { + --in-content-page-color: #FF9F00; + --in-content-text-color: #FF9F00; + --in-content-page-background: #000000; +} + +body { + padding: 40px; +} + +a:link { + color: var(--color-blue); + text-decoration: none; +} + +a:hover { + color: var(--color-blue-dark); + text-decoration: underline; +} + +a:hover:active { + color: var(--color-blue-darker); +} + +a:visited { + color: var(--color-blue-darker); +} + +.about-content-container { + max-width: 780px; +} + +.section-main { + margin-bottom: 48px; + -moz-margin-start: var(--icon-margin); + -moz-padding-start: 24px; +} + +.section-main:last-child { + margin-bottom: 0; +} + +p { + line-height: 1.5em; +} + +.list-row { + overflow: auto; +} + +.list-row > ul > li { + float: left; + width: 220px; + line-height: 1.5em; + -moz-margin-start: 1em; + margin-bottom: 0; +} + +.list-row > ul > li:-moz-dir(rtl) { + float: right; +} + +.title { + background-image: url("chrome://browser/skin/privatebrowsing/private-browsing.svg"); + background-size: 64px; + background-position: left, center; + font-weight: lighter; + line-height: 1.5em; + min-height: 64px; + -moz-margin-start: 0; + -moz-padding-start: calc(var(--icon-margin) + 24px); +} + +.title:-moz-dir(rtl) { + background-position: right, center; +} + +.about-subheader { + display: flex; + align-items: center; + font-size: 1.5em; + font-weight: lighter; + min-height: 32px; + background-image: url("chrome://browser/skin/privatebrowsing/tracking-protection.svg"); + background-repeat: no-repeat; + background-size: 32px; + -moz-margin-start: calc(var(--icon-margin) - 32px); + -moz-padding-start: 56px; +} + +.about-subheader:-moz-dir(rtl) { + background-position: right; +} + +.about-subheader.tp-off { + background-image: url("chrome://browser/skin/privatebrowsing/tracking-protection-off.svg"); +} + +.about-info { + font-size: .875em; +} + +.tpTitle { + margin-inline-end: 12px; +} + +.private strong { + color: var(--color-grey-lightest); + font-weight: normal; +} + +a.button { + padding: 5px 40px; + background-color: #C09070; + color: #000000; + border: 0px solid #C09070; + border-radius: 3000px; + text-decoration: none; + display: inline-block; +} + +a.button:hover { + background-color: #FFCF00; +} + +a.button:active { + background-color: #FF9F00; +} + +.toggle + .toggle-btn { + box-sizing: border-box; + cursor: pointer; + min-width: 60px; + height: 24px; + border-radius: 24px; + background-color: var(--color-grey); + border: 0px var(--color-grey) solid; + padding: 2px; +} + +.toggle + .toggle-btn::after, +.toggle + .toggle-btn::before { + position: relative; + display: block; + content: ""; + width: 19px; + height: 100%; +} + +.toggle + .toggle-btn::after { + left: 0; +/* box-shadow: 0 0 1px 1px hsla(0, 0%, 0%, .1), + 0 1px 0 hsla(0, 0%, 0%, .2);*/ + border-radius: 50%; + background: #000000; + transition: left .2s ease; +} + +.toggle + .toggle-btn::before { + float: left; + left: 9px; + visibility: hidden; + background-size: 16px; + background-repeat: no-repeat; + background-color: transparent; + background-image: url("chrome://browser/skin/privatebrowsing/check.svg"); +} + +.toggle + .toggle-btn:-moz-dir(rtl)::after { + left: auto; + right: 0; + transition-property: right; +} + +.toggle + .toggle-btn:-moz-dir(rtl)::before { + float: right; + left: auto; + right: 9px; +} + +.toggle:checked + .toggle-btn { + background: #008484; + border: 0px solid #008484; +} + +.toggle:checked + .toggle-btn::after { + left: 35px; +} + +.toggle:checked + .toggle-btn:-moz-dir(rtl)::after { + right: 35px; +} + +.toggle:checked + .toggle-btn::before { + visibility: visible; +} + +.toggle:-moz-focusring + .toggle-btn { + outline: 2px solid #A09090; + outline-offset: 1px; + -moz-outline-radius: 2px; +} diff --git a/LCARStrek/browser/privatebrowsing/attention.png b/LCARStrek/browser/privatebrowsing/attention.png deleted file mode 100755 index 3e8a8400..00000000 Binary files a/LCARStrek/browser/privatebrowsing/attention.png and /dev/null differ diff --git a/LCARStrek/browser/privatebrowsing/attention@2x.png b/LCARStrek/browser/privatebrowsing/attention@2x.png deleted file mode 100755 index d3ff7384..00000000 Binary files a/LCARStrek/browser/privatebrowsing/attention@2x.png and /dev/null differ diff --git a/LCARStrek/browser/privatebrowsing/check.png b/LCARStrek/browser/privatebrowsing/check.png deleted file mode 100755 index a06a3ced..00000000 Binary files a/LCARStrek/browser/privatebrowsing/check.png and /dev/null differ diff --git a/LCARStrek/browser/privatebrowsing/check.svg b/LCARStrek/browser/privatebrowsing/check.svg new file mode 100644 index 00000000..a2dafc59 --- /dev/null +++ b/LCARStrek/browser/privatebrowsing/check.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/LCARStrek/browser/privatebrowsing/check@2x.png b/LCARStrek/browser/privatebrowsing/check@2x.png deleted file mode 100755 index f39bfa21..00000000 Binary files a/LCARStrek/browser/privatebrowsing/check@2x.png and /dev/null differ diff --git a/LCARStrek/browser/privatebrowsing/favicon.svg b/LCARStrek/browser/privatebrowsing/favicon.svg new file mode 100644 index 00000000..46d02e89 --- /dev/null +++ b/LCARStrek/browser/privatebrowsing/favicon.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/LCARStrek/browser/privatebrowsing/mask.svg b/LCARStrek/browser/privatebrowsing/mask.svg deleted file mode 100755 index dc9d4ea0..00000000 --- a/LCARStrek/browser/privatebrowsing/mask.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/privatebrowsing/private-browsing.svg b/LCARStrek/browser/privatebrowsing/private-browsing.svg new file mode 100644 index 00000000..62c4fb84 --- /dev/null +++ b/LCARStrek/browser/privatebrowsing/private-browsing.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/LCARStrek/browser/privatebrowsing/shield-page.png b/LCARStrek/browser/privatebrowsing/shield-page.png deleted file mode 100755 index 129989d1..00000000 Binary files a/LCARStrek/browser/privatebrowsing/shield-page.png and /dev/null differ diff --git a/LCARStrek/browser/privatebrowsing/shield-page@2x.png b/LCARStrek/browser/privatebrowsing/shield-page@2x.png deleted file mode 100755 index 9e55d065..00000000 Binary files a/LCARStrek/browser/privatebrowsing/shield-page@2x.png and /dev/null differ diff --git a/LCARStrek/browser/privatebrowsing/tracking-protection-off.svg b/LCARStrek/browser/privatebrowsing/tracking-protection-off.svg new file mode 100644 index 00000000..ce3d16a9 --- /dev/null +++ b/LCARStrek/browser/privatebrowsing/tracking-protection-off.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/LCARStrek/browser/privatebrowsing/tracking-protection.svg b/LCARStrek/browser/privatebrowsing/tracking-protection.svg new file mode 100644 index 00000000..a289680a --- /dev/null +++ b/LCARStrek/browser/privatebrowsing/tracking-protection.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/LCARStrek/browser/syncCommon.css b/LCARStrek/browser/syncCommon.css index 9c1421d7..a65442f6 100644 --- a/LCARStrek/browser/syncCommon.css +++ b/LCARStrek/browser/syncCommon.css @@ -10,7 +10,7 @@ } .statusIcon[status="active"] { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); } .statusIcon[status="error"] { diff --git a/LCARStrek/browser/syncSetup.css b/LCARStrek/browser/syncSetup.css index 35ea5c81..a263761b 100644 --- a/LCARStrek/browser/syncSetup.css +++ b/LCARStrek/browser/syncSetup.css @@ -104,9 +104,15 @@ wizardpage { width: 0.5em; } +#pairDeviceThrobber, +#login-throbber { + -moz-box-align: center; +} + #pairDeviceThrobber > image, #login-throbber > image { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + width: 16px; + list-style-image: url("chrome://global/skin/icons/loading.png"); } #captchaFeedback { diff --git a/LCARStrek/browser/urlbar-star.svg b/LCARStrek/browser/urlbar-star.svg new file mode 100644 index 00000000..4631eb7b --- /dev/null +++ b/LCARStrek/browser/urlbar-star.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/LCARStrek/browser/urlbar-tab.svg b/LCARStrek/browser/urlbar-tab.svg new file mode 100644 index 00000000..3a2ae179 --- /dev/null +++ b/LCARStrek/browser/urlbar-tab.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/LCARStrek/global/findBar.css b/LCARStrek/global/findBar.css index 2912cc85..0f376471 100644 --- a/LCARStrek/global/findBar.css +++ b/LCARStrek/global/findBar.css @@ -126,5 +126,12 @@ findbar[position="top"][hidden] { } .find-status-icon[status="pending"] { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); +} + +@media (min-resolution: 2dppx) { + .find-status-icon[status="pending"] { + width: 16px; + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } } diff --git a/LCARStrek/global/icons/loading.png b/LCARStrek/global/icons/loading.png new file mode 100644 index 00000000..1492928e Binary files /dev/null and b/LCARStrek/global/icons/loading.png differ diff --git a/LCARStrek/global/icons/loading@2x.png b/LCARStrek/global/icons/loading@2x.png new file mode 100644 index 00000000..3ac0355e Binary files /dev/null and b/LCARStrek/global/icons/loading@2x.png differ diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 78223651..fd9e751c 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -135,11 +135,18 @@ } .loading { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); padding-left: 20px; padding-right: 20px; } +@media (min-resolution: 1.1dppx) { + .loading > image { + width: 16px; + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } +} + button.warning { list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); } @@ -781,21 +788,28 @@ button.warning { #detail-screenshot-box { -moz-margin-end: 2em; +/* background-color: white;*/ } #detail-screenshot { max-width: 300px; max-height: 300px; -/* background-color: white;*/ } #detail-screenshot[loading] { - background-image: url("chrome://communicator/skin/brand/throbber-anim.png"); + background-image: url("chrome://global/skin/icons/loading.png"); background-position: 50% 50%; background-repeat: no-repeat; } +@media (min-resolution: 1.1dppx) { + #detail-screenshot[loading] { + background-image: url("chrome://global/skin/icons/loading@2x.png"); + background-size: 16px; + } +} + #detail-screenshot[loading="error"] { background-image: url("chrome://global/skin/icons/alert-error.gif"); } diff --git a/LCARStrek/mozapps/extensions/update.css b/LCARStrek/mozapps/extensions/update.css index d6e268ad..2c536e5a 100644 --- a/LCARStrek/mozapps/extensions/update.css +++ b/LCARStrek/mozapps/extensions/update.css @@ -3,7 +3,7 @@ } .throbber { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); width: 16px; height: 16px; margin-top: 5px; @@ -12,6 +12,12 @@ -moz-margin-end: 2px; } +@media (min-resolution: 1.1dppx) { + .throbber { + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } +} + .alertBox { background-color : #000000; color: #FF9F00; diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css index 32baf8cd..e07f1500 100644 --- a/LCARStrek/mozapps/plugins/pluginProblem.css +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -90,7 +90,7 @@ html|a { .throbber { padding-left: 16px; /* width of the background image */ - background: url("chrome://global/skin/icons/loading.gif") no-repeat; + background: url("chrome://global/skin/icons/loading.png") no-repeat; margin-left: 5px; } diff --git a/LCARStrek/mozapps/update/updates.css b/LCARStrek/mozapps/update/updates.css index 83203be7..daf91482 100644 --- a/LCARStrek/mozapps/update/updates.css +++ b/LCARStrek/mozapps/update/updates.css @@ -30,7 +30,14 @@ wizardpage { } .remoteLoadingThrobber[state="loading"] { - list-style-image: url("chrome://global/skin/icons/loading.gif"); + list-style-image: url("chrome://global/skin/icons/loading.png"); +} + +@media (min-resolution: 1.1dppx) { + .remoteLoadingThrobber[state="loading"] { + width: 16px; + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } } .remoteLoadingThrobber[state="error"] {