Skip to content

added separator of top rows of each columns #10

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

Open
k3mpz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

added separator of top rows of each columns #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/assets/styles/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ body {
.appfg3 .fg70, .appfg3 .text-gray-700 { color: white !important; }
.appfg2 .border-gray-700 { border-color: white / 0.7; background-color: #383a40; }

.app-name-row { min-height: 24px; padding-top: 12px; padding-bottom: 12px; vertical-align: middle;}
.app-name-row { min-height: 24px; padding-top: 13px; padding-bottom: 12px; vertical-align: middle;}

.colorowner { color:var(--appbgowner); }
.coloradmin { color:var(--appbgadmin); }
Expand Down Expand Up @@ -353,6 +353,9 @@ hr {
width: 100%;
margin: 3px 0px 0px 0px;
}
.border-bottom-highlight {
border-bottom: 2px solid #1f2124;
}
.vue-simple-context-menu {
border: 1px solid #c7c7c7;
font-family: inherit;
Expand Down
18 changes: 9 additions & 9 deletions src/components/Community.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<TransitionRoot :show="showErrorModal != null">
<ErrorModal title="Error sending message." :text="showErrorModal" @close="toggleErrorModal"></ErrorModal>
</TransitionRoot>
<div class="appbg3 appfg3 h-full break-all ml-3" v-if='messageKey'>
<div class="appbg3 appfg3 h-full break-all" v-if='messageKey'>
<div class="border-l-1 h-full float-right sidebar" v-if="$route.name === 'CommunityPath' && community" ref="sidebar" :key="communityUsersKey">
<div class="appbg3 appfg3 h-full w-200 overflow-y-scroll scrollBox">
<div class="text-right border-bottom-highlight pt-3" style="padding-bottom: 19px;" @mouseenter="tooltip($event.target, $t('Community.OnlineJoined', [onlineCount]))"><small class="fg70">
{{onlineCount}}</small>
</div>
<div class="appbg3 appfg3 w-200 overflow-y-scroll scrollBox pl-3" style="height: 90%;">
<div class="scrollBoxContent">
<div class="pr-1 pl-1 appbg3">
<div class="text-right" @mouseenter="tooltip($event.target, $t('Community.OnlineJoined', [onlineCount]))"><small class="fg70">
{{onlineCount}}</small>
</div>
<div class="appbg3">
<div v-for="roleUsers in communityUsers">
<div v-if="roleUsers[0] != 'muted'">
<small :class="roleCss(roleUsers[0])"><b class="messageFontFamily">{{roleUsers[0]}}</b></small>
Expand Down Expand Up @@ -71,7 +71,7 @@
</div>
</div>
<div class="appbg2 appfg2 h-full flex flex-col justify-between">
<div class="font-bold border-b-1 mr-3" style="order:1;padding-top: 12px; padding-bottom: 12px; vertical-align: middle;">
<div class="font-bold border-b-1 border-bottom-highlight pl-3" style="order:1; padding-top: 19px; padding-bottom: 12px; vertical-align: middle;">
<span v-if="$route.name === 'Group' || $route.name === 'CommunityGroup' || route.name.startsWith('PrivateChat')" class="oi oi-lock-locked mr-1 lockColor" @mouseenter="tooltip($event.target, $t('Community.MessagesLock'))"></span>
<span class="cursor-pointer" @click.stop="setThread(null, $event.target)"><span class="oi oi-menu font-sm lineIcon md:hidden"></span>{{streamName}} <small class="streamName2">{{streamName2}}</small></span> <span v-if="threadName !== null" class="font-normal"><span class="oi oi-chevron-right cursor-pointer" style="font-size:10px;vertical-align:top;margin-top:6px;" @click="setThread(null)"></span> {{threadName}}</span>
<span class="inline-block" v-if="sharedCommunities">
Expand Down Expand Up @@ -102,7 +102,7 @@
</div>
</div>

<div ref="messages" :key="messageKey" class="grow overflow-y-scroll scrollBox" style="order:5;">
<div ref="messages" :key="messageKey" class="grow overflow-y-scroll scrollBox pl-3" style="order:5;">
<div class="scrollBoxContent flex flex-col pr-3">
<div v-if="threadName !== null" :class="[valueFlipMessageBox?'flex flex-col-reverse':'flex flex-col']">
<button v-if="canLoadPreviousMessages" class="btn" @click="loadPrevious()">{{loadingPreviousMessages?'loading':'load previous messages'}}</button>
Expand Down Expand Up @@ -157,7 +157,7 @@
</div>
</div>

<div :class="[valueFlipMessageBox?'flex flex-col-reverse pr-3':'flex flex-col pr-3']"
<div :class="[valueFlipMessageBox?'flex flex-col-reverse pr-3 pl-3':'flex flex-col pr-3 pl-3']"
:style="[valueFlipMessageBox?'order:3;':'order:7;']">
<div v-if="decodeNMessages>0">
<hr>
Expand Down
70 changes: 43 additions & 27 deletions src/components/StreamBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,51 @@
<TransitionRoot :show="showConfirmModal!=null">
<ConfirmModal :title="showConfirmModal.title" @close="showConfirmModal=null"></ConfirmModal>
</TransitionRoot>
<div class="m-0 overflow-y-scroll scrollBox pl-1 w-200" :key="updateKey">
<div class="scrollBoxContent flex flex-col pr-1">
<div v-if="isCommunity">
<div class="flex justify-between mb-1 app-name-row">
<b class="border-b-1 cursor-pointer p3033" @click.stop.prevent="showMenu($event.target)">C/{{title}}</b>
<router-link v-if="isAdmin" :to="`/s/${route.params.user}`">
<span class="oi oi-cog"></span>
</router-link>
</div>
<div v-for="stream in streams" >
<Stream v-if="stream.visible" :community="communityName"
:stream="stream" :number="''+stream.lastReadNumber"/>
</div>
</div>
<div v-else>
<div class="flex justify-between mb-1">
<b class="border-b-1 p3033">{{$t("StreamBar.DirectMessages")}}</b>
<button class="text-sm" @click="toggleNewUserMessageModalOpen">
<span class="oi oi-plus"></span>
</button>
</div>
<div v-for="conversation in conversations">
<Conversation v-if="conversation.id !== undefined" :conversation="conversation.conversation" :id="conversation.id" :username="conversation.username" :number="conversation.lastReadNumber+conversation.plus"/>
<Conversation v-else :conversation="conversation.conversation"
:username="username" :number="''+conversation.lastReadNumber" />
<!-- <div class="grow"> -->
<!-- <div v-if="isCommunity">
<div class="flex justify-between mb-1 app-name-row">
<b class="cursor-pointer p3033" @click.stop.prevent="showMenu($event.target)">C/{{title}}</b>
<router-link v-if="isAdmin" :to="`/s/${route.params.user}`">
<span class="oi oi-cog"></span>
</router-link>
</div>
<div v-for="stream in streams" >
<Stream v-if="stream.visible" :community="communityName"
:stream="stream" :number="''+stream.lastReadNumber"/>
</div>
</div> -->
<div>
<div class="flex justify-between mb-1 app-name-row border-bottom-highlight pl-3">
<b class="cursor-pointer p3033" @click.stop.prevent="showMenu($event.target)">C/{{title}}</b>
<router-link v-if="isAdmin" :to="`/s/${route.params.user}`">
<span class="oi oi-cog"></span>
</router-link>
</div>
</div>
<div class="m-0 overflow-y-scroll scrollBox w-200" :key="updateKey">
<div class="scrollBoxContent flex flex-col pl-3">
<div v-if="isCommunity">
<div v-for="stream in streams" >
<Stream v-if="stream.visible" :community="communityName"
:stream="stream" :number="''+stream.lastReadNumber"/>
</div>
</div>
<div v-else>
<div class="flex justify-between mb-1">
<b class="border-b-1 p3033">{{$t("StreamBar.DirectMessages")}}</b>
<button class="text-sm" @click="toggleNewUserMessageModalOpen">
<span class="oi oi-plus"></span>
</button>
</div>
<div v-for="conversation in conversations">
<Conversation v-if="conversation.id !== undefined" :conversation="conversation.conversation" :id="conversation.id" :username="conversation.username" :number="conversation.lastReadNumber+conversation.plus"/>
<Conversation v-else :conversation="conversation.conversation"
:username="username" :number="''+conversation.lastReadNumber" />
</div>
</div>
</div>
</div>
</div>
</div>
<!-- </div> -->
</template>
<script setup>
import { useAccountStore } from "../stores/account";
Expand Down