From: Robert Kaiser Date: Sun, 16 Oct 2016 18:57:18 +0000 (+0200) Subject: first part of syncing LCARStrek with Firefox 49/50 windows theme changes X-Git-Tag: LCARStrek-2.47~6 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=9ff3770c42688104b98dc9f99e67148047d9bd6d;ds=sidebyside first part of syncing LCARStrek with Firefox 49/50 windows theme changes --- diff --git a/LCARStrek/browser/ToolbarFx.png b/LCARStrek/browser/ToolbarFx.png index 5798ef63..2fcf6d8d 100644 Binary files a/LCARStrek/browser/ToolbarFx.png and b/LCARStrek/browser/ToolbarFx.png differ diff --git a/LCARStrek/browser/aboutSyncTabs.css b/LCARStrek/browser/aboutSyncTabs.css index ee08db3e..87febc93 100644 --- a/LCARStrek/browser/aboutSyncTabs.css +++ b/LCARStrek/browser/aboutSyncTabs.css @@ -55,10 +55,10 @@ richlistitem[type="client"] { -moz-user-focus: ignore !important; } richlistitem.mobile[type="client"] { - list-style-image: url("chrome://browser/skin/sync-mobileIcon.png"); + list-style-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon"); } richlistitem.desktop[type="client"] { - list-style-image: url("chrome://browser/skin/sync-desktopIcon.png"); + list-style-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon"); } .title, diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 5122af86..c01eaded 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -510,7 +510,7 @@ menuitem.bookmark-item { #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, - #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button), + #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/ToolbarFx.png"); } @@ -651,6 +651,14 @@ menuitem.bookmark-item { -moz-image-region: rect(18px, 792px, 36px, 774px); } +#containers-panelmenu[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 810px, 18px, 792px); +} + +#containers-panelmenu[cui-areatype="toolbar"]:hover { + -moz-image-region: rect(18px, 810px, 36px, 792px); +} + #feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } @@ -917,14 +925,14 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, - #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button)[cui-areatype="menu-panel"], + #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, - #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button) { + #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu) { list-style-image: var(--menupanel-list-style-image); } @@ -1016,6 +1024,17 @@ toolbarpaletteitem[place="palette"] > #sync-button:hover { -moz-image-region: rect(32px, 1024px, 64px, 992px); } +#containers-panelmenu[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #containers-panelmenu { + -moz-image-region: rect(0px, 1056px, 32px, 1024px); +} + +#containers-panelmenu[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #containers-panelmenu:hover, +#containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 1056px, 64px, 1024px); +} + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); @@ -3005,31 +3024,6 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- /* End selected tab */ -/* User Context UI - change tab decoration depending on userContextId. - Defaults to gray for unknown usercontextids. */ -.tabbrowser-tab[usercontextid] { - background-image: linear-gradient(to right, transparent 20%, #A09090 30%, #A09090 70%, transparent 80%); - background-size: auto 2px; - background-repeat: no-repeat; -} - -/* Personal User Context */ -.tabbrowser-tab[usercontextid="1"] { - background-image: linear-gradient(to right, transparent 20%, #9C9CFF 30%, #9C9CFF 70%, transparent 80%); -} -/* Work User Context */ -.tabbrowser-tab[usercontextid="2"] { - background-image: linear-gradient(to right, transparent 20%, #FF9F00 30%, #FF9F00 70%, transparent 80%); -} -/* Banking User Context */ -.tabbrowser-tab[usercontextid="3"] { - background-image: linear-gradient(to right, transparent 20%, #008484 30%, #008484 70%, transparent 80%); -} -/* Shopping User Context */ -.tabbrowser-tab[usercontextid="4"] { - background-image: linear-gradient(to right, transparent 20%, #E7ADE7 30%, #E7ADE7 70%, transparent 80%); -} - /* Tab pointer-events */ /* .tabbrowser-tab { @@ -6073,77 +6067,3 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { padding: 0; overflow: hidden; } - -/* === BEGIN usercontext.inc.css === */ - -/* User Context UI browser styles */ - -#menu_newUserContextTabPersonal { - list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); -} - -#menu_newUserContextTabWork { - list-style-image: url("chrome://browser/skin/usercontext/work.svg"); -} - -#menu_newUserContextTabBanking { - list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); -} - -#menu_newUserContextTabShopping { - list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); -} - -/* URL Bar Decoration */ - -#userContext-indicator { - height: 16px; - width: 16px; -} - -#userContext-label { - margin-inline-end: 3px; - color: #A09090; -} - -#userContext-icons:not([usercontextid]) { - display: none; -} - -#userContext-icons { - -moz-box-align: center; -} - -/* Personal User Context */ -#userContext-icons[usercontextid="1"] > #userContext-label { - color: #9C9CFF; -} -#userContext-icons[usercontextid="1"] > #userContext-indicator { - list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); -} - -/* Work User Context */ -#userContext-icons[usercontextid="2"] > #userContext-label { - color: #FF9F00; -} -#userContext-icons[usercontextid="2"] > #userContext-indicator { - list-style-image: url("chrome://browser/skin/usercontext/work.svg"); -} - -/* Banking User Context */ -#userContext-icons[usercontextid="3"] > #userContext-label { - color: #008484; -} -#userContext-icons[usercontextid="3"] > #userContext-indicator { - list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); -} - -/* Shopping User Context */ -#userContext-icons[usercontextid="4"] > #userContext-label { - color: #E7ADE7; -} -#userContext-icons[usercontextid="4"] > #userContext-indicator { - list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); -} - -/* === END usercontext.inc.css === */ diff --git a/LCARStrek/browser/menuPanel@2x.png b/LCARStrek/browser/menuPanel@2x.png deleted file mode 100644 index d1d52568..00000000 Binary files a/LCARStrek/browser/menuPanel@2x.png and /dev/null differ diff --git a/LCARStrek/browser/menuPanelFx.png b/LCARStrek/browser/menuPanelFx.png index 930048d0..0fe8f763 100644 Binary files a/LCARStrek/browser/menuPanelFx.png and b/LCARStrek/browser/menuPanelFx.png differ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index c01fe270..b4ca39eb 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -322,7 +322,7 @@ description > html|a { #weavePrefsDeck > #needsUpdate > hbox > #loginError, #weavePrefsDeck > #hasFxaAccount > vbox > label, #weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label { - /* no margin-start for elements at the begin of a line */ + /* no margin-inline-start for elements at the begin of a line */ margin-inline-start: 0; } diff --git a/LCARStrek/browser/preferences/search.css b/LCARStrek/browser/preferences/search.css deleted file mode 100644 index 27abc580..00000000 --- a/LCARStrek/browser/preferences/search.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/. */ - -#defaultEngine > .menulist-label-box > .menulist-icon { - height: 16px; -} - -/* Reserve space so that localized labels can wrap without hiding the - 'add more engines' link at the bottom. See bug 1112688. */ -#oneClickSearchProvidersGroup { - margin-bottom: 3em; -} - -#engineList { - margin: .5em 6px; -} - -.checkbox-check, -#engineList treechildren::-moz-tree-checkbox { - list-style-image: url("chrome://global/skin/tree/checkbox.gif"); -} - -.checkbox-check[checked="true"], -#engineList treechildren::-moz-tree-checkbox(checked) { - list-style-image: url("chrome://global/skin/tree/checkbox-checked.gif"); -} - -#engineList treechildren::-moz-tree-image(engineName) { - margin-inline-end: 4px; - margin-inline-start: 0; - width: 16px; - height: 16px; -} - -#engineList treechildren::-moz-tree-row { - min-height: 20px; -} - -#engineList treechildren::-moz-tree-drop-feedback { - background-color: #008484; - width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window - we may have, overflow isn't visible. */ - height: 2px; - margin-inline-start: 0; -} diff --git a/LCARStrek/browser/sync-desktopIcon.png b/LCARStrek/browser/sync-desktopIcon.png deleted file mode 100644 index a3f6aed8..00000000 Binary files a/LCARStrek/browser/sync-desktopIcon.png and /dev/null differ diff --git a/LCARStrek/browser/sync-desktopIcon.svg b/LCARStrek/browser/sync-desktopIcon.svg new file mode 100644 index 00000000..2830dfe3 --- /dev/null +++ b/LCARStrek/browser/sync-desktopIcon.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/LCARStrek/browser/sync-mobileIcon.png b/LCARStrek/browser/sync-mobileIcon.png deleted file mode 100644 index fb40f711..00000000 Binary files a/LCARStrek/browser/sync-mobileIcon.png and /dev/null differ diff --git a/LCARStrek/browser/sync-mobileIcon.svg b/LCARStrek/browser/sync-mobileIcon.svg new file mode 100644 index 00000000..331b02e1 --- /dev/null +++ b/LCARStrek/browser/sync-mobileIcon.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/LCARStrek/browser/syncedtabs/sidebar.css b/LCARStrek/browser/syncedtabs/sidebar.css index fa6f601c..0e41f1cf 100644 --- a/LCARStrek/browser/syncedtabs/sidebar.css +++ b/LCARStrek/browser/syncedtabs/sidebar.css @@ -91,6 +91,24 @@ body { padding-inline-start: 20px; } +.item.client.device-image-desktop.selected > .item-title-container > .item-icon-container { + background-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon-inverted"); +} + +.item.client.device-image-desktop:not(.selected) > .item-title-container > .item-icon-container, +.item.client.device-image-desktop.selected > .item-title-container > .item-icon-container:-moz-window-inactive { + background-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon"); +} + +.item.client.device-image-mobile.selected > .item-title-container > .item-icon-container { + background-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon-inverted"); +} + +.item.client.device-image-mobile:not(.selected) > .item-title-container > .item-icon-container, +.item.client.device-image-mobile.selected > .item-title-container > .item-icon-container:-moz-window-inactive { + background-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon"); +} + .item.tab > .item-title-container > .item-icon-container { background-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } @@ -128,6 +146,7 @@ body { text-overflow: ellipsis; margin: 0px; line-height: 1.3; + cursor: default; } .item[hidden] { @@ -313,7 +332,7 @@ html { background-repeat: no-repeat; background-position: center; padding-top: 5px; - width: 9px; /* The image's width is 9 pixels */ + max-width: 9px; /* The image's width is 9 pixels */ height: 9px; }