diff --git a/.eslintrc.yml b/.eslintrc.yml index 0a8e117c..f3cb69df 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -92,7 +92,7 @@ rules: vue/require-default-prop: off vue/no-v-html: off vue/no-use-v-if-with-v-for: off - vue/html-closing-bracket-newline: [error, {singleline: never, multiline: never}] + vue/html-closing-bracket-newline: error vue/multiline-html-element-content-newline: off vue/singleline-html-element-content-newline: off diff --git a/client/components/App.vue b/client/components/App.vue index 834598b2..74e27533 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -1,60 +1,72 @@ diff --git a/client/components/Channel.vue b/client/components/Channel.vue index b3df786b..2c564378 100644 --- a/client/components/Channel.vue +++ b/client/components/Channel.vue @@ -2,12 +2,14 @@ + :active-channel="activeChannel" + > {{ channel.name }} {{ channel.unread | roundBadgeNumber }} + class="badge" + >{{ channel.unread | roundBadgeNumber }} diff --git a/client/components/ChannelWrapper.vue b/client/components/ChannelWrapper.vue index fd495eb2..93a461ad 100644 --- a/client/components/ChannelWrapper.vue +++ b/client/components/ChannelWrapper.vue @@ -14,11 +14,13 @@ :aria-controls="'#chan-' + channel.id" :aria-selected="activeChannel && channel === activeChannel.channel" class="chan" - role="tab"> + role="tab" + > + :activeChannel="activeChannel" + /> diff --git a/client/components/Chat.vue b/client/components/Chat.vue index 07d9915a..2fe4b856 100644 --- a/client/components/Chat.vue +++ b/client/components/Chat.vue @@ -1,7 +1,8 @@ diff --git a/client/components/ChatInput.vue b/client/components/ChatInput.vue index c3695162..a7cf8e6c 100644 --- a/client/components/ChatInput.vue +++ b/client/components/ChatInput.vue @@ -3,7 +3,8 @@ id="form" method="post" action="" - @submit.prevent="onSubmit"> + @submit.prevent="onSubmit" + > {{ network.nick }}