Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

画面横幅が小さいときのチャンネルヘッダーのレイアウトを変更 #4100

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

画面横幅が小さいときのチャンネルヘッダーのレイアウトを変更 #4100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
079fd27
画面横幅が小さいときのチャンネルヘッダーのレイアウトを変更
damin3A3 Oct 18, 2023
b56a4d5
トピックの変更の取り消しとアイコンの順序の修正
damin3A3 Oct 18, 2023
a4cea71
最終行の改行がなくなっていたのを直した
damin3A3 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/components/Main/MainView/ChannelView/ChannelHeader/ChannelHeaderToolsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@
:tooltip="qallLabel"
@click="toggleQall"
/>
<header-tools-item
:class="$style.notificationIcon"
:data-state="subscriptionChangeInfo.state"
:icon-name="subscriptionChangeInfo.iconName"
:disabled="!subscriptionChangeInfo.canChange"
:tooltip="subscriptionChangeInfo.tooltip"
@click="changeToNextSubscriptionLevel"
/>
</template>
<header-tools-item
v-if="isStared"
Expand All @@ -36,6 +28,14 @@
tooltip="お気に入りに追加する"
@click="starChannel"
/>
<header-tools-item
:class="$style.notificationIcon"
:data-state="subscriptionChangeInfo.state"
:icon-name="subscriptionChangeInfo.iconName"
:disabled="!subscriptionChangeInfo.canChange"
:tooltip="subscriptionChangeInfo.tooltip"
@click="changeToNextSubscriptionLevel"
/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

今と順番が逆になってしまっているので、順番は同じままにしてほしいです！

↓順に今のPC、変更後のPC、変更後のスマホ
image
image
image

<div :class="$style.moreButton">
<slot />
<header-tools-item
Expand Down
16 changes: 10 additions & 6 deletions src/components/Main/MainView/ChannelView/ChannelHeader/ChannelHeaderTopic.vue
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

すみません、やっぱりこのファイルの変更は一旦消しておいてほしいです:pray:
多分後で別PRで、トピックをチャンネル名の下に表示するような感じにすると思います(デザインチームともうちょっと話し合うとは思いますが)
https://md.trap.jp/8kLQ2b3BRVOS0yB4OnnC3Q#%E3%83%81%E3%83%A3%E3%83%B3%E3%83%8D%E3%83%AB%E3%83%98%E3%83%83%E3%83%80%E3%83%BC%E3%81%AE%E3%83%88%E3%83%94%E3%83%83%E3%82%AF

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ちなみに、もしトピックを消すとするならここではなくて、このコンポーネントを使っているChannelHeader.vueで<channel-header-topic :class="$style.topic" :channel-id="channelId" />に直接v-ifをつけるような変更になると思います

Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<template>
<div v-if="topic" :class="$style.container">
<inline-markdown
:class="$style.topic"
:content="topic"
:title="topic"
accept-action
/>
<template v-if="!isMobile">
<inline-markdown
:class="$style.topic"
:content="topic"
:title="topic"
accept-action
/>
</template>
</div>
</template>

Expand All @@ -14,13 +16,15 @@ import InlineMarkdown from '/@/components/UI/InlineMarkdown.vue'
import { computed } from 'vue'
import type { ChannelId } from '/@/types/entity-ids'
import { useChannelsStore } from '/@/store/entities/channels'
import { useResponsiveStore } from '/@/store/ui/responsive'

const props = defineProps<{
channelId: ChannelId
}>()

const { channelsMap } = useChannelsStore()
const topic = computed(() => channelsMap.value.get(props.channelId)?.topic)
const { isMobile } = useResponsiveStore()
</script>

<style lang="scss" module>
Expand Down