Skip to content

Commit

Permalink
Merge pull request #3120 from nextcloud/backport/3117/stable25
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Oct 4, 2022
2 parents 2a81c9f + 722bc8d commit 83457ed
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 108 deletions.
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

190 changes: 97 additions & 93 deletions src/nodes/ImageView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -332,126 +332,130 @@ export default {
</script>

<style scoped lang="scss">
.image {
margin: 0;
padding: 0;
.image {
margin: 0;
padding: 0;

&, * {
-webkit-user-modify: read-only !important;
}
}

.image__caption {
.image__caption {
text-align: center;
color: var(--color-text-lighter);
display: flex;
align-items: center;
justify-content: center;
&__wrapper {
position: relative;
}
input[type='text'] {
width: 200px;
max-width: 80%;
text-align: center;
color: var(--color-text-lighter);
display: flex;
align-items: center;
justify-content: center;
&__wrapper {
position: relative;
}
input[type='text'] {
width: 200px;
max-width: 80%;
text-align: center;
background-color: transparent;
border: none !important;
color: var(--color-text-maxcontrast) !important;

&:focus {
border: 2px solid var(--color-border-dark) !important;
color: var(--color-main-text) !important;
}
background-color: transparent;
border: none !important;
color: var(--color-text-maxcontrast) !important;

&:focus {
border: 2px solid var(--color-border-dark) !important;
color: var(--color-main-text) !important;
}
}
}

.image__loading {
height: 100px;
}
.image__loading {
height: 100px;
}

.image__main--broken-icon, .image__error-message {
color: var(--color-text-maxcontrast);
}
.image__main--broken-icon, .image__error-message {
color: var(--color-text-maxcontrast);
}

.image__view {
text-align: center;
position: relative;
.image__view {
text-align: center;
position: relative;

img {
max-width: 100%;
}
img {
max-width: 100%;
}

&:hover {
input[type='text'] {
border: 2px solid var(--color-border-dark) !important;
color: var(--color-main-text) !important;
}
&:hover {
input[type='text'] {
border: 2px solid var(--color-border-dark) !important;
color: var(--color-main-text) !important;
}
}
}

.image__main {
max-height: calc(100vh - 50px - 50px);
}
.image__main {
max-height: calc(100vh - 50px - 50px);
}

.media {
.media {
display: flex;
align-items: center;
justify-content: left;
.media__wrapper {
display: flex;
align-items: center;
justify-content: left;
.media__wrapper {
display: flex;
border: 2px solid var(--color-border);
border-radius: var(--border-radius-large);
padding: 8px;
border: 2px solid var(--color-border);
border-radius: var(--border-radius-large);
padding: 8px;

img {
width: 44px;
height: 44px;
}
img {
width: 44px;
height: 44px;
}

.metadata {
margin-left: 8px;
display: flex;
flex-direction: column;
align-items: start;
.metadata {
margin-left: 8px;
display: flex;
flex-direction: column;
align-items: start;

span {
line-height: 20px;
font-weight: normal;
span {
line-height: 20px;
font-weight: normal;

&.size {
color: var(--color-text-maxcontrast);
}
&.size {
color: var(--color-text-maxcontrast);
}
}
}
.buttons {
margin-left: 8px;
}
}

.image__error-message {
display: block;
text-align: center;
.buttons {
margin-left: 8px;
}
}

.fade-enter-active {
transition: opacity .3s ease-in-out;
}
.image__error-message {
display: block;
text-align: center;
}

.fade-enter-to {
opacity: 1;
}
.fade-enter-active {
transition: opacity .3s ease-in-out;
}

.fade-enter {
opacity: 0;
}
.fade-enter-to {
opacity: 1;
}

.image__caption__delete {
display: flex;
align-items: center;
width: 20px;
height: 20px;
position: absolute;
right: -6px;
bottom: 10px;
&, svg {
cursor: pointer;
}
.fade-enter {
opacity: 0;
}

.image__caption__delete {
display: flex;
align-items: center;
width: 20px;
height: 20px;
position: absolute;
right: -6px;
bottom: 10px;
&, svg {
cursor: pointer;
}
}
</style>

0 comments on commit 83457ed

Please sign in to comment.