diff --git a/chrome/content/zotero/components/icons.jsx b/chrome/content/zotero/components/icons.jsx
index 76cb63ecb3..2c5743780f 100644
--- a/chrome/content/zotero/components/icons.jsx
+++ b/chrome/content/zotero/components/icons.jsx
@@ -114,9 +114,6 @@ i('Tick', "chrome://zotero/skin/tick.png");
i('ArrowRefresh', "chrome://zotero/skin/arrow_refresh.png");
//i('Link', "chrome://zotero/skin/link.png");
-i('RTFScanAccept', "chrome://zotero/skin/rtfscan-accept.png", false);
-i('RTFScanLink', "chrome://zotero/skin/rtfscan-link.png", false);
-
i('Attach', "chrome://zotero/skin/attach.png");
i('BulletBlue', "chrome://zotero/skin/bullet_blue.png");
i('BulletBlueEmpty', "chrome://zotero/skin/bullet_blue_empty.png");
diff --git a/chrome/content/zotero/elements/styleConfigurator.js b/chrome/content/zotero/elements/styleConfigurator.js
index c9c5e2c266..a41a869b33 100644
--- a/chrome/content/zotero/elements/styleConfigurator.js
+++ b/chrome/content/zotero/elements/styleConfigurator.js
@@ -96,7 +96,7 @@
}
get style() {
- return this.style;
+ return this._style;
}
set style(style) {
@@ -159,7 +159,7 @@
-
+
this.onActionMouseUp(e, index), { passive: true });
span.style.pointerEvents = 'auto';
}
diff --git a/chrome/skin/default/zotero/16/dark/document-accept.svg b/chrome/skin/default/zotero/16/dark/document-accept.svg
new file mode 100644
index 0000000000..62639e962f
--- /dev/null
+++ b/chrome/skin/default/zotero/16/dark/document-accept.svg
@@ -0,0 +1,5 @@
+
diff --git a/chrome/skin/default/zotero/16/dark/document-missing.svg b/chrome/skin/default/zotero/16/dark/document-missing.svg
new file mode 100644
index 0000000000..fd07ccdf5a
--- /dev/null
+++ b/chrome/skin/default/zotero/16/dark/document-missing.svg
@@ -0,0 +1,5 @@
+
diff --git a/chrome/skin/default/zotero/16/light/document-accept.svg b/chrome/skin/default/zotero/16/light/document-accept.svg
new file mode 100644
index 0000000000..d45d69e2a8
--- /dev/null
+++ b/chrome/skin/default/zotero/16/light/document-accept.svg
@@ -0,0 +1,8 @@
+
diff --git a/chrome/skin/default/zotero/16/light/document-missing.svg b/chrome/skin/default/zotero/16/light/document-missing.svg
new file mode 100644
index 0000000000..b6f1a33c0c
--- /dev/null
+++ b/chrome/skin/default/zotero/16/light/document-missing.svg
@@ -0,0 +1,8 @@
+
diff --git a/scss/components/_rtfScan.scss b/scss/components/_rtfScan.scss
index ba66bac520..b238758c7d 100644
--- a/scss/components/_rtfScan.scss
+++ b/scss/components/_rtfScan.scss
@@ -79,4 +79,13 @@
}
}
}
+
+ $-icons: (document-accept, document-missing);
+ @each $icon in $-icons {
+ .icon-css.icon-#{$icon} {
+ @include focus-states using ($color) {
+ @include svgicon($icon, $color, "16");
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/scss/elements/_styleConfigurator.scss b/scss/elements/_styleConfigurator.scss
index 1d57e6ce39..b1fae2ade5 100644
--- a/scss/elements/_styleConfigurator.scss
+++ b/scss/elements/_styleConfigurator.scss
@@ -1,18 +1,33 @@
style-configurator {
display: block;
width: 100%;
+
+ .style-configurator {
+ display: flex;
+ flex-direction: column;
+ gap: var(--style-configurator-gap, 24px);
+ }
+ .locale-selector-label {
+ margin: var(--style-configurator-locale-selector-label-margin, 0 8px 0 0);
+ }
+
style-selector {
display: block;
}
richlistbox {
- padding: var(--style-configurator-richlistbox-padding, 2px);
+ padding: var(--style-configurator-richlistbox-padding, 4px 8px);
max-height: var(--style-configurator-richlistitem-max-height, 260px);
- overflow: var(--style-configurator-richlistitem-overflow, auto scroll);
+ overflow: var(--style-configurator-richlistitem-overflow, hidden auto);
+ margin: var(--style-configurator-richlistbox-margin, 0);
richlistitem {
- line-height: var(--style-configurator-richlistitem-line-height, 1.5em);
+ line-height: var(--style-configurator-richlistitem-line-height, 1.66666666em);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ padding: var(--style-configurator-richlistitem-padding, 0px 8px 0px 4px);
+ border-radius: var(--style-configurator-richlistitem-border-radius, 5px);
}
@media (-moz-platform: macos) {
@@ -22,16 +37,8 @@ style-configurator {
}
}
- .locale-selector-wrapper,
- .style-selector-wrapper,
- .display-as-wrapper {
- margin: var(--style-configurator-field-margin, .5em 0 0 0);
- padding: var(--style-configurator-field-padding, $space-xs);
- }
-
label[for="style-selector"] {
- margin: var(--style-configurator-label-margin, .5em 0 0 0);
- font-size: var(--style-configurator-label-font-size, 13px);
+ margin: var(--style-configurator-label-margin, 0 $space-min 0 0);
}
.style-selector-wrapper {
@@ -45,9 +52,24 @@ style-configurator {
.display-as-wrapper {
radiogroup {
+ margin: 0;
display: flex;
flex-direction: row;
}
+
+ radio {
+ margin: 0;
+ }
+
+ radio + radio {
+ margin-left: var(--style-configurator-radio-margin-left, 16px);
+ }
+ }
+}
+
+locale-selector {
+ menulist {
+ min-width: 200px;
}
}
diff --git a/scss/wizard.scss b/scss/wizard.scss
index 543ea65943..f6996bc880 100644
--- a/scss/wizard.scss
+++ b/scss/wizard.scss
@@ -1 +1,23 @@
-// Override/enhance native wizard styles
\ No newline at end of file
+// Override/enhance wizard styles
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+:host(:not(.specificity)) {
+ padding: 24px;
+ font-size: 12px;
+}
+
+:not(.specificity) {
+
+ .wizard-header-box-text {
+ padding: 0;
+ }
+
+ .wizard-header-label {
+ margin-inline-start: 0;
+ }
+}
+
+html|*.wizard-page-box:not(.specificity) {
+ padding: 16px 0;
+}
\ No newline at end of file