From: Robert Kaiser Date: Sat, 8 Apr 2017 18:11:12 +0000 (+0200) Subject: second and last part of syncing LCARStrek with Firefox 53 browser windows theme changes X-Git-Tag: LCARStrek-2.50~1 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=b9060895ef5c8141ee106b66e6c2da90a200eca2 second and last part of syncing LCARStrek with Firefox 53 browser windows theme changes --- diff --git a/LCARStrek/browser/Fxtheme-switcher-icon.png b/LCARStrek/browser/Fxtheme-switcher-icon.png deleted file mode 100644 index f574a720..00000000 Binary files a/LCARStrek/browser/Fxtheme-switcher-icon.png and /dev/null differ diff --git a/LCARStrek/browser/aboutSyncTabs.css b/LCARStrek/browser/aboutSyncTabs.css index 87febc93..015f517b 100644 --- a/LCARStrek/browser/aboutSyncTabs.css +++ b/LCARStrek/browser/aboutSyncTabs.css @@ -12,6 +12,10 @@ margin-inline-end: 2em; } +#headers:-moz-locale-dir(rtl) { + background-position-x: 100%; +} + #tabsListHeading { font-size: 140%; font-weight: bold; diff --git a/LCARStrek/browser/addons/addon-badge.svg b/LCARStrek/browser/addons/addon-badge.svg new file mode 100644 index 00000000..1122c444 --- /dev/null +++ b/LCARStrek/browser/addons/addon-badge.svg @@ -0,0 +1,19 @@ + + + + + + diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 1dd525da..b56b1248 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -1751,17 +1751,15 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, } #urlbar-search-splitter { - min-width: 6px; - margin-inline-start: -3px; + /* The splitter width should equal the location and search bars' combined + neighboring margin and border width. */ + min-width: 8px; + margin: 0 -4px; + position: relative; border: none; background: transparent; } -#urlbar-search-splitter + #urlbar-container > #urlbar, -#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox { - margin-inline-start: 0; -} - .urlbar-display { border-inline-end: 1px solid #9C9CFF; margin-inline-end: 3px; @@ -1914,6 +1912,9 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); visibility: visible; @@ -1925,13 +1926,6 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); - visibility: visible; -} - /* === END identity-block/icons.inc.css === */ #identity-box { @@ -2057,10 +2051,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but #identity-box[sharing] > #identity-icon, #sharing-icon { - animation: 3s linear pulse infinite; + animation: 3s linear identity-box-sharing-icon-pulse infinite; } -@keyframes pulse { +@keyframes identity-box-sharing-icon-pulse { +/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */ 0%, 16.66%, 83.33%, 100% { opacity: 0; } @@ -2316,33 +2311,28 @@ html|span.ac-emphasize-text-url { /* list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");*/ } -.ac-result-type-bookmark, -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { +.ac-result-type-bookmark { list-style-image: url("chrome://browser/skin/places/bookmark.png"); -moz-image-region: rect(0px 16px 16px 0px); width: 16px; height: 16px; } -richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark, -.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) { +richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark { /* -moz-image-region: rect(0px 48px 16px 32px);*/ } .ac-type-icon[type=keyword], -.ac-site-icon[type=searchengine], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { +.ac-site-icon[type=searchengine] { list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon"); } .ac-type-icon[type=keyword][selected], -.ac-site-icon[type=searchengine][selected], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { +.ac-site-icon[type=searchengine][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) { +.ac-result-type-tag { list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png"); width: 16px; height: 16px; @@ -2815,10 +2805,11 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- .tab-icon-image[sharing]:not([selected]), .tab-sharing-icon-overlay { - animation: 3s linear pulse infinite; + animation: 3s linear tab-sharing-icon-pulse infinite; } -@keyframes pulse { +@keyframes tab-sharing-icon-pulse { +/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */ 0%, 16.66%, 83.33%, 100% { opacity: 0; } @@ -3366,7 +3357,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ .notification-anchor-icon { - list-style-image: url("chrome://global/skin/icons/information-16.png"); + list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); } .notification-anchor-icon:-moz-focusring { @@ -3379,27 +3370,12 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } } -#notification-popup > .panel-arrowcontainer > .panel-arrowcontent { - /* In order to display the action buttons near the edge of the arrow panel we - * have to reset its default padding and specify the padding in the individual - * "popupnotification" elements instead. To keep the rounded borders of the - * panel, we also have to ensure the contents are clipped to the border box - * by hiding the overflow, and we have to override the "display" property so - * that the height of the contents is computed correctly in that case. */ - padding: 0; - overflow: hidden; - display: block; -} - .notification-anchor-icon:not(.plugin-blocked), #blocked-permissions-container > .blocked-permission-icon { filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } -.notification-anchor-icon:not(.plugin-blocked):not(:hover) { -} - /* INDIVIDUAL NOTIFICATIONS */ .popup-notification-icon[popupid="web-notifications"], @@ -3641,6 +3617,40 @@ html|*#webRTC-previewVideo { max-width: 28em; } +.addon-install-confirmation-name { + font-weight: bold; +} + +.addon-webext-perm-header { + font-size: 1.3em; +} + +.addon-webext-name { + display: inline; + font-weight: bold; + margin: 0; +} + +.addon-addon-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/menuPanel.svg"); + -moz-image-region: rect(0px, 288px, 32px, 256px); +} + +.addon-toolbar-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/Toolbar.png"); + -moz-image-region: rect(0, 486px, 18px, 468px); +} + +/* Notification icon box */ + +.notification-anchor-icon:-moz-focusring { +/* outline: 1px dotted -moz-DialogText;*/ +} + /* Translation infobar */ /* === BEGIN infobar.inc.css === */ @@ -4731,7 +4741,7 @@ notification.pluginVulnerable .messageImage { width: 20px; height: 20px; border-radius: 2px; - background-image: url("chrome://browser/skin/theme-switcher-icon.png"); + background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; } @@ -4933,7 +4943,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { } .customization-lwtheme-menu-theme[defaulttheme] { - list-style-image: url(chrome://browser/skin/Fxtheme-switcher-icon.png); + list-style-image: url(chrome://browser/content/default-theme-icon.svg); } .customization-lwtheme-menu-theme[active="true"] { diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index cbd691c3..09be6f36 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -103,7 +103,7 @@ #identity-popup-permissions-content, #tracking-protection-content { padding: 0.5em 0 1em; - /* .identity-popup-headline.host depends on this width */ + /* .identity-popup-host depends on this width */ padding-inline-start: calc(2em + 24px); padding-inline-end: 1em; } @@ -183,7 +183,7 @@ font-size: 150%; } -.identity-popup-headline.host { +.identity-popup-host { word-wrap: break-word; /* 1em + 2em + 24px is #identity-popup-security-content padding * 30em is .panel-mainview:not([panelid="PanelUI-popup"]) width */ diff --git a/LCARStrek/browser/customizableui/panelUI.css b/LCARStrek/browser/customizableui/panelUI.css index ba5007a4..1afbe880 100644 --- a/LCARStrek/browser/customizableui/panelUI.css +++ b/LCARStrek/browser/customizableui/panelUI.css @@ -151,6 +151,11 @@ #PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive { } +#PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + height: 13px; + background: transparent url(chrome://browser/skin/addons/addon-badge.svg) no-repeat center; +} + .panel-subviews { padding: 4px; background-clip: padding-box; @@ -565,7 +570,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { top: 25%; } -#PanelUI-update-status[update-status]::after { +#PanelUI-update-status[update-status]::after, +#PanelUI-footer-addons > toolbarbutton::after { content: ""; width: 14px; height: 14px; @@ -585,6 +591,24 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { background-color: #FF0000; } +#PanelUI-footer-addons > toolbarbutton { + background-color: #C7F5FF; + display: flex; + flex: 1 1 0%; + width: calc(22.35em + 30px); + padding-inline-start: 15px; + border-inline-start-style: none; +} + +#PanelUI-footer-addons > toolbarbutton > .toolbarbutton-icon { + width: 14px; + height: 14px; +} + +#PanelUI-footer-addons > toolbarbutton::after { + background-image: url(chrome://browser/skin/addons/addon-badge.svg); +} + #PanelUI-fxa-status { display: flex; flex: 1 1 0%; @@ -618,6 +642,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-help, #PanelUI-fxa-label, #PanelUI-fxa-icon, +#PanelUI-footer-addons > toolbarbutton, #PanelUI-customize, #PanelUI-quit { margin: 0; @@ -682,6 +707,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-fxa-label, +#PanelUI-footer-addons > toolbarbutton, #PanelUI-customize { flex: 1; padding-inline-start: 15px; @@ -848,6 +874,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-fxa-label, #PanelUI-fxa-icon, +#PanelUI-footer-addons > toolbarbutton, #PanelUI-customize, #PanelUI-help, #PanelUI-quit { diff --git a/LCARStrek/browser/keyhole-forward-mask.svg b/LCARStrek/browser/keyhole-forward-mask.svg deleted file mode 100644 index 1563e858..00000000 --- a/LCARStrek/browser/keyhole-forward-mask.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/LCARStrek/browser/newtab/whimsycorn.png b/LCARStrek/browser/newtab/whimsycorn.png deleted file mode 100644 index 0c447bf7..00000000 Binary files a/LCARStrek/browser/newtab/whimsycorn.png and /dev/null differ diff --git a/LCARStrek/browser/notification-icons.svg b/LCARStrek/browser/notification-icons.svg index 5923293e..f5ca93d9 100644 --- a/LCARStrek/browser/notification-icons.svg +++ b/LCARStrek/browser/notification-icons.svg @@ -24,9 +24,8 @@ } @@ -73,13 +78,24 @@ - + + + + + + + + + + + + @@ -98,6 +114,7 @@ + @@ -105,6 +122,7 @@ + diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 3e1b4b4b..b1137a9c 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -62,6 +62,12 @@ treecol { min-width: 26px; } +.learnMore { + margin-inline-start: 1.5em; + font-weight: normal; + white-space: nowrap; +} + /* Category List */ #categories { @@ -235,16 +241,6 @@ treecol { } /* Content pane */ -#playDRMContentLink { - /* Line up with the buttons in the other grid bits: */ - margin-left: 4px !important; - margin-right: 4px !important; -} - -#notificationsPolicyLearnMore { - margin-inline-start: 1.5em !important; -} - #defaultFontSizeLabel { /* !important needed to override common !important rule */ margin-inline-start: 4px !important; @@ -292,14 +288,6 @@ treecol { /* Privacy pane */ -#trackingProtectionPBMLearnMore, -#trackingProtectionLearnMore, -#browserContainersLearnMore { - margin-inline-start: 1.5em !important; - margin-top: 0; - font-weight: normal; -} - .doNotTrackLearnMore { margin-inline-start: calc(1em + 30px); margin-bottom: 1em; @@ -331,9 +319,7 @@ description > html|a { } #noFxaAccount { - /* Overriding the margins from the base preferences.css theme file. - These overrides can be simplified by fixing bug 1027174 */ - margin: 0; + padding-top: 15px; } #weavePrefsDeck > vbox > label, @@ -355,17 +341,6 @@ description > html|a { /* margin-inline-end: 4px; / add the 4px end-margin of other elements */ } -#telemetryLearnMore, -#FHRLearnMore, -#crashReporterLearnMore { - /* provide some margin between the links and the label text */ - /* !important is needed to override the rules defined in common.css */ - margin-inline-start: 20px !important; - /* center the links */ - margin-top: 8px; - margin-bottom: 8px; -} - .indent { /* !important needed to override margin-inline-start:0 !important; rule define in common.css for labels - but not in LCARStrek*/ @@ -598,7 +573,7 @@ description > html|a { } .fxaAccountBoxButtons > button:first-child { - margin-right: 14px !important; + margin-inline-end: 14px !important; } .fxaSyncIllustration { diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css index 72e90f33..d8d7a95a 100644 --- a/LCARStrek/browser/preferences/preferences.css +++ b/LCARStrek/browser/preferences/preferences.css @@ -59,12 +59,6 @@ /* Advanced Pane */ -/* Adding padding-bottom prevents the bottom of the tabpanel from being cutoff - when browser.preferences.animateFadeIn = true */ -#advancedPrefs { - padding-bottom: 8px; -} - /* bottom-most box containing a groupbox in a prefpane. Prevents the bottom of the groupbox from being cutoff */ .bottomBox { @@ -91,7 +85,6 @@ } #noFxaAccount { - margin: 6px; line-height: 1.2em; } diff --git a/LCARStrek/browser/social/gear_clicked.png b/LCARStrek/browser/social/gear_clicked.png deleted file mode 100644 index 1df36139..00000000 Binary files a/LCARStrek/browser/social/gear_clicked.png and /dev/null differ diff --git a/LCARStrek/browser/social/gear_default.png b/LCARStrek/browser/social/gear_default.png deleted file mode 100644 index c3b5055f..00000000 Binary files a/LCARStrek/browser/social/gear_default.png and /dev/null differ diff --git a/LCARStrek/browser/syncProgress-menuPanel.png b/LCARStrek/browser/syncProgress-menuPanel.png deleted file mode 100644 index 4ae292cf..00000000 Binary files a/LCARStrek/browser/syncProgress-menuPanel.png and /dev/null differ diff --git a/LCARStrek/browser/syncProgress-toolbar.png b/LCARStrek/browser/syncProgress-toolbar.png deleted file mode 100644 index 6ed24bce..00000000 Binary files a/LCARStrek/browser/syncProgress-toolbar.png and /dev/null differ diff --git a/LCARStrek/browser/theme-switcher-icon.png b/LCARStrek/browser/theme-switcher-icon.png deleted file mode 100644 index 92cccdfa..00000000 Binary files a/LCARStrek/browser/theme-switcher-icon.png and /dev/null differ diff --git a/LCARStrek/browser/theme-switcher-icon@2x.png b/LCARStrek/browser/theme-switcher-icon@2x.png deleted file mode 100644 index 6e0fb4cd..00000000 Binary files a/LCARStrek/browser/theme-switcher-icon@2x.png and /dev/null differ diff --git a/LCARStrek/browser/webRTC-camera-16.png b/LCARStrek/browser/webRTC-camera-16.png deleted file mode 100644 index f7e24011..00000000 Binary files a/LCARStrek/browser/webRTC-camera-16.png and /dev/null differ diff --git a/LCARStrek/browser/webRTC-indicator.css b/LCARStrek/browser/webRTC-indicator.css index bace7562..c5a8f644 100644 --- a/LCARStrek/browser/webRTC-indicator.css +++ b/LCARStrek/browser/webRTC-indicator.css @@ -29,7 +29,7 @@ window { } #screenShareButton { - background-image: url("webRTC-screen-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#screen-indicator"); background-position: center center; background-repeat: no-repeat; background-size: 16px; @@ -61,17 +61,17 @@ window[sharingaudio] > #audioVideoButton { } window[sharingvideo] > #audioVideoButton { - background-image: url("webRTC-camera-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#camera-indicator"); } window[sharingaudio] > #audioVideoButton { - background-image: url("webRTC-microphone-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#microphone-indicator"); } /* Multi-icon button: */ window[sharingaudio][sharingvideo] > #audioVideoButton { - background-image: url("webRTC-camera-16.png"), - url("webRTC-microphone-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#camera-indicator"), + url("chrome://browser/skin/notification-icons.svg#microphone-indicator"); background-position: 6px center, 26px center; background-size: 16px, 16px; min-width: 46px; diff --git a/LCARStrek/browser/webRTC-microphone-16.png b/LCARStrek/browser/webRTC-microphone-16.png deleted file mode 100644 index f1e6f876..00000000 Binary files a/LCARStrek/browser/webRTC-microphone-16.png and /dev/null differ diff --git a/LCARStrek/browser/webRTC-screen-16.png b/LCARStrek/browser/webRTC-screen-16.png deleted file mode 100644 index 25a5730b..00000000 Binary files a/LCARStrek/browser/webRTC-screen-16.png and /dev/null differ