Skip to content

Commit 1e6f7b2

Browse files
GaneshKanduGaneshKandu
committed
UI Fixes
1 parent 1f35653 commit 1e6f7b2

File tree

8 files changed

+25
-211
lines changed

8 files changed

+25
-211
lines changed

‎public/css/kchat.css

Lines changed: 18 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -29,49 +29,13 @@ body {
2929
position: relative;
3030
}
3131

32-
/* Rounded sliders */
33-
/*-------------------------------------------------------------------*/
34-
/* === Email === */
35-
/* Mail Sidebar */
36-
@media (max-width: 769px) {
37-
.email-wrapper .mail-sidebar {
38-
position: relative;
39-
height:100%;
40-
}
41-
}
42-
43-
@media (max-width: 767.98px) {
44-
.email-wrapper .mail-sidebar {
45-
position: fixed;
46-
z-index: 99;
47-
background: #ffffff;
48-
width: 45%;
49-
min-width: 300px;
50-
left: -100%;
51-
display: block;
52-
transition: 0.4s ease;
53-
-webkit-transition: 0.4s ease;
54-
-moz-transition: 0.4s ease;
55-
}
56-
}
57-
5832
.email-wrapper .mail-sidebar .menu-bar {
5933
width: 100%;
6034
float: right;
6135
height: 100%;
6236
min-height: 100%;
6337
}
6438

65-
@media (max-width: 767.98px) {
66-
.email-wrapper .mail-sidebar .menu-bar {
67-
min-height: 100vh;
68-
max-height: 100%;
69-
height: auto;
70-
overflow-y: auto;
71-
overflow-x: hidden;
72-
}
73-
}
74-
7539
.email-wrapper .mail-sidebar .menu-bar .menu-items {
7640
padding: 0;
7741
margin-bottom: 0;
@@ -83,8 +47,6 @@ list-style-type: none;
8347
padding: 10px 15px;
8448
transition: 0.4s;
8549
position: relative;
86-
display: -webkit-flex;
87-
display: flex;
8850
-webkit-align-items: center;
8951
align-items: center;
9052
-webkit-justify-content: space-between;
@@ -623,52 +585,6 @@ img {
623585
height: 0
624586
}
625587

626-
@media only screen and (max-width: 767px) {
627-
.chat-app .people-list {
628-
height: 465px;
629-
width: 100%;
630-
overflow-x: auto;
631-
background: #fff;
632-
left: -400px;
633-
display: none
634-
}
635-
.chat-app .people-list.open {
636-
left: 0
637-
}
638-
.chat-app .chat {
639-
margin: 0
640-
}
641-
.chat-app .chat .chat-header {
642-
border-radius: 0.55rem 0.55rem 0 0
643-
}
644-
.chat-app .chat-history {
645-
height: 300px;
646-
overflow-x: auto
647-
}
648-
}
649-
650-
@media only screen and (min-width: 768px) and (max-width: 992px) {
651-
.chat-app .chat-list {
652-
height: 650px;
653-
overflow-x: auto
654-
}
655-
.chat-app .chat-history {
656-
height: 600px;
657-
overflow-x: auto
658-
}
659-
}
660-
661-
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 1) {
662-
.chat-app .chat-list {
663-
height: 480px;
664-
overflow-x: auto
665-
}
666-
.chat-app .chat-history {
667-
height: calc(100vh - 350px);
668-
overflow-x: auto
669-
}
670-
}
671-
672588
.mail-view {
673589
padding: 20px;
674590
border-bottom: 2px solid #fff;
@@ -804,4 +720,22 @@ input {
804720
.file-ul {
805721
background-color: #e8f1f3;
806722
padding: 10px;
723+
}
724+
725+
/*
726+
element {
727+
display: inline;
728+
}
729+
*/
730+
731+
@media (max-width: 992px) {
732+
.mail-sidebar{
733+
display: none;
734+
}
735+
}
736+
737+
@media (min-width: 993px) {
738+
.mail-sidebar{
739+
display: block;
740+
}
807741
}

‎public/css/msg.css

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -205,49 +205,3 @@
205205
clear: both;
206206
height: 0
207207
}
208-
209-
@media only screen and (max-width: 767px) {
210-
.chat-app .people-list {
211-
height: 465px;
212-
width: 100%;
213-
overflow-x: auto;
214-
background: #fff;
215-
left: -400px;
216-
display: none
217-
}
218-
.chat-app .people-list.open {
219-
left: 0
220-
}
221-
.chat-app .chat {
222-
margin: 0
223-
}
224-
.chat-app .chat .chat-header {
225-
border-radius: 0.55rem 0.55rem 0 0
226-
}
227-
.chat-app .chat-history {
228-
height: 300px;
229-
overflow-x: auto
230-
}
231-
}
232-
233-
@media only screen and (min-width: 768px) and (max-width: 992px) {
234-
.chat-app .chat-list {
235-
height: 650px;
236-
overflow-x: auto
237-
}
238-
.chat-app .chat-history {
239-
height: 600px;
240-
overflow-x: auto
241-
}
242-
}
243-
244-
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 1) {
245-
.chat-app .chat-list {
246-
height: 480px;
247-
overflow-x: auto
248-
}
249-
.chat-app .chat-history {
250-
height: calc(100vh - 350px);
251-
overflow-x: auto
252-
}
253-
}

‎public/js/kchat.msg.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ $(document).ready (function(){
8282
}
8383

8484
if(element.unread != undefined){
85-
element.unread = "<span class=\"badge badge-pill badge-success ml-1\">"+element.unread+"</span>";
85+
element.unread = "<small class=\"chat-alert label label-danger mt-2\">"+element.unread+"</small>";
8686
}else{
8787
element.unread = "";
8888
}
@@ -92,10 +92,11 @@ $(document).ready (function(){
9292
<a href="/messages/?chat=${ element.conversation_id }" class="clearfix">
9393
<img src="${ element.photo }" alt="" class="img-circle">
9494
<div class="friend-name">
95-
<strong>${ element.conversation_name }${ element.unread }<!--i class="mdi mdi-star favorite"></i--></strong>
95+
<strong>${ element.conversation_name }<!--i class="mdi mdi-star favorite"></i--></strong>
9696
</div>
9797
<div class="last-message text-muted"><strong>${ element.first_name } ${ element.last_name } : </strong>${ element.message }</div>
9898
<small class="time text-muted timestamp"> ${ element.date } </small>
99+
${ element.unread }
99100
<small class="chat-alert text-muted">
100101
<!-- i class="fa fa-check"></i-->
101102
</small>

‎resources/views/admin/activity.blade.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎resources/views/admin/master.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="content-wrapper full-height">
1515
<div class="email-wrapper wrapper full-height">
1616
<div class="row align-items-stretch full-height">
17-
<div class="mail-sidebar d-none d-lg-block col-md-2 pt-3 bg-white height10">
17+
<div class="mail-sidebar col-12 col-md-2 pt-3 bg-white height10">
1818
<div class="menu-bar">
1919
<ul class="menu-items">
2020
<li class="compose mb-3">

‎resources/views/common/msg.blade.php

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,7 @@
2222
<input class="form-control w-100" type="search" placeholder="Search Conversation" data-toggle="modal" data-target="#search_conversation" id="Mail-rearch">
2323
</div>
2424
</div>
25-
<ul class="friend-list" id="MessageBox">
26-
<!--li class="active bounceInDown">
27-
<a href="#" class="clearfix">
28-
<img src="https://bootdey.com/img/Content/user_1.jpg" alt="" class="img-circle">
29-
<div class="friend-name">
30-
<strong>John Doe<i class="mdi mdi-star-outline"></i></strong>
31-
</div>
32-
<div class="last-message text-muted">Hello, Are you there?</div>
33-
<small class="time text-muted">Just now</small>
34-
<small class="chat-alert label label-danger">1</small>
35-
</a>
36-
</li>
37-
<li class="bounceInDown">
38-
<a href="#" class="clearfix">
39-
<img src="https://bootdey.com/img/Content/user_2.jpg" alt="" class="img-circle">
40-
<div class="friend-name">
41-
<strong>Jane Doe<i class="mdi mdi-star favorite"></i></strong>
42-
</div>
43-
<div class="last-message text-muted">Lorem ipsum dolor sit amet.</div>
44-
<small class="time text-muted">5 mins ago</small>
45-
<small class="chat-alert text-muted">
46-
<i class="fa fa-check"></i>
47-
</small>
48-
</a>
49-
</li-->
50-
</ul>
25+
<ul class="friend-list" id="MessageBox"></ul>
5126
</div>
5227
<div id="kchat-msg" class="col-md-9 col-lg-7 bg-white chat height10 px-0 py-0">
5328
@if($conversation)
@@ -72,7 +47,7 @@
7247
</div>
7348
<div class="chat-history" id="Msgs" style="min-height: 50%;" >
7449
<image id="loading" src="/assets/loading.gif"></image>
75-
<ul class="m-b-0" id="Messages"></ul>
50+
<ul class="pl-3 pr-3" id="Messages"></ul>
7651
<button type="button" id="gotobottom" class="btn btn-outline-secondary"><i class="fa fa-chevron-down"></i></button>
7752
</div>
7853
<div class="chat-message clearfix">

‎resources/views/user/activity.blade.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎resources/views/user/master.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="content-wrapper full-height">
1515
<div class="email-wrapper wrapper full-height">
1616
<div class="row align-items-stretch full-height">
17-
<div class="mail-sidebar d-none d-lg-block col-md-2 pt-3 bg-white height10">
17+
<div class="mail-sidebar col-md-2 pt-3 bg-white height10">
1818
<div class="menu-bar">
1919
<ul class="menu-items">
2020
<li class="compose mb-3">

0 commit comments

Comments
 (0)