Skip to content

Commit

Permalink
聊天样式修改
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniele-rapagnaniq
daniele-rapagnaniq committed Nov 25, 2029
1 parent dc1a9f9 commit 0e1a237
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 63 deletions.
6 changes: 4 additions & 2 deletions Application/Common/View/Public/right_chat_panel.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<if condition="(is_login()) ">
<div id="right_panel" class="friend_panel visible-md visible-lg" style="display: none">
<a class="btn-pull" onclick="show_panel()"><i class="glyphicon glyphicon-chevron-left"></i>
<div id="right_panel" class="friend_panel visible-md visible-lg" style="display: none;">
<a class="btn-pull" onclick="show_panel()"> <img style="width: 30px" src="__PUBLIC__/Core/images/friend.png"/> </i>
<script>
function show_panel() {
var $right_panel = $('#right_panel_main');
Expand All @@ -17,9 +17,11 @@
<if condition="count($currentSession) eq 0">

<div id="right_panel_main" style="display: none">
正在载入中......
</div>
<else/>
<div id="right_panel_main">
正在载入中......
</div>
<!--开始聊天板-->
</if>
Expand Down
45 changes: 24 additions & 21 deletions Application/Usercenter/View/default/Session/panel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@
</php>
<div id="session_panel_main">
<h2>快捷聊天</h2>
<div class="session_spliter"></div>


<div class="session_more clearfix">
<a title="聊天面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 active tab_chat">正在聊天</i>
</a>
<a title="好友面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 tab_friend">我的好友</i>
</a>
</div>

<div id="scrollArea_session" class="row ">
<div id="scrollContainer_session">
Expand All @@ -21,21 +15,21 @@ <h2>快捷聊天</h2>
<div class="row">
<div class="col-md-6">
<a title=" {$session.title|op_t} " class="session_ico" onclick="open_chat_box({$session.id})">
<img src="{$session.first_user.avatar64}" class="avatar-img" style="width: 45px;">
<img src="{$session.first_user.avatar64}" class="avatar-img" style="width: 50px;max-width: 200%">
<eq name="session.new" value="1">
<span class="badge_new">&nbsp;</span>
</eq>
</a>
</div>
<div class="col-md-6">
<div class="col-md-6" style="padding-left: 0">
<div>
<a class="text-more " style="width: 100%" target="_blank"
title="{$session.title|op_t}" >
{$session.title}
</a>
</div>
<div>
<a onclick="chat_exit({$session.id})"><i style="color: red" title="退出聊天"
<a onclick="chat_exit({$session.id})"><i style="color: white" title="退出聊天"
class="glyphicon glyphicon-off"></i></a>
</div>
</div>
Expand All @@ -46,8 +40,16 @@ <h2>快捷聊天</h2>
</volist>
</ul>
</div>
</div>

</div>
<div class="session_more clearfix">
<a title="聊天面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 active tab_chat">正在聊天</i>
</a>
<a title="好友面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 tab_friend">我的好友</i>
</a>
</div>

<script>
$('#scrollArea_session').slimScroll({
Expand All @@ -64,15 +66,8 @@ <h2>快捷聊天</h2>
$friends=D('Common/Follow')->getAllFriends();
</php>
<h2>快捷聊天</h2>
<div class="session_spliter"></div>

<div class="session_more">
<a title="聊天面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 tab_chat">正在聊天</i>
</a>
<a title="好友面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 active tab_friend">我的好友</i>
</a>
</div>
<div id="scrollArea_friend" class="row ">
<div id="scrollContainer_friend">
<ul class="friend_list">
Expand All @@ -88,7 +83,7 @@ <h2>快捷聊天</h2>
<img src="{$friend.avatar64}" class="avatar-img" style="width: 45px;">
</a>
</div>
<div class="col-md-6">
<div class="col-md-6" style="padding-left: 0">
<div>
<a class="text-center" style="width: 100%" target="_blank"
title=" {$friend.nickname|op_t}"
Expand All @@ -108,6 +103,14 @@ <h2>快捷聊天</h2>
</ul>
</div>
</div>
<div class="session_more">
<a title="聊天面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 tab_chat">正在聊天</i>
</a>
<a title="好友面板" onclick="$('#friend_panel_main').toggle();$('#session_panel_main').toggle()"
class="btn_session_more col-md-6 active tab_friend">我的好友</i>
</a>
</div>
<script>
$('#scrollArea_friend').slimScroll({
height: '430px',
Expand Down
45 changes: 28 additions & 17 deletions Public/Core/css/oneplus.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -905,37 +905,44 @@ General list for item with image
}
.friend_panel .btn-pull {
position: absolute;
background: #ffffff;
padding: 37px 0px;
border: 1px solid #cccccc;
border: 1px solid #029775;
background: #03AE87;
padding: 15px 7px;
border-right: 0;
margin-right: 0;
left: -15px;
margin-top: -31px;
left: -45px;
margin-top: -25px;
border-radius: 5px;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}
.friend_panel #right_panel_main {
border: 1px solid #ccc;
border: 1px solid #029775;
border-right: 0;
height: 520px;
height: 500px;
margin-top: -250px;
background: white;
background: #03b88f;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.friend_panel #right_panel_main #friend_panel_main {
width: 132px;
width: 150px;
}
.friend_panel #right_panel_main #session_panel_main {
width: 132px;
width: 150px;
}
.friend_panel #right_panel_main h2 {
border-top-left-radius: 3px;
font-size: 16px;
color: #797979;
color: white;
text-align: center;
padding-top: 5px;
background: #434343;
margin-bottom: 0;
display: block;
}
.friend_panel #right_panel_main .session_spliter {
height: 0px;
border-bottom: 1px solid #029775;
}
.friend_panel .friend_list {
margin-left: 15px;
Expand All @@ -948,6 +955,7 @@ General list for item with image
padding: 10px;
}
.friend_panel .friend_list li a {
color: white !important;
display: inline-block;
margin-bottom: 10px;
position: relative;
Expand All @@ -965,35 +973,38 @@ General list for item with image
display: inline-block;
}
.friend_panel .friend_list .active {
background: #f6f6f6;
background: #05CC9F;
}
.friend_panel .session_more {
height: 38px;
color: white !important;
}
.friend_panel .session_more .active {
border: 0 !important;
}
.friend_panel .session_more .tab_chat {
border: 1px solid #BABABA;
border-top: 0;
border-left: 0;
border-bottom-left-radius: 3px;
margin-top: 1px;
}
.friend_panel .session_more .tab_friend {
border: 1px solid #BABABA;
border-top: 0;
border-right: 0;
margin-top: 1px;
}
.friend_panel .session_more .btn_session_more {
background: #D2D2D2;
color: white !important;
text-align: center;
padding: 8px 0;
margin-left: 0;
margin-right: 0;
display: block;
float: left;
color: #5F5F5F;
margin-top: 1px;
}
.friend_panel .session_more .active {
color: #029775 !important;
background: #ffffff;
}
#chat_box {
Expand Down
61 changes: 38 additions & 23 deletions Public/Core/css/oneplus.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,39 +985,49 @@ General list for item with image
z-index: 999;
.btn-pull {
position: absolute;
background: rgb(255, 255, 255);
padding: 37px 0px;
border: 1px solid rgb(204, 204, 204);
border: 1px solid #029775;
background: #03AE87;
padding: 15px 7px;
border-right: 0;
margin-right: 0;
left: -15px;
margin-top: -31px;
left: -45px;
margin-top: -25px;
border-radius: 5px;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
i {
}

}

#right_panel_main {
#friend_panel_main {
width: 132px;
width: 150px;
}
#session_panel_main {
width: 132px;
width: 150px;
}
h2 {
border-top-left-radius: 3px;
font-size: 16px;
color: #797979;
color: white;
text-align: center;
padding-top: 5px;
background: #434343;
margin-bottom: 0;

display: block;
}
border: 1px solid #ccc;
.session_spliter{
height: 0px;
border-bottom: 1px solid #029775;
}
border: 1px solid #029775;
border-right: 0;
height: 520px;
height: 500px;
margin-top: -250px;
background: white;


background: #03b88f;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
Expand All @@ -1032,6 +1042,7 @@ General list for item with image
padding: 10px;

a {
color:white !important;
display: inline-block;
margin-bottom: 10px;
position: relative;
Expand All @@ -1050,35 +1061,39 @@ General list for item with image
}
}
.active {
background: #f6f6f6;
background: #05CC9F;
}
}
.session_more {
height: 38px;
color:white !important;

.active {
border: 0 !important;
}
.tab_chat {
border: 1px solid #BABABA;
border-top: 0;
border-left: 0;
border-bottom-left-radius: 3px;
margin-top:1px;
}
.tab_friend {
border: 1px solid #BABABA;
border-top: 0;
border-right: 0;
margin-top:1px;
}
.btn_session_more {
background: #D2D2D2;
color:white !important;
text-align: center;
padding: 8px 0;
margin-left: 0;
margin-right: 0;
display: block;
float: left;
color: #5F5F5F;
margin-top:1px;
}
.active {
color:#029775 !important;
background: rgb(255, 255, 255);
}
}
Expand Down Expand Up @@ -1325,7 +1340,7 @@ a:hover {
/*悬浮样式end*/

.nav_bar {
.nav_item{
.nav_item {
position: relative;
}
background: white;
Expand All @@ -1343,7 +1358,7 @@ a:hover {
background: white;
}
}
.badge{
.badge {
margin-left: 5px;
}
}
Expand Down Expand Up @@ -1603,8 +1618,8 @@ a:hover {
display: block;
padding: 3px 15px;
}
.btn-default{
// background: rgb(241, 241, 241) !important;
.btn-default {
// background: rgb(241, 241, 241) !important;
}
}

Expand All @@ -1616,9 +1631,9 @@ a:hover {
position: relative;
}


/*编辑器修复*/
.edui-btn-toolbar{
.edui-btn-toolbar {
background: white;
}

/*编辑器修复end*/
Binary file added Public/Core/images/friend.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0e1a237

Please sign in to comment.