Skip to content

Commit

Permalink
Merge pull request #41 from kimpearl3599/main
Browse files Browse the repository at this point in the history
[Merge request] modify css
  • Loading branch information
Sahayana authored Mar 31, 2022
2 parents 8a1ea09 + ae98b08 commit 16d9df2
Show file tree
Hide file tree
Showing 12 changed files with 160 additions and 109 deletions.
5 changes: 3 additions & 2 deletions chat/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def post_data_to_chat_room(request, room_id):
limit = len(last_messages) - 20
if len(last_messages) > 20:
last_messages = last_messages[limit:]
latest_created_message = ChatMessage.objects.filter(chatroom_id=room_id).order_by('-created_at')[0]

# latest_created_message = ChatMessage.objects.filter(chatroom_id=room_id).order_by('-created_at')[0]

if chatroom.participant1.id == user.id:
participant = chatroom.participant2
Expand All @@ -96,7 +97,7 @@ def post_data_to_chat_room(request, room_id):
"participant": participant,
"all_message": all_message,
"last_messages": last_messages,
"latest_created_message": latest_created_message,
# "latest_created_message": latest_created_message,
"participant_like_youtube": participant_like_youtube,
"participant_like_news": participant_like_news,
"participant_like_book": participant_like_book,
Expand Down
14 changes: 14 additions & 0 deletions static/css/chat/chat_room.css
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,20 @@ body {
align-items: center;
justify-content: space-between;
}
#toggle_content {
display: none;
font-size: 14px;
color: #5e5e5e;
background-color: #fff;
padding: 4px 0;
box-sizing: border-box;
max-width: 120px;
width: 100%;
position: absolute;
right: 0;
top: 60px;
cursor: pointer;
}

.chat_container .top_bar .toggle_content {
display: none;
Expand Down
3 changes: 2 additions & 1 deletion static/css/landing/landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -774,13 +774,14 @@ body::-webkit-scrollbar-track {
width: 8vw;
height: 8vw;
background-color: #020167;
border-radius: 4vw;
border-radius: 50%;
margin: 0 auto;
}

.landing_footer_developer_profile img {
width: 100%;
height: 100%;
border-radius: 50%;
}

.landing_footer_developer_name_box {
Expand Down
Loading

0 comments on commit 16d9df2

Please sign in to comment.