fix padding with safe-area-inset-bottom

misskey-dev · Aug 14, 2022 · afcdd6e · afcdd6e
1 parent dddc076
commit afcdd6e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
@@ -433,6 +433,10 @@ defineExpose({
 				}
 			}
 		}
+
+		> .search:not(:focus):not(.filled) {
+			margin-bottom: env(safe-area-inset-bottom);
+		}
 	}
 
 	> .search {

diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/launch-pad.vue
@@ -75,7 +75,7 @@ function close() {
 
 	&.asDrawer {
 		width: 100%;
-		padding: 16px 16px calc(env(safe-area-inset-bottom, 0px) + 16px) 16px;
+		padding: 16px 16px max(env(safe-area-inset-bottom, 0px), 16px) 16px;
 		border-radius: 24px;
 		border-bottom-right-radius: 0;
 		border-bottom-left-radius: 0;

diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue
@@ -335,7 +335,7 @@ onBeforeUnmount(() => {
 	}
 
 	&.asDrawer {
-		padding: 12px 0 calc(env(safe-area-inset-bottom, 0px) + 12px) 0;
+		padding: 12px 0 max(env(safe-area-inset-bottom, 0), 12px) 0;
 		width: 100%;
 		border-radius: 24px;
 		border-bottom-right-radius: 0;

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
@@ -336,7 +336,6 @@ definePageMetadata(computed(() => !fetching ? user ? {
 		z-index: 2;
 		bottom: 0;
 		padding-top: 8px;
-		bottom: calc(env(safe-area-inset-bottom, 0px) + 8px);
 
 		> .new-message {
 			width: 100%;

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
@@ -288,7 +288,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 		z-index: 1000;
 		bottom: 0;
 		left: 0;
-		padding: 16px 16px calc(env(safe-area-inset-bottom, 0px) + 16px) 16px;
+		padding: 16px 16px max(env(safe-area-inset-bottom, 0px), 16px) 16px;
 		display: flex;
 		width: 100%;
 		box-sizing: border-box;