Use old toolbar if not a PDF build
This commit is contained in:
Dan Stillman
parent
e1c0f6c1a0
commit
28c1504cdd
3 changed files with 184 additions and 174 deletions
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
:root {
|
||||
// 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;
|
||||
|
|
@ -41,9 +43,7 @@
|
|||
--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;
|
||||
|
|
@ -51,36 +51,36 @@
|
|||
--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 {
|
||||
&:-moz-window-inactive {
|
||||
--toolbar-bgcolor: -moz-mac-chrome-inactive;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#titlebar {
|
||||
#titlebar {
|
||||
margin-bottom: -30px;
|
||||
-moz-box-pack: center;
|
||||
}
|
||||
}
|
||||
|
||||
#personal-bookmarks {
|
||||
#personal-bookmarks {
|
||||
-moz-window-dragging: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
toolbarpaletteitem {
|
||||
toolbarpaletteitem {
|
||||
-moz-window-dragging: no-drag;
|
||||
-moz-box-pack: start;
|
||||
}
|
||||
}
|
||||
|
||||
.titlebar-buttonbox-container {
|
||||
.titlebar-buttonbox-container {
|
||||
-moz-box-ordinal-group: 1000;
|
||||
}
|
||||
}
|
||||
|
||||
#titlebar-fullscreen-button {
|
||||
#titlebar-fullscreen-button {
|
||||
-moz-appearance: -moz-mac-fullscreen-button;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -88,86 +88,87 @@ toolbarpaletteitem {
|
|||
|
||||
|
||||
|
||||
/* ::::: Tabs in Titlebar :::::: */
|
||||
/* ::::: Tabs in Titlebar :::::: */
|
||||
|
||||
#main-window:not([chromemargin]) > #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.
|
||||
*/
|
||||
#main-window[tabsintitlebar] > #titlebar {
|
||||
&[tabsintitlebar] > #titlebar {
|
||||
min-height: calc(var(--tab-min-height) + var(--space-above-tabbar));
|
||||
}
|
||||
}
|
||||
|
||||
#main-window[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar {
|
||||
&[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar {
|
||||
-moz-appearance: -moz-window-titlebar;
|
||||
}
|
||||
}
|
||||
|
||||
#main-window:not([tabsintitlebar]) .titlebar-placeholder {
|
||||
&:not([tabsintitlebar]) .titlebar-placeholder {
|
||||
visibility: collapse;
|
||||
}
|
||||
}
|
||||
|
||||
/* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X
|
||||
/* 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 {
|
||||
.titlebar-placeholder[type="caption-buttons"],
|
||||
#titlebar-buttonbox {
|
||||
margin-right: 12px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.titlebar-placeholder[type="fullscreen-button"],
|
||||
#titlebar-fullscreen-button {
|
||||
.titlebar-placeholder[type="fullscreen-button"],
|
||||
#titlebar-fullscreen-button {
|
||||
margin-right: 7px;
|
||||
margin-left: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
#titlebar-fullscreen-button {
|
||||
#titlebar-fullscreen-button {
|
||||
-moz-appearance: -moz-mac-fullscreen-button;
|
||||
}
|
||||
}
|
||||
|
||||
#titlebar-buttonbox {
|
||||
#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) {
|
||||
/* 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) {
|
||||
#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"] {
|
||||
&[sizemode="fullscreen"] .titlebar-placeholder[type="fullscreen-button"],
|
||||
&[sizemode="fullscreen"] .titlebar-placeholder[type="caption-buttons"] {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#tab-bar-container {
|
||||
#tab-bar-container {
|
||||
-moz-window-dragging: drag;
|
||||
}
|
||||
}
|
||||
|
||||
#tab-bar-container .tab {
|
||||
#tab-bar-container .tab {
|
||||
background: $transparent;
|
||||
}
|
||||
}
|
||||
|
||||
#tab-bar-container .tab.selected {
|
||||
#tab-bar-container .tab.selected {
|
||||
background: $toolbar-background-color;
|
||||
}
|
||||
}
|
||||
|
||||
#zotero-toolbar {
|
||||
#zotero-toolbar {
|
||||
-moz-appearance: none;
|
||||
background: $toolbar-background-color;
|
||||
border-bottom: $toolbar-border;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue