From a91f76a6d0ca6673345e9145397d5ad0a3cc2462 Mon Sep 17 00:00:00 2001 From: Mirko Lemme Date: Tue, 10 Nov 2020 11:52:04 +0100 Subject: [PATCH 1/2] fixiating sass version in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c365e57cf..1f5988bbc 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "json-loader": "^0.5.4", "mongodb": "^3.1.10", "multer": "^1.4.1", - "sass": "^1.16.0", + "sass": "1.25.0", "semver": "^5.6.0", "webpack": "^4.28.1", "webpack-cli": "^3.3.0" From 10b63f2fbda7adb42673926ecc962868b13c0542 Mon Sep 17 00:00:00 2001 From: Mirko Lemme Date: Tue, 10 Nov 2020 11:55:16 +0100 Subject: [PATCH 2/2] hotfix for media dialog views not breaking when showing portrait images --- style/modal/mediaBrowser.scss | 9 +++++---- style/widget/media.scss | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/style/modal/mediaBrowser.scss b/style/modal/mediaBrowser.scss index f05395dff..ab163f1e5 100644 --- a/style/modal/mediaBrowser.scss +++ b/style/modal/mediaBrowser.scss @@ -6,7 +6,7 @@ &__body { display: flex; padding: 0; - + @include tablet { display: block; } @@ -56,15 +56,16 @@ height: 20rem; position: relative; border: 1px solid transparent; + display: flex; &:hover { border-color: var(--color-action-500); } - + @include tablet { max-width: calc(100% / 2); } - + @include phone { max-width: 100%; } @@ -93,7 +94,7 @@ color: var(--color-default-text); border-radius: var(--border-radius-small); } - + &:hover &__name { background-color: var(--color-action-500); color: var(--color-action-text); diff --git a/style/widget/media.scss b/style/widget/media.scss index 13be53279..d69674dbc 100644 --- a/style/widget/media.scss +++ b/style/widget/media.scss @@ -2,7 +2,8 @@ max-width: 100%; display: flex; flex-direction: column; - + height: 100%; + &.small { width: 10rem; } @@ -10,7 +11,7 @@ &.small &__preview { height: 10rem; } - + &__placeholder { @include spinner; } @@ -35,7 +36,7 @@ &:not(.readonly) { cursor: pointer; - + &:hover { border-color: var(--color-action-500); background-color: var(--color-action-500); @@ -51,6 +52,9 @@ font-size: 2rem; position: relative; z-index: 100; + object-fit: contain; + max-height: 100%; + max-width: 100%; } }