Merge pull request #1858 from aragonc/1.11.x

fix css chat
pull/2487/head
Alex Aragon Calixto 8 years ago committed by GitHub
commit 0ac2781da0
  1. 8
      app/Resources/public/css/base.css
  2. 44
      main/inc/lib/javascript/chat/css/chat.css
  3. 8
      main/inc/lib/javascript/chat/js/chat.js

@ -226,7 +226,7 @@ header{
/* notifications help and bug */ /* notifications help and bug */
.notification-panel { .notification-panel {
position: fixed; position: fixed;
top: 280px; top: 200px;
right: -10px; right: -10px;
z-index:9999; z-index:9999;
width: 73px; width: 73px;
@ -5609,7 +5609,7 @@ a.sessionView {
} }
#listFriends .list-group-item{ #listFriends .list-group-item{
border: none; border: none;
padding: 6px; padding: 0;
font-size: 12px; font-size: 12px;
} }
#listFriends .help{ #listFriends .help{
@ -5619,6 +5619,9 @@ a.sessionView {
display: block; display: block;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
#listFriends a:hover{
background: none;
}
#listFriends a .username{ #listFriends a .username{
display: inline-block; display: inline-block;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -5640,6 +5643,7 @@ a.sessionView {
width: 32px; width: 32px;
height: 32px; height: 32px;
margin-right: 5px; margin-right: 5px;
vertical-align: baseline;
} }
#course-block .list-group .list-group-item, #course-block .list-group .list-group-item,
#session-block .list-group .list-group-item #session-block .list-group .list-group-item

@ -1,29 +1,16 @@
.chatboxmain { .chatboxmain {
position: fixed; position: fixed;
width: 225px; width: auto;
z-index: 9000; z-index: 9000;
bottom: 0px; bottom: 0px;
right: 20px; right: 20px;
display: block; display: block;
} }
.chatboxheadmain { .chatboxheadmain {
color: #ffffff; color: #ffffff;
border-right:1px solid #222; background-color: #000;
border-left:1px solid #222; min-height: 34px;
background-color: #222; padding: 0 10px;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
background-image: -moz-linear-gradient(top, #333333, #222222);
background-image: -ms-linear-gradient(top, #333333, #222222);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
background-image: -webkit-linear-gradient(top, #333333, #222222);
background-image: -o-linear-gradient(top, #333333, #222222);
background-image: linear-gradient(top, #333333, #222222);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
min-height: 34px;
} }
#chatboxtitlemain { #chatboxtitlemain {
@ -36,8 +23,7 @@
.user_status_main { .user_status_main {
width:18px; width:18px;
display:inline; display:inline;
float:left; float:left;
padding: 0px 4px 0px 4px;
} }
.chatbox { .chatbox {
position: fixed; position: fixed;
@ -60,13 +46,13 @@
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
font-size: 10px; font-size: 10px;
width: 100px; width: auto;
cursor:pointer; cursor:pointer;
overflow: hidden; overflow: hidden;
padding-left: 2px; padding-left: 2px;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
line-height: 10px; line-height: 10px;
} }
.chatboxhead { .chatboxhead {

@ -308,9 +308,9 @@ function restructureChatBoxes() {
user_id = chatBoxes[x]; user_id = chatBoxes[x];
if ($("#chatbox_"+user_id).css('display') != 'none') { if ($("#chatbox_"+user_id).css('display') != 'none') {
if (align == 0) { if (align == 0) {
$("#chatbox_"+user_id).css('right', '245px'); $("#chatbox_"+user_id).css('right', '10px');
} else { } else {
width = (align)*(225+7)+20 + 225; width = (align)*(225+7) + 5 + 5;
$("#chatbox_"+user_id).css('right', width+'px'); $("#chatbox_"+user_id).css('right', width+'px');
} }
align++; align++;
@ -449,9 +449,9 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage
} }
if (chatBoxeslength == 0) { if (chatBoxeslength == 0) {
$("#chatbox_"+user_id).css('right', '245px'); $("#chatbox_"+user_id).css('right', '10px');
} else { } else {
width = (chatBoxeslength)*(225+7)+20 +225; width = (chatBoxeslength)*(225+7) + 5 + 5;
$("#chatbox_"+user_id).css('right', width+'px'); $("#chatbox_"+user_id).css('right', width+'px');
} }

Loading…
Cancel
Save