From 4fe20bae9cd2c5558813b1bd01c145015daace4d Mon Sep 17 00:00:00 2001 From: YoheiZuho Date: Sun, 2 Jul 2023 08:09:04 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB?= =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=A7=E5=B4=A9=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/ui/components/columns_area.js | 6 ++++ app/javascript/styles/plugin.scss | 35 ++++++++++++------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index 340bf6e3e..af773629a 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -164,6 +164,12 @@ export default class ColumnsArea extends ImmutablePureComponent { +
+
+ +
+
+ ); } else { diff --git a/app/javascript/styles/plugin.scss b/app/javascript/styles/plugin.scss index bbeab2555..5725a4485 100644 --- a/app/javascript/styles/plugin.scss +++ b/app/javascript/styles/plugin.scss @@ -14,21 +14,32 @@ border-radius: 50%; } -.tab-ber-bottom .timeline{ - width:100%; - height: calc(100% - 55px); - margin: 0 0 50px 0; +.tab-ber-bottom .navber { + display: none; } -.tab-ber-bottom .navber{ - width:100%; - bottom: 0; - position: fixed; -} +@media screen and (max-width: 630px) { + .tab-ber-bottom .timeline{ + width:100%; + height: calc(100% - 55px); + margin: 0 0 50px 0; + } -.tab-ber-bottom .navber .tabs-bar__wrapper{ - bottom: 0; - width: 100%; + .tab-ber-bottom .navber{ + display: flex; + width:100%; + bottom: 0; + position: fixed; + } + + .tab-ber-bottom .navber .tabs-bar__wrapper{ + bottom: 0; + width: 100%; + } + + .columns-area__panels__pane--navigational{ + display: none; + } } //ここまで下タブバーの実装 \ No newline at end of file From 9f9e3234ddb5875f6eecbcdda3b8496e2d061cc3 Mon Sep 17 00:00:00 2001 From: YoheiZuho Date: Sun, 2 Jul 2023 08:09:16 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mastodon/features/ui/components/tabs_bar.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js index e919a1e25..417c9defa 100644 --- a/app/javascript/mastodon/features/ui/components/tabs_bar.js +++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js @@ -10,11 +10,11 @@ import { isUserTouching } from '../../../is_mobile'; import Icon from 'mastodon/components/icon'; export const links = [ - , - , - , - , - , + , + , + , + , + , , ];