Merge pull request #17294 from Snuffleupagus/toolbarViewerRight-reorder

Move the editor-buttons in the main toolbar
This commit is contained in:
Jonas Jenwald 2023-11-22 14:06:24 +01:00 committed by GitHub
commit 5781e722bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 17 deletions

View File

@ -28,6 +28,7 @@
--toolbar-icon-opacity: 0.7; --toolbar-icon-opacity: 0.7;
--doorhanger-icon-opacity: 0.9; --doorhanger-icon-opacity: 0.9;
--editor-toolbar-base-offset: 105px;
--main-color: rgb(12 12 13); --main-color: rgb(12 12 13);
--body-bg-color: rgb(212 212 215); --body-bg-color: rgb(212 212 215);
@ -572,15 +573,15 @@ body {
} }
#editorStampParamsToolbar { #editorStampParamsToolbar {
inset-inline-end: 40px; inset-inline-end: calc(var(--editor-toolbar-base-offset) + 0px);
} }
#editorInkParamsToolbar { #editorInkParamsToolbar {
inset-inline-end: 68px; inset-inline-end: calc(var(--editor-toolbar-base-offset) + 28px);
} }
#editorFreeTextParamsToolbar { #editorFreeTextParamsToolbar {
inset-inline-end: 96px; inset-inline-end: calc(var(--editor-toolbar-base-offset) + 56px);
} }
#editorStampAddImage::before { #editorStampAddImage::before {
@ -1469,6 +1470,9 @@ dialog :link {
} }
@media all and (max-width: 750px) { @media all and (max-width: 750px) {
:root {
--editor-toolbar-base-offset: 40px;
}
#outerContainer .hiddenMediumView { #outerContainer .hiddenMediumView {
display: none; display: none;
} }

View File

@ -333,31 +333,31 @@ See https://github.com/adobe-type-tools/cmap-resources
<span id="numPages" class="toolbarLabel"></span> <span id="numPages" class="toolbarLabel"></span>
</div> </div>
<div id="toolbarViewerRight"> <div id="toolbarViewerRight">
<button id="print" class="toolbarButton hiddenMediumView" title="Print" tabindex="32" data-l10n-id="pdfjs-print-button">
<span data-l10n-id="pdfjs-print-button-label">Print</span>
</button>
<button id="download" class="toolbarButton hiddenMediumView" title="Save" tabindex="33" data-l10n-id="pdfjs-save-button">
<span data-l10n-id="pdfjs-save-button-label">Save</span>
</button>
<div class="verticalToolbarSeparator hiddenMediumView"></div>
<div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup"> <div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup">
<button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Text" role="radio" aria-checked="false" aria-controls="editorFreeTextParamsToolbar" tabindex="34" data-l10n-id="pdfjs-editor-free-text-button"> <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Text" role="radio" aria-checked="false" aria-controls="editorFreeTextParamsToolbar" tabindex="31" data-l10n-id="pdfjs-editor-free-text-button">
<span data-l10n-id="pdfjs-editor-free-text-button-label">Text</span> <span data-l10n-id="pdfjs-editor-free-text-button-label">Text</span>
</button> </button>
<button id="editorInk" class="toolbarButton" disabled="disabled" title="Draw" role="radio" aria-checked="false" aria-controls="editorInkParamsToolbar" tabindex="35" data-l10n-id="pdfjs-editor-ink-button"> <button id="editorInk" class="toolbarButton" disabled="disabled" title="Draw" role="radio" aria-checked="false" aria-controls="editorInkParamsToolbar" tabindex="32" data-l10n-id="pdfjs-editor-ink-button">
<span data-l10n-id="pdfjs-editor-ink-button-label">Draw</span> <span data-l10n-id="pdfjs-editor-ink-button-label">Draw</span>
</button> </button>
<button id="editorStamp" class="toolbarButton" disabled="disabled" title="Add or edit images" role="radio" aria-checked="false" aria-controls="editorStampParamsToolbar" tabindex="36" data-l10n-id="pdfjs-editor-stamp-button"> <button id="editorStamp" class="toolbarButton" disabled="disabled" title="Add or edit images" role="radio" aria-checked="false" aria-controls="editorStampParamsToolbar" tabindex="33" data-l10n-id="pdfjs-editor-stamp-button">
<span data-l10n-id="pdfjs-editor-stamp-button-label">Add or edit images</span> <span data-l10n-id="pdfjs-editor-stamp-button-label">Add or edit images</span>
</button> </button>
</div> </div>
<div id="editorModeSeparator" class="verticalToolbarSeparator"></div> <div id="editorModeSeparator" class="verticalToolbarSeparator"></div>
<button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="48" data-l10n-id="pdfjs-tools-button" aria-expanded="false" aria-controls="secondaryToolbar"> <button id="print" class="toolbarButton hiddenMediumView" title="Print" tabindex="41" data-l10n-id="pdfjs-print-button">
<span data-l10n-id="pdfjs-print-button-label">Print</span>
</button>
<button id="download" class="toolbarButton hiddenMediumView" title="Save" tabindex="42" data-l10n-id="pdfjs-save-button">
<span data-l10n-id="pdfjs-save-button-label">Save</span>
</button>
<div class="verticalToolbarSeparator hiddenMediumView"></div>
<button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="43" data-l10n-id="pdfjs-tools-button" aria-expanded="false" aria-controls="secondaryToolbar">
<span data-l10n-id="pdfjs-tools-button-label">Tools</span> <span data-l10n-id="pdfjs-tools-button-label">Tools</span>
</button> </button>
</div> </div>