moparisthebest
/
kaiwa
mirror of https://github.com/moparisthebest/kaiwa
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'redesign'

This commit is contained in:
Lance Stout 2013-09-26 08:54:17 -07:00
parent 1f910f37d7 2ffecb060d
commit a0a57549cb
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/css/app/chat.styl
View File

@ -66,36 +66,30 @@
bottom: 75px bottom: 75px
width: 100% width: 100%
borderbox() borderbox()
background: lighten($activeBlue, 97%)
li li
position: relative position: relative
z-index: 1 z-index: 1
list-style: none list-style: none
padding: 0px padding: 10px 0
width: 100% width: 100%
min-height: 40px min-height: 50px
display: block display: block
borderbox() borderbox()
border: 1px solid blue border-bottom: 1px solid $grayOutline
&:last-child .message &:last-of-type
border: none border: none
&.chatGroup
border: 1px solid red
.messageAvatar .messageAvatar
position: relative position: absolute
display: inline-block top: 50%
float: left left: 10px
width: 30px margin-top: -15px
height: 30px
margin: 0px 8px 8px 8px
img img
avatar() avatar()
border: 1px solid red
.name .name
text-indent: -9999em text-indent: -9999em
position: absolute position: absolute
@ -103,12 +97,10 @@
.messageWrapper .messageWrapper
margin-left: 50px margin-left: 50px
border-left: 1px solid red
.message .message
font-size: 12px font-size: 12px
margin: 0px margin: 0px
padding: 10px
display: inline-block display: inline-block
padding-right: 11px padding-right: 11px
min-width: 20px min-width: 20px

25
public/css/otalk.css
View File

@ -683,34 +683,28 @@ h3 {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
background: #f7fdff;
} }
.messages li { .messages li {
position: relative; position: relative;
z-index: 1; z-index: 1;
list-style: none; list-style: none;
padding: 0px; padding: 10px 0;
width: 100%; width: 100%;
min-height: 40px; min-height: 50px;
display: block; display: block;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #00f; border-bottom: 1px solid #e4e4e4;
} }
.messages li:last-child .message { .messages li:last-of-type {
border: none; border: none;
} }
.messages li.chatGroup {
border: 1px solid #f00;
}
.messages li .messageAvatar { .messages li .messageAvatar {
position: relative; position: absolute;
display: inline-block; top: 50%;
float: left; left: 10px;
width: 30px; margin-top: -15px;
height: 30px;
margin: 0px 8px 8px 8px;
} }
.messages li .messageAvatar img { .messages li .messageAvatar img {
width: 30px; width: 30px;
@ -721,7 +715,6 @@ h3 {
-o-border-radius: 50px; -o-border-radius: 50px;
-border-radius: 50px; -border-radius: 50px;
border-radius: 50px; border-radius: 50px;
border: 1px solid #f00;
} }
.messages li .messageAvatar .name { .messages li .messageAvatar .name {
text-indent: -9999em; text-indent: -9999em;
@ -730,12 +723,10 @@ h3 {
} }
.messages .messageWrapper { .messages .messageWrapper {
margin-left: 50px; margin-left: 50px;
border-left: 1px solid #f00;
} }
.messages .message { .messages .message {
font-size: 12px; font-size: 12px;
margin: 0px; margin: 0px;
padding: 10px;
display: inline-block; display: inline-block;
padding-right: 11px; padding-right: 11px;
min-width: 20px; min-width: 20px;