Skip to content

Add image editor #1317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 3 commits into from
Aug 17, 2022
Merged

Add image editor #1317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8623af4
Add image editor
skjnldsv Aug 9, 2022
34f2a29
Fix editor image saving
skjnldsv Aug 16, 2022
9e42436
Editor design fixes
skjnldsv Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Editor design fixes 
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Aug 17, 2022
commit 9e424364725c06aff8c1b7702925402001f25ca4
Binary file modified cypress/snapshots/base/visual-regression.cy.js/image-base.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions js/viewer-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 43 additions & 21 deletions src/components/ImageEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,36 +194,53 @@ export default {
left: 0;
position: absolute;
z-index: 10100;
}
</style>

&::v-deep * {
<style lang="scss">
// Make sure the editor and its modals are above everything
.SfxModal-Wrapper {
z-index: 10101 !important;
}

.SfxPopper-wrapper {
z-index: 10102 !important;
}

// Default styling
.viewer__image-editor,
.SfxModal-Wrapper,
.SfxPopper-wrapper {
* {
// Fix font size for the entire image editor
font-size: var(--default-font-size) !important;
}

&::v-deep label,
&::v-deep button {
label,
button {
color: var(--color-main-text);
> span {
font-size: var(--default-font-size) !important;
}
}
}
</style>

<style lang="scss">
// Make sure the editor and its modals are above everything
.SfxModal-Wrapper {
z-index: 10101 !important;
}
.SfxPopper-wrapper {
z-index: 10102 !important;
// Fix button ratio and center content
button {
padding: 6px 12px;
min-width: 44px;
min-height: 44px;
display: flex;
justify-content: center;
align-items: center;
}
}

// Input styling
.SfxInput-root {
height: auto !important;
padding: 0 !important;
}

.SfxInput-root .SfxInput-Base {
margin: 0 !important;
}
Expand Down Expand Up @@ -260,6 +277,13 @@ export default {
// Menu items
.SfxMenuItem-root {
height: 44px;
padding-left: 0 !important;
// Center the menu entry icon and fix width
> div {
cursor: pointer;
margin-right: 0;
padding: 14px;
}
}

// Modal
Expand All @@ -272,6 +296,7 @@ export default {
.SfxModalTitle-root {
flex: 1 1 100%;
justify-content: center;
color: var(--color-main-text);
}
.SfxModalTitle-Icon {
background: none !important;
Expand All @@ -297,14 +322,6 @@ export default {
}

// Header buttons
.FIE_topbar button {
padding: 6px 12px;
min-width: 44px;
min-height: 44px;
display: flex;
justify-content: center;
align-items: center;
}
.FIE_topbar-center-options > button,
.FIE_topbar-center-options > label {
margin-left: 6px !important;
Expand All @@ -314,6 +331,7 @@ export default {
.FIE_tabs {
padding: 6px !important;
}

.FIE_tab {
padding: 8px;
width: 80px !important;
Expand Down Expand Up @@ -358,6 +376,8 @@ export default {
border: none !important;
padding: 5px !important;
padding-left: 10px !important;
// override default button width
min-width: 0px !important;
}

// Force icon-only style
Expand Down Expand Up @@ -417,7 +437,7 @@ export default {
}

// Disable jpeg saving (jpg is already here)
.SfxMenuItem-root[value="jpeg"] {
.SfxMenuItem-root[value='jpeg'] {
display: none;
}

Expand All @@ -431,9 +451,11 @@ export default {
.FIE_spinner-label {
display: none !important;
}

.FIE_spinner-wrapper {
background-color: transparent !important;
}

.FIE_spinner::before {
z-index: 2;
content: '';
Expand Down
2 changes: 2 additions & 0 deletions src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ export default {

// prevent scrolling while opened
document.body.style.overflow = 'hidden'
document.documentElement.style.overflow = 'hidden'

// swap title with original one
const title = document.getElementsByTagName('head')[0].getElementsByTagName('title')[0]
Expand Down Expand Up @@ -693,6 +694,7 @@ export default {

// restore default
document.body.style.overflow = null
document.documentElement.style.overflow = null

// Callback before updating the title
// If the callback creates a new entry in browser history
Expand Down