Skip to content

Commit

Permalink
Merge pull request #2382 from nextcloud/backport/2380/stable29
Browse files Browse the repository at this point in the history
  • Loading branch information
@skjnldsv
skjnldsv authored Jul 30, 2024
2 parents 988f1b3 + ddf8c9e commit 8efa958
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 27 deletions.
48 changes: 24 additions & 24 deletions css/viewer-main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,81 +371,81 @@ tr.file-picker__row td.row-name[data-v-48df4f27] {
padding: 10% 5%;
background-color: var(--color-main-background);
}
.viewer.modal-mask[data-v-dbe1c71f] {
.viewer.modal-mask[data-v-09be59e8] {
transition: width ease 100ms, background-color 0.3s ease;
}
.viewer[data-v-dbe1c71f] .modal-container, .viewer__content[data-v-dbe1c71f] {
.viewer[data-v-09be59e8] .modal-container, .viewer__content[data-v-09be59e8] {
overflow: visible !important;
cursor: pointer;
}
.viewer--split .viewer__file--active[data-v-dbe1c71f] {
.viewer--split .viewer__file--active[data-v-09be59e8] {
width: 50%;
}
.viewer[data-v-dbe1c71f] .modal-wrapper .modal-container {
.viewer[data-v-09be59e8] .modal-wrapper .modal-container {
top: var(--header-height);
bottom: var(--header-height);
height: auto;
background-color: transparent;
box-shadow: none;
}
.viewer__content[data-v-dbe1c71f] {
.viewer__content[data-v-09be59e8] {
width: 100%;
height: 100%;
}
.viewer__file-wrapper[data-v-dbe1c71f] {
.viewer__file-wrapper[data-v-09be59e8] {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}
.viewer__file-wrapper--hidden[data-v-dbe1c71f] {
.viewer__file-wrapper--hidden[data-v-09be59e8] {
position: absolute;
z-index: -1;
left: -10000px;
}
.viewer__file[data-v-dbe1c71f] {
.viewer__file[data-v-09be59e8] {
transition: height 100ms ease, width 100ms ease;
}
.viewer.theme--dark[data-v-dbe1c71f] .button-vue--vue-tertiary:hover {
.viewer.theme--dark[data-v-09be59e8] .button-vue--vue-tertiary:hover {
background-color: rgba(255, 255, 255, 0.08) !important;
}
.viewer.theme--dark[data-v-dbe1c71f] .button-vue--vue-tertiary:focus, .viewer.theme--dark[data-v-dbe1c71f] .button-vue--vue-tertiary:focus-visible {
.viewer.theme--dark[data-v-09be59e8] .button-vue--vue-tertiary:focus, .viewer.theme--dark[data-v-09be59e8] .button-vue--vue-tertiary:focus-visible {
background-color: rgba(255, 255, 255, 0.08) !important;
outline: 2px solid var(--color-primary-element) !important;
}
.viewer.theme--dark[data-v-dbe1c71f] .button-vue--vue-tertiary.action-item__menutoggle {
.viewer.theme--dark[data-v-09be59e8] .button-vue--vue-tertiary.action-item__menutoggle {
background-color: transparent;
}
.viewer.theme--undefined.modal-mask[data-v-dbe1c71f] {
.viewer.theme--undefined.modal-mask[data-v-09be59e8] {
background-color: transparent !important;
}
.viewer.theme--light.modal-mask[data-v-dbe1c71f] {
.viewer.theme--light.modal-mask[data-v-09be59e8] {
background-color: rgba(255, 255, 255, 0.92) !important;
}
.viewer.theme--light[data-v-dbe1c71f] .modal-name,
.viewer.theme--light[data-v-dbe1c71f] .modal-header .icons-menu button svg {
.viewer.theme--light[data-v-09be59e8] .modal-name,
.viewer.theme--light[data-v-09be59e8] .modal-header .icons-menu button svg {
color: #000 !important;
}
.viewer.theme--default.modal-mask[data-v-dbe1c71f] {
.viewer.theme--default.modal-mask[data-v-09be59e8] {
background-color: var(--color-main-background) !important;
}
.viewer.theme--default[data-v-dbe1c71f] .modal-name,
.viewer.theme--default[data-v-dbe1c71f] .modal-header .icons-menu {
.viewer.theme--default[data-v-09be59e8] .modal-name,
.viewer.theme--default[data-v-09be59e8] .modal-header .icons-menu {
color: var(--color-main-text) !important;
}
.viewer.theme--default[data-v-dbe1c71f] .modal-name button svg, .viewer.theme--default[data-v-dbe1c71f] .modal-name a,
.viewer.theme--default[data-v-dbe1c71f] .modal-header .icons-menu button svg,
.viewer.theme--default[data-v-dbe1c71f] .modal-header .icons-menu a {
.viewer.theme--default[data-v-09be59e8] .modal-name button svg, .viewer.theme--default[data-v-09be59e8] .modal-name a,
.viewer.theme--default[data-v-09be59e8] .modal-header .icons-menu button svg,
.viewer.theme--default[data-v-09be59e8] .modal-header .icons-menu a {
color: var(--color-main-text) !important;
}
.viewer.image--fullscreen[data-v-dbe1c71f] .modal-header .modal-name {
.viewer.image--fullscreen[data-v-09be59e8] .modal-header .modal-name {
opacity: 0;
}
.viewer.image--fullscreen[data-v-dbe1c71f] .modal-header .icons-menu {
.viewer.image--fullscreen[data-v-09be59e8] .modal-header .icons-menu {
background-color: rgba(0, 0, 0, 0.2);
}
.viewer.image--fullscreen[data-v-dbe1c71f] .modal-wrapper .modal-container {
.viewer.image--fullscreen[data-v-09be59e8] .modal-wrapper .modal-container {
top: 0;
bottom: 0;
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions js/viewer-main.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24930,7 +24930,7 @@ var _sfc_render$5 = function render7() {
var _vm = this, _c = _vm._self._c;
return _vm.el ? _c("div", { attrs: { "id": "viewer", "data-handler": _vm.handlerId } }, [!_vm.currentFile.failed ? _c(_vm.currentFile.modal, _vm._b({ key: _vm._f("uniqueKey")(_vm.currentFile), ref: "content", tag: "component", staticClass: "viewer__file viewer__file--active", attrs: { "active": true, "can-swipe": false, "file-list": [_vm.currentFile], "is-full-screen": false, "loaded": _vm.currentFile.loaded, "is-sidebar-shown": false }, on: { "update:loaded": function($event) {
return _vm.$set(_vm.currentFile, "loaded", $event);
}, "error": _vm.currentFailed } }, "component", _vm.currentFile, false)) : _c("Error", { attrs: { "name": _vm.currentFile.basename } })], 1) : _vm.initiated || _vm.currentFile.modal ? _c("NcModal", { staticClass: "viewer", class: _vm.modalClass, style: { width: _vm.isSidebarShown ? "".concat(_vm.sidebarPosition, "px") : null }, attrs: { "id": "viewer", "additional-trap-elements": _vm.trapElements, "clear-view-delay": -1, "close-button-contained": false, "dark": true, "data-handler": _vm.handlerId, "enable-slideshow": _vm.hasPrevious || _vm.hasNext, "enable-swipe": _vm.canSwipe && !_vm.editing, "has-next": _vm.hasNext, "has-previous": _vm.hasPrevious, "inline-actions": _vm.canEdit ? 1 : 0, "spread-navigation": true, "name": _vm.currentFile.basename, "view": _vm.currentFile.modal, "size": "full" }, on: { "close": _vm.close, "previous": _vm.previous, "next": _vm.next }, scopedSlots: _vm._u([{ key: "actions", fn: function() {
}, "error": _vm.currentFailed } }, "component", _vm.currentFile, false)) : _c("Error", { attrs: { "name": _vm.currentFile.basename } })], 1) : _vm.initiated || _vm.currentFile.modal ? _c("NcModal", { staticClass: "viewer", class: _vm.modalClass, style: { width: _vm.isSidebarShown ? "".concat(_vm.sidebarPosition, "px") : null }, attrs: { "id": "viewer", "additional-trap-elements": _vm.trapElements, "clear-view-delay": -1, "close-button-contained": false, "dark": true, "data-handler": _vm.handlerId, "enable-slideshow": _vm.hasPrevious || _vm.hasNext, "slideshow-paused": _vm.editing, "enable-swipe": _vm.canSwipe && !_vm.editing, "has-next": _vm.hasNext, "has-previous": _vm.hasPrevious, "inline-actions": _vm.canEdit ? 1 : 0, "spread-navigation": true, "name": _vm.currentFile.basename, "view": _vm.currentFile.modal, "size": "full" }, on: { "close": _vm.close, "previous": _vm.previous, "next": _vm.next }, scopedSlots: _vm._u([{ key: "actions", fn: function() {
return [_vm.canEdit ? _c("NcActionButton", { attrs: { "close-after-click": true }, on: { "click": _vm.onEdit }, scopedSlots: _vm._u([{ key: "icon", fn: function() {
return [_c("Pencil", { attrs: { "size": 20 } })];
}, proxy: true }], null, false, 580569589) }, [_vm._v(" " + _vm._s(_vm.t("viewer", "Edit")) + " ")]) : _vm._e(), _c("NcActionButton", { attrs: { "close-after-click": true }, on: { "click": _vm.toggleFullScreen }, scopedSlots: _vm._u([{ key: "icon", fn: function() {
Expand Down Expand Up @@ -24965,7 +24965,7 @@ var __component__$8 = /* @__PURE__ */ normalizeComponent$3(
_sfc_staticRenderFns$5,
false,
null,
"dbe1c71f",
"09be59e8",
null,
null
);
Expand Down
2 changes: 1 addition & 1 deletion js/viewer-main.mjs.map
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/views/Viewer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
:dark="true"
:data-handler="handlerId"
:enable-slideshow="hasPrevious || hasNext"
:slideshow-paused="editing"
:enable-swipe="canSwipe && !editing"
:has-next="hasNext"
:has-previous="hasPrevious"
Expand Down

0 comments on commit 8efa958

Please sign in to comment.