From 28c1504cdd3e6cbcb2b4ef3ee00fd663584d71b4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 11 Feb 2021 05:57:35 -0500 Subject: [PATCH] Use old toolbar if not a PDF build --- .../content/zotero/standalone/standalone.js | 2 +- chrome/content/zotero/zoteroPane.js | 11 +- scss/components/_mainWindow.scss | 345 +++++++++--------- 3 files changed, 184 insertions(+), 174 deletions(-) diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js index ce5b8fcf29..29e3043ca8 100644 --- a/chrome/content/zotero/standalone/standalone.js +++ b/chrome/content/zotero/standalone/standalone.js @@ -42,7 +42,7 @@ const ZoteroStandalone = new function() { window.document.documentElement.setAttribute('sizemode', 'normal'); } - if (Zotero.isMac) { + if (Zotero.isMac && Zotero.isPDFBuild) { document.documentElement.setAttribute('drawintitlebar', true); document.documentElement.setAttribute('tabsintitlebar', true); document.documentElement.setAttribute('chromemargin', '0,-1,-1,-1'); diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index ce6ce5784b..75dea04ed0 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -69,6 +69,13 @@ var ZoteroPane = new function() this.init = function () { Zotero.debug("Initializing Zotero pane"); + if (!Zotero.isPDFBuild) { + let win = document.getElementById('main-window') + win.setAttribute('legacytoolbar', 'true'); + document.getElementById('titlebar').hidden = true; + document.getElementById('tab-bar-container').hidden = true; + } + // Set key down handler document.getElementById('appcontent').addEventListener('keydown', ZoteroPane_Local.handleKeyDown, true); @@ -1197,7 +1204,9 @@ var ZoteroPane = new function() } // Rename tab - Zotero_Tabs.rename('zotero-pane', collectionTreeRow.getName()); + if (Zotero.isPDFBuild) { + Zotero_Tabs.rename('zotero-pane', collectionTreeRow.getName()); + } ZoteroItemPane.switchEditorEngine(Zotero.Libraries.get(collectionTreeRow.ref.libraryID).libraryType); // Clear quick search and tag selector when switching views diff --git a/scss/components/_mainWindow.scss b/scss/components/_mainWindow.scss index 77a09627ab..1be6361fa4 100644 --- a/scss/components/_mainWindow.scss +++ b/scss/components/_mainWindow.scss @@ -1,173 +1,174 @@ -:root { - --tab-min-height: 30px; - --tabs-border-color: rgba(0,0,0,.3); - --tabline-color: #0a84ff; - - --toolbar-non-lwt-bgcolor: #f9f9fa; - --toolbar-non-lwt-textcolor: #0c0c0d; - --toolbar-non-lwt-bgimage: none; - --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor); - --toolbar-bgimage: var(--toolbar-non-lwt-bgimage); - --chrome-content-separator-color: hsl(0, 0%, 60%); - - --toolbarbutton-border-radius: 3px; - --toolbarbutton-icon-fill-opacity: .85; - --toolbarbutton-hover-background: hsla(0, 0%, 100%, .1) - linear-gradient(hsla(0, 0%, 100%, .3), - hsla(0, 0%, 100%, .1)) no-repeat; - --toolbarbutton-hover-bordercolor: hsla(0, 0%, 0%, .2); - --toolbarbutton-header-bordercolor: hsla(0, 0%, 0%, .2); - --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5), - 0 1px 0 hsla(0, 0%, 100%, .5) inset; - - --toolbarbutton-active-background: hsla(0, 0%, 0%, .02) - linear-gradient(hsla(0, 0%, 0%, .12), - transparent) border-box; - --toolbarbutton-active-bordercolor: hsla(0, 0%, 0%, .3); - --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5), - 0 1px 0 hsla(0, 0%, 0%, .05) inset, - 0 1px 1px hsla(0, 0%, 0%, .2) inset; - --toolbarbutton-inactive-bordercolor: rgba(0, 0, 0, 0.1); - --toolbarbutton-inactive-boxshadow: 0 1px 0 hsla(0, 0%, 0%, .05) inset; - --toolbarbutton-checkedhover-backgroundcolor: hsla(0, 0%, 0%, .09); - --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff); - - --lwt-header-image: none; - --row-grouped-header-bg-color: #d5d5d5; - --row-grouped-header-bg-color-selected: #3874d1; - --panel-separator-color: hsla(210, 4%, 10%, .14); - --arrowpanel-dimmed: hsla(0, 0%, 80%, .3); - --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45); - --splitter-color: #bdbdbd; - --urlbar-popup-url-color: hsl(210, 77%, 47%); - --urlbar-popup-action-color: hsl(178, 100%, 28%); -} - -:root { - --autocomplete-popup-background: -moz-field; - --autocomplete-popup-color: -moz-fieldtext; - --autocomplete-popup-border-color: ThreeDShadow; - --autocomplete-popup-highlight-background: Highlight; - --autocomplete-popup-highlight-color: HighlightText; - /* Note: Setting this to 0 (without px) breaks CSS calculations for OSX. */ - --space-above-tabbar: 0px; -} - -:root:-moz-window-inactive { - --toolbar-bgcolor: -moz-mac-chrome-inactive; -} - - - - -#titlebar { - margin-bottom: -30px; - -moz-box-pack: center; -} - -#personal-bookmarks { - -moz-window-dragging: inherit; -} - -toolbarpaletteitem { - -moz-window-dragging: no-drag; - -moz-box-pack: start; -} - -.titlebar-buttonbox-container { - -moz-box-ordinal-group: 1000; -} - -#titlebar-fullscreen-button { - -moz-appearance: -moz-mac-fullscreen-button; -} - - - - - - - -/* ::::: Tabs in Titlebar :::::: */ - -#main-window:not([chromemargin]) > #titlebar { - display: none; -} - -/** - * For tabs in titlebar on OS X, we stretch the titlebar down so that the - * tabstrip can overlap it. - */ -#main-window[tabsintitlebar] > #titlebar { - min-height: calc(var(--tab-min-height) + var(--space-above-tabbar)); -} - -#main-window[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar { - -moz-appearance: -moz-window-titlebar; -} - -#main-window:not([tabsintitlebar]) .titlebar-placeholder { - visibility: collapse; -} - -/* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X - * doesn't reverse the order of the items in the titlebar in RTL mode. */ -.titlebar-placeholder[type="caption-buttons"], -#titlebar-buttonbox { - margin-right: 12px; - margin-left: 12px; -} - -.titlebar-placeholder[type="fullscreen-button"], -#titlebar-fullscreen-button { - margin-right: 7px; - margin-left: 7px; -} - -#titlebar-fullscreen-button { - -moz-appearance: -moz-mac-fullscreen-button; -} - -#titlebar-buttonbox { - -moz-appearance: -moz-window-button-box; -} - -/* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */ -#titlebar-fullscreen-button:-moz-locale-dir(ltr), -#titlebar-buttonbox-container:-moz-locale-dir(rtl), -.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(ltr), -.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(rtl) { - -moz-box-ordinal-group: 1000; -} - -#titlebar-fullscreen-button:-moz-locale-dir(rtl), -#titlebar-buttonbox-container:-moz-locale-dir(ltr), -.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr), -.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(rtl) { - -moz-box-ordinal-group: 0; -} - -#main-window[sizemode="fullscreen"] .titlebar-placeholder[type="fullscreen-button"], -#main-window[sizemode="fullscreen"] .titlebar-placeholder[type="caption-buttons"] { - display: none; -} - - - -#tab-bar-container { - -moz-window-dragging: drag; -} - -#tab-bar-container .tab { - background: $transparent; -} - -#tab-bar-container .tab.selected { - background: $toolbar-background-color; -} - -#zotero-toolbar { - -moz-appearance: none; - background: $toolbar-background-color; - border-bottom: $toolbar-border; +// Styling for displaying tabs in the title bar +:root:not([legacytoolbar="true"]) { + & { + --tab-min-height: 30px; + --tabs-border-color: rgba(0,0,0,.3); + --tabline-color: #0a84ff; + + --toolbar-non-lwt-bgcolor: #f9f9fa; + --toolbar-non-lwt-textcolor: #0c0c0d; + --toolbar-non-lwt-bgimage: none; + --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor); + --toolbar-bgimage: var(--toolbar-non-lwt-bgimage); + --chrome-content-separator-color: hsl(0, 0%, 60%); + + --toolbarbutton-border-radius: 3px; + --toolbarbutton-icon-fill-opacity: .85; + --toolbarbutton-hover-background: hsla(0, 0%, 100%, .1) + linear-gradient(hsla(0, 0%, 100%, .3), + hsla(0, 0%, 100%, .1)) no-repeat; + --toolbarbutton-hover-bordercolor: hsla(0, 0%, 0%, .2); + --toolbarbutton-header-bordercolor: hsla(0, 0%, 0%, .2); + --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5), + 0 1px 0 hsla(0, 0%, 100%, .5) inset; + + --toolbarbutton-active-background: hsla(0, 0%, 0%, .02) + linear-gradient(hsla(0, 0%, 0%, .12), + transparent) border-box; + --toolbarbutton-active-bordercolor: hsla(0, 0%, 0%, .3); + --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5), + 0 1px 0 hsla(0, 0%, 0%, .05) inset, + 0 1px 1px hsla(0, 0%, 0%, .2) inset; + --toolbarbutton-inactive-bordercolor: rgba(0, 0, 0, 0.1); + --toolbarbutton-inactive-boxshadow: 0 1px 0 hsla(0, 0%, 0%, .05) inset; + --toolbarbutton-checkedhover-backgroundcolor: hsla(0, 0%, 0%, .09); + --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff); + + --lwt-header-image: none; + --row-grouped-header-bg-color: #d5d5d5; + --row-grouped-header-bg-color-selected: #3874d1; + --panel-separator-color: hsla(210, 4%, 10%, .14); + --arrowpanel-dimmed: hsla(0, 0%, 80%, .3); + --arrowpanel-dimmed-further: hsla(0, 0%, 80%, .45); + --splitter-color: #bdbdbd; + --urlbar-popup-url-color: hsl(210, 77%, 47%); + --urlbar-popup-action-color: hsl(178, 100%, 28%); + + --autocomplete-popup-background: -moz-field; + --autocomplete-popup-color: -moz-fieldtext; + --autocomplete-popup-border-color: ThreeDShadow; + --autocomplete-popup-highlight-background: Highlight; + --autocomplete-popup-highlight-color: HighlightText; + /* Note: Setting this to 0 (without px) breaks CSS calculations for OSX. */ + --space-above-tabbar: 0px; + } + + &:-moz-window-inactive { + --toolbar-bgcolor: -moz-mac-chrome-inactive; + } + + + + + #titlebar { + margin-bottom: -30px; + -moz-box-pack: center; + } + + #personal-bookmarks { + -moz-window-dragging: inherit; + } + + toolbarpaletteitem { + -moz-window-dragging: no-drag; + -moz-box-pack: start; + } + + .titlebar-buttonbox-container { + -moz-box-ordinal-group: 1000; + } + + #titlebar-fullscreen-button { + -moz-appearance: -moz-mac-fullscreen-button; + } + + + + + + + + /* ::::: Tabs in Titlebar :::::: */ + + &:not([chromemargin]) > #titlebar { + display: none; + } + + /** + * For tabs in titlebar on OS X, we stretch the titlebar down so that the + * tabstrip can overlap it. + */ + &[tabsintitlebar] > #titlebar { + min-height: calc(var(--tab-min-height) + var(--space-above-tabbar)); + } + + &[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar { + -moz-appearance: -moz-window-titlebar; + } + + &:not([tabsintitlebar]) .titlebar-placeholder { + visibility: collapse; + } + + /* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X + * doesn't reverse the order of the items in the titlebar in RTL mode. */ + .titlebar-placeholder[type="caption-buttons"], + #titlebar-buttonbox { + margin-right: 12px; + margin-left: 12px; + } + + .titlebar-placeholder[type="fullscreen-button"], + #titlebar-fullscreen-button { + margin-right: 7px; + margin-left: 7px; + } + + #titlebar-fullscreen-button { + -moz-appearance: -moz-mac-fullscreen-button; + } + + #titlebar-buttonbox { + -moz-appearance: -moz-window-button-box; + } + + /* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */ + #titlebar-fullscreen-button:-moz-locale-dir(ltr), + #titlebar-buttonbox-container:-moz-locale-dir(rtl), + .titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(ltr), + .titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(rtl) { + -moz-box-ordinal-group: 1000; + } + + #titlebar-fullscreen-button:-moz-locale-dir(rtl), + #titlebar-buttonbox-container:-moz-locale-dir(ltr), + .titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr), + .titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(rtl) { + -moz-box-ordinal-group: 0; + } + + &[sizemode="fullscreen"] .titlebar-placeholder[type="fullscreen-button"], + &[sizemode="fullscreen"] .titlebar-placeholder[type="caption-buttons"] { + display: none; + } + + + + #tab-bar-container { + -moz-window-dragging: drag; + } + + #tab-bar-container .tab { + background: $transparent; + } + + #tab-bar-container .tab.selected { + background: $toolbar-background-color; + } + + #zotero-toolbar { + -moz-appearance: none; + background: $toolbar-background-color; + border-bottom: $toolbar-border; + } } \ No newline at end of file