Merge pull request #11 from ppwwyyxx/revert-7-html-archive-format
Revert "Changed the formatting of the generated HTML"
This commit is contained in:
+1
-1
@@ -162,7 +162,7 @@ class HTMLRender(object):
|
|||||||
nowtime = slice[0].createTime
|
nowtime = slice[0].createTime
|
||||||
if idx == 0 or \
|
if idx == 0 or \
|
||||||
slices[idx - 1][0].createTime.date() != nowtime.date():
|
slices[idx - 1][0].createTime.date() != nowtime.date():
|
||||||
timestr = nowtime.strftime("%Y-%m-%d %H:%M:%S")
|
timestr = nowtime.strftime("%m/%d %H:%M:%S")
|
||||||
else:
|
else:
|
||||||
timestr = nowtime.strftime("%H:%M:%S")
|
timestr = nowtime.strftime("%H:%M:%S")
|
||||||
blocks.append(self.time_html.format(time=timestr))
|
blocks.append(self.time_html.format(time=timestr))
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="chatScorll" style="position: relative; font-family:initial;">
|
<div class="chatScorll" style="position: relative; font-family:initial;">
|
||||||
<div id="chat_chatmsglist" class="chatContent">
|
<div id="chat_chatmsglist" class="chatContent" style="position: absolute;">
|
||||||
{messages}
|
{messages}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ table {
|
|||||||
/* Elements */
|
/* Elements */
|
||||||
html,
|
html,
|
||||||
body {
|
body {
|
||||||
/* height: 100%; */
|
height: 100%;
|
||||||
background: #4e5359 repeat 0 0;
|
background: #4e5359 repeat 0 0;
|
||||||
color: #666;
|
color: #666;
|
||||||
font: 14px/1.5 Helvetica, Arial, Tahoma;
|
font: 14px/1.5 Helvetica, Arial, Tahoma;
|
||||||
@@ -1233,7 +1233,7 @@ a.btnSecondary:active {
|
|||||||
box-shadow: 0 2px 6px #313131;
|
box-shadow: 0 2px 6px #313131;
|
||||||
z-index: 20;
|
z-index: 20;
|
||||||
/*ie hack*/
|
/*ie hack*/
|
||||||
/* _height: 400px; */
|
_height: 400px;
|
||||||
}
|
}
|
||||||
.chatPanel {
|
.chatPanel {
|
||||||
/*background:#fff;*/
|
/*background:#fff;*/
|
||||||
@@ -1242,7 +1242,7 @@ a.btnSecondary:active {
|
|||||||
-webkit-border-radius: 2px 2px 6px 6px;
|
-webkit-border-radius: 2px 2px 6px 6px;
|
||||||
-moz-border-radius: 2px 2px 6px 6px;
|
-moz-border-radius: 2px 2px 6px 6px;
|
||||||
border: 1px solid #424448;
|
border: 1px solid #424448;
|
||||||
/* _height: 400px; */
|
_height: 400px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
/*çª—ä½“å¤´éƒ¨æ ‡é¢˜*/
|
/*çª—ä½“å¤´éƒ¨æ ‡é¢˜*/
|
||||||
@@ -1278,11 +1278,11 @@ a.btnSecondary:active {
|
|||||||
}
|
}
|
||||||
/*会è¯å†…容窗体*/
|
/*会è¯å†…容窗体*/
|
||||||
.chatPanel .chatScorll {
|
.chatPanel .chatScorll {
|
||||||
/* height: 100%; */
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 200px;
|
min-height: 200px;
|
||||||
/* overflow: hidden; */
|
overflow: hidden;
|
||||||
/* overflow-y: auto; */
|
overflow-y: auto;
|
||||||
/*border-bottom:1px solid #bebebe;*/
|
/*border-bottom:1px solid #bebebe;*/
|
||||||
background-color: #EFF3F7;
|
background-color: #EFF3F7;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user