From 711c9cd6cd08f4fe10eb7544aa3a51dfb863bfeb Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 30 Mar 2019 13:28:49 -0400 Subject: [BASILISK] Remove FxA Synced Tabs Sidebar --- application/basilisk/themes/osx/jar.mn | 1 - .../basilisk/themes/osx/syncedtabs/sidebar.css | 154 --------------------- 2 files changed, 155 deletions(-) delete mode 100644 application/basilisk/themes/osx/syncedtabs/sidebar.css (limited to 'application/basilisk/themes/osx') diff --git a/application/basilisk/themes/osx/jar.mn b/application/basilisk/themes/osx/jar.mn index 27802843d..91998efa6 100644 --- a/application/basilisk/themes/osx/jar.mn +++ b/application/basilisk/themes/osx/jar.mn @@ -8,7 +8,6 @@ browser.jar: skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png skin/classic/browser/aboutSyncTabs.css -* skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css) skin/classic/browser/actionicon-tab.png skin/classic/browser/actionicon-tab@2x.png * skin/classic/browser/browser.css diff --git a/application/basilisk/themes/osx/syncedtabs/sidebar.css b/application/basilisk/themes/osx/syncedtabs/sidebar.css deleted file mode 100644 index 4d1de766c..000000000 --- a/application/basilisk/themes/osx/syncedtabs/sidebar.css +++ /dev/null @@ -1,154 +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/. */ - -%include ../../shared/syncedtabs/sidebar.inc.css - -/* These styles are intended to mimic XUL trees and the XUL search box. */ - -.content-container { - -moz-appearance: -moz-mac-source-list; -} - -.item { - color: -moz-DialogText; -} - -.item-title-container { - box-sizing: border-box; - align-items: center; - height: 24px; - font-size: 12px; -} - -.item.selected > .item-title-container { - color: HighlightText; - font-weight: bold; -} - -.item.selected > .item-title-container { - -moz-appearance: -moz-mac-source-list-selection; -} - -.item.selected:focus > .item-title-container { - -moz-appearance: -moz-mac-active-source-list-selection; -} - -.item.client .item-twisty-container { - min-width: 16px; - height: 16px; - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded"); -} - -@media not all and (-moz-mac-yosemite-theme) { - .item.client.selected .item-twisty-container { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); - } - - .item.client.selected.closed .item-twisty-container { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted"); - } - - .item.client.selected .item-twisty-container:dir(rtl) { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); - } - - .item.client.selected.closed .item-twisty-container:dir(rtl) { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl"); - } -} - -.item.client.closed .item-twisty-container { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed"); -} - -.item.client.selected:focus .item-twisty-container { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); -} - -.item.client.selected.closed:focus .item-twisty-container { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted"); -} - -.item.client .item-twisty-container:dir(rtl) { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded"); -} - -.item.client.closed .item-twisty-container:dir(rtl) { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl"); -} - -.item.client.selected:focus .item-twisty-container:dir(rtl) { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); -} - -.item.client.selected.closed:focus .item-twisty-container:dir(rtl) { - background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl"); -} - -@media (-moz-mac-yosemite-theme) { - .item.selected > .item-title-container { - color: -moz-dialogtext; - font-weight: 500; - } - - .item.selected:focus > .item-title-container { - color: #fff; - } -} - -.sidebar-search-container { - border-bottom: 1px solid #bdbdbd; -} - -.search-box { - -moz-appearance: searchfield; - padding: 1px; - font-size: 12px; - cursor: text; - margin: 4px 8px 10px; - border-width: 3px; - border-style: solid; - border-color: currentcolor; - border-image: none; - -moz-border-top-colors: transparent #888 #000; - -moz-border-right-colors: transparent #FFF #000; - -moz-border-bottom-colors: transparent #FFF #000; - -moz-border-left-colors: transparent #888 #000; - border-top-right-radius: 2px; - border-bottom-left-radius: 2px; - background-color: #FFF; - color: #000; - -moz-user-select: text; - text-shadow: none; -} - -.search-box.compact > .textbox-input-box > .textbox-search-icons > .textbox-search-clear { - background-image: url(chrome://global/skin/icons/searchfield-cancel.svg); - background-repeat: no-repeat; - background-size: 11px 11px; - width: 11px; - height: 11px; -} - -.search-box.compact > .textbox-input-box > .textbox-search-icons > .textbox-search-icon { - display: none; -} - -.search-box[focused="true"] { - -moz-border-top-colors: -moz-mac-focusring -moz-mac-focusring #000000; - -moz-border-right-colors: -moz-mac-focusring -moz-mac-focusring #000000; - -moz-border-bottom-colors: -moz-mac-focusring -moz-mac-focusring #000000; - -moz-border-left-colors: -moz-mac-focusring -moz-mac-focusring #000000; -} - -.search-box.compact { - padding: 0px; - /* font size is in px because the XUL it was copied from uses px */ - font-size: 11px; -} - -.textbox-search-clear, -.textbox-search-icon { - margin-top: 1px; -} -- cgit v1.2.3 From 17a54a70da12e5f2800b63a41f6b4feabf245333 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 31 Mar 2019 18:47:27 -0400 Subject: [BASILISK] Port PM Sync Client - Part 0: Add PanelUI sync button static images --- application/basilisk/themes/osx/sync-menuPanel.png | Bin 0 -> 1562 bytes application/basilisk/themes/osx/sync-menuPanel@2x.png | Bin 0 -> 3365 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 application/basilisk/themes/osx/sync-menuPanel.png create mode 100644 application/basilisk/themes/osx/sync-menuPanel@2x.png (limited to 'application/basilisk/themes/osx') diff --git a/application/basilisk/themes/osx/sync-menuPanel.png b/application/basilisk/themes/osx/sync-menuPanel.png new file mode 100644 index 000000000..f7403a327 Binary files /dev/null and b/application/basilisk/themes/osx/sync-menuPanel.png differ diff --git a/application/basilisk/themes/osx/sync-menuPanel@2x.png b/application/basilisk/themes/osx/sync-menuPanel@2x.png new file mode 100644 index 000000000..9f9926370 Binary files /dev/null and b/application/basilisk/themes/osx/sync-menuPanel@2x.png differ -- cgit v1.2.3 From 0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 13 Apr 2019 06:52:08 -0400 Subject: [BASILISK] Restore Tabs from Other Devices history menu item and Add First Sync Progress --- application/basilisk/themes/osx/jar.mn | 1 + application/basilisk/themes/osx/syncProgress.css | 46 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 application/basilisk/themes/osx/syncProgress.css (limited to 'application/basilisk/themes/osx') diff --git a/application/basilisk/themes/osx/jar.mn b/application/basilisk/themes/osx/jar.mn index 91998efa6..39fcf6343 100644 --- a/application/basilisk/themes/osx/jar.mn +++ b/application/basilisk/themes/osx/jar.mn @@ -178,6 +178,7 @@ browser.jar: skin/classic/browser/syncProgress-toolbar@2x.png skin/classic/browser/syncProgress-toolbar-inverted.png skin/classic/browser/syncProgress-toolbar-inverted@2x.png + skin/classic/browser/syncProgress.css skin/classic/browser/Toolbar-background-noise.png (Toolbar-background-noise.png) skin/classic/browser/lion/toolbarbutton-dropmarker.png (toolbarbutton-dropmarker-lion.png) skin/classic/browser/toolbarbutton-dropmarker@2x.png (toolbarbutton-dropmarker-lion@2x.png) diff --git a/application/basilisk/themes/osx/syncProgress.css b/application/basilisk/themes/osx/syncProgress.css new file mode 100644 index 000000000..d7aa59976 --- /dev/null +++ b/application/basilisk/themes/osx/syncProgress.css @@ -0,0 +1,46 @@ +/* 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; +} -- cgit v1.2.3 From 868c9b8d7f6771b7540ace735229f02f8cc46aaf Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 16 Apr 2019 14:51:15 -0400 Subject: [BASILISK] Port PM Sync Client - Part 5: Port the original sync toolbar button and create a synced tabs toolbar button --- application/basilisk/themes/osx/sync-menuPanel.png | Bin 1562 -> 0 bytes application/basilisk/themes/osx/sync-menuPanel@2x.png | Bin 3365 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 application/basilisk/themes/osx/sync-menuPanel.png delete mode 100644 application/basilisk/themes/osx/sync-menuPanel@2x.png (limited to 'application/basilisk/themes/osx') diff --git a/application/basilisk/themes/osx/sync-menuPanel.png b/application/basilisk/themes/osx/sync-menuPanel.png deleted file mode 100644 index f7403a327..000000000 Binary files a/application/basilisk/themes/osx/sync-menuPanel.png and /dev/null differ diff --git a/application/basilisk/themes/osx/sync-menuPanel@2x.png b/application/basilisk/themes/osx/sync-menuPanel@2x.png deleted file mode 100644 index 9f9926370..000000000 Binary files a/application/basilisk/themes/osx/sync-menuPanel@2x.png and /dev/null differ -- cgit v1.2.3 From 7008afd8e0c91fa97f37f0cf72b4a225e681c4be Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 17 Apr 2019 04:52:39 -0400 Subject: [BASILISK] Port PM Sync Client - Part 6a: Obvious ifdef'ing and clean up --- application/basilisk/themes/osx/jar.mn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'application/basilisk/themes/osx') diff --git a/application/basilisk/themes/osx/jar.mn b/application/basilisk/themes/osx/jar.mn index 39fcf6343..92d2ceedf 100644 --- a/application/basilisk/themes/osx/jar.mn +++ b/application/basilisk/themes/osx/jar.mn @@ -7,7 +7,9 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/aboutSyncTabs.css +#endif skin/classic/browser/actionicon-tab.png skin/classic/browser/actionicon-tab@2x.png * skin/classic/browser/browser.css @@ -158,6 +160,7 @@ browser.jar: skin/classic/browser/tabbrowser/tab-stroke-start@2x.png (tabbrowser/tab-stroke-start@2x.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/browser/tabbrowser/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator@2x.png) +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-16.png skin/classic/browser/sync-32.png skin/classic/browser/sync-bg.png @@ -179,6 +182,7 @@ browser.jar: skin/classic/browser/syncProgress-toolbar-inverted.png skin/classic/browser/syncProgress-toolbar-inverted@2x.png skin/classic/browser/syncProgress.css +#endif skin/classic/browser/Toolbar-background-noise.png (Toolbar-background-noise.png) skin/classic/browser/lion/toolbarbutton-dropmarker.png (toolbarbutton-dropmarker-lion.png) skin/classic/browser/toolbarbutton-dropmarker@2x.png (toolbarbutton-dropmarker-lion@2x.png) @@ -195,8 +199,10 @@ browser.jar: skin/classic/browser/yosemite/menuPanel-help@2x.png (menuPanel-help-yosemite@2x.png) skin/classic/browser/yosemite/reload-stop-go.png (reload-stop-go-yosemite.png) skin/classic/browser/yosemite/reload-stop-go@2x.png (reload-stop-go-yosemite@2x.png) +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/yosemite/sync-horizontalbar.png (sync-horizontalbar-yosemite.png) skin/classic/browser/yosemite/sync-horizontalbar@2x.png (sync-horizontalbar-yosemite@2x.png) +#endif skin/classic/browser/yosemite/tab-selected-end-inactive.svg (tabbrowser/tab-selected-end-yosemite-inactive.svg) skin/classic/browser/yosemite/tab-selected-start-inactive.svg (tabbrowser/tab-selected-start-yosemite-inactive.svg) skin/classic/browser/yosemite/tab-active-middle-inactive.png (tabbrowser/tab-active-middle-yosemite-inactive.png) @@ -224,5 +230,7 @@ browser.jar: % override chrome://browser/skin/menuPanel-help@2x.png chrome://browser/skin/yosemite/menuPanel-help@2x.png os=Darwin osversion>=10.10 % override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/yosemite/reload-stop-go.png os=Darwin osversion>=10.10 % override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/yosemite/reload-stop-go@2x.png os=Darwin osversion>=10.10 +#ifdef MOZ_SERVICES_SYNC % override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/yosemite/sync-horizontalbar.png os=Darwin osversion>=10.10 % override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/yosemite/sync-horizontalbar@2x.png os=Darwin osversion>=10.10 +#endif -- cgit v1.2.3