mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix Quick Format dialog appearance on Big Sur, and tweak on <=10.15

Browse source 
The Quick Format dialog's shape is based on the OS window corners, and
that changed on Big Sur, which resulted in whitespace along the bottom
edge and a misaligned search results box.

The tops of the citation bubbles were also cut off (at least for me) on
Catalina.
This commit is contained in:
Dan Stillman 2020-12-20 04:20:39 -05:00
parent 7b6b608de7
commit e918b430b6
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero-platform/mac-big-sur/style.css
View file

@ -10,3 +10,12 @@ tabs > tab[visuallyselected="true"] hbox > .tab-text {
color: black !important; color: black !important;
text-shadow: none; text-shadow: none;
} }
/* Quick Format dialog, which is based on window corners, which are different on Big Sur */
#quick-format-dialog #zotero-icon {
margin-top: 2px;
}
#quick-format-iframe {
margin-top: 2px;
}

5
chrome/content/zotero-platform/mac/integration.css
View file

@ -36,7 +36,7 @@ body[multiline="true"] {
} }
#quick-format-search:not([multiline="true"]) { #quick-format-search:not([multiline="true"]) {
padding-top: 4.5px; padding-top: 3.5px;
height: 37px !important; height: 37px !important;
} }
@ -46,7 +46,7 @@ body[multiline="true"] {
} }
#zotero-icon { #zotero-icon {
margin: -2.5px 0 3px -6px; margin: -2px 0 3px -6px;
} }
#quick-format-search[multiline="true"] #zotero-icon { #quick-format-search[multiline="true"] #zotero-icon {
@ -107,5 +107,6 @@ panel button:-moz-focusring {
} }
.quick-format-bubble { .quick-format-bubble {
margin-top: 0;
padding: 1px 6px 1px 6px; padding: 1px 6px 1px 6px;
} }

2
chrome/content/zotero/integration/quickFormat.js
View file

@ -88,7 +88,7 @@ var Zotero_QuickFormat = new function () {
// With fx60 and drawintitlebar=true Firefox calculates the minHeight // With fx60 and drawintitlebar=true Firefox calculates the minHeight
// as titlebar+maincontent, so we have hack around that here. // as titlebar+maincontent, so we have hack around that here.
if (Zotero.isMac && Zotero.platformMajorVersion >= 60) { if (Zotero.isMac && Zotero.platformMajorVersion >= 60) {
qfb.style.marginBottom = "-22px"; qfb.style.marginBottom = "-28px";
} }
// add labels to popup // add labels to popup

1
chrome/content/zotero/integration/quickFormat.xul
View file

@ -28,6 +28,7 @@
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/integration.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/integration.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero-platform/content/integration.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero-platform/content/integration.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero-platform-version/content/style.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd"> <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
<window <window