Skip to content

Commit 7f1442a

Browse files
committed
(UI) clean
1 parent fc801cc commit 7f1442a

File tree

2 files changed

+48
-53
lines changed

2 files changed

+48
-53
lines changed

src/ChatWindow/RoomsList.vue

Lines changed: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="rooms-container app-border-r">
3-
<div class="box-search app-border-b">
3+
<div class="box-search">
44
<div class="icon-search">
55
<svg-icon name="search" />
66
</div>
@@ -23,30 +23,28 @@
2323

2424
<!-- :class="{ 'room-disabled': loadingMessages }" -->
2525
<div v-if="!loadingRooms" class="room-list">
26-
<div class="room-group">
26+
<div
27+
class="room-item"
28+
v-for="room in filteredRooms"
29+
:key="room.roomId"
30+
:class="{ 'room-selected': selectedRoomId === room.roomId }"
31+
@click="openRoom(room)"
32+
>
2733
<div
28-
class="room-item"
29-
v-for="room in filteredRooms"
30-
:key="room.roomId"
31-
:class="{ 'room-selected': selectedRoomId === room.roomId }"
32-
@click="openRoom(room)"
33-
>
34-
<div
35-
v-if="room.avatar"
36-
class="room-avatar"
37-
:style="{ background: `url(${room.avatar})` }"
38-
></div>
39-
<div class="name-container">
40-
<div class="room-name">{{ room.roomName }}</div>
41-
<div class="room-name text-last" v-if="room.lastMessage">
42-
<span v-if="room.lastMessage.seen">
43-
<svg-icon name="checkmark" class="icon-check" />
44-
</span>
45-
<span>{{ room.lastMessage.content }}</span>
46-
</div>
47-
<div class="room-name text-date" v-if="room.lastMessage">
48-
{{ room.lastMessage.timestamp }}
49-
</div>
34+
v-if="room.avatar"
35+
class="room-avatar"
36+
:style="{ background: `url(${room.avatar})` }"
37+
></div>
38+
<div class="name-container">
39+
<div class="room-name">{{ room.roomName }}</div>
40+
<div class="room-name text-last" v-if="room.lastMessage">
41+
<span v-if="room.lastMessage.seen">
42+
<svg-icon name="checkmark" class="icon-check" />
43+
</span>
44+
<span>{{ room.lastMessage.content }}</span>
45+
</div>
46+
<div class="room-name text-date" v-if="room.lastMessage">
47+
{{ room.lastMessage.timestamp }}
5048
</div>
5149
</div>
5250
</div>
@@ -116,6 +114,7 @@ export default {
116114
align-items: center;
117115
height: 64px;
118116
padding: 0 20px;
117+
margin-top: 5px;
119118
}
120119
121120
.icon-search {
@@ -156,52 +155,48 @@ input {
156155
margin: 40px 0;
157156
}
158157
159-
.rooms-list {
160-
display: block;
161-
position: static;
162-
}
163-
164-
.room-group {
158+
.room-list {
165159
-webkit-box-flex: 0;
166160
flex: 0 1 auto;
167161
position: relative;
168162
max-width: 100%;
169-
background: var(--chat-text-color);
170163
cursor: pointer;
171-
172-
:not(:hover) {
173-
-webkit-transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
174-
transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
175-
}
176-
177-
:hover {
178-
background: var(--chat-sidemenu-bg-color-hover);
179-
-webkit-transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
180-
transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
181-
}
182-
}
183-
184-
.room-selected {
185-
color: var(--chat-sidemenu-color-active) !important;
186-
background: var(--chat-sidemenu-bg-color-active) !important;
187-
188-
:hover {
189-
background: var(--chat-sidemenu-bg-color-active);
190-
}
164+
padding: 5px 10px;
191165
}
192166
193167
.room-item {
194-
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
168+
border-radius: 8px;
195169
-webkit-box-align: center;
196170
align-items: center;
197171
display: -webkit-box;
198172
-webkit-box-flex: 1;
199173
flex: 1 1 100%;
174+
margin-bottom: 5px;
200175
padding: 0 16px;
201176
position: relative;
202177
min-height: 71px;
203178
}
204179
180+
.room-item:hover {
181+
background: var(--chat-sidemenu-bg-color-hover);
182+
-webkit-transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
183+
transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
184+
}
185+
186+
.room-item:not(:hover) {
187+
-webkit-transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
188+
transition: background-color 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
189+
}
190+
191+
.room-selected {
192+
color: var(--chat-sidemenu-color-active) !important;
193+
background: var(--chat-sidemenu-bg-color-active) !important;
194+
195+
:hover {
196+
background: var(--chat-sidemenu-bg-color-active);
197+
}
198+
}
199+
205200
.name-container {
206201
-webkit-box-align: center;
207202
align-items: center;

src/themes/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const defaultThemeColors = {
66
colorPlaceholder: '#9ca6af',
77
colorCaret: '#1976d2',
88
colorSpinner: '#333',
9-
borderStyle: '1px solid #d3dde7',
9+
borderStyle: '1px solid #e1e4e8',
1010
backgroundScrollIcon: '#fff'
1111
},
1212

0 commit comments

Comments
 (0)