Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents 943e95ed 46a0c292
Showing 4 changed files with 18 additions and 2 deletions Show diff stats
requirements.txt
src/static/css/screen.css
src/super_archives/templates/superarchives/tags/display_message.html
src/templates/base.html
-https://www.djangoproject.com/download/1.6b4/tarball/
+https://www.djangoproject.com/download/1.6c1/tarball/
 #Django==1.5.2
 South==0.8.1
 psycopg2==2.5.1
@@ -247,6 +247,21 @@ ul.unstyled-list .glyphicon-chevron-right {
     font-weight: bold;
 }
+.toggle-reply {
+    height: 10px;
+    line-height: 3px;
+    padding: 0px 5px 14px;
+    vertical-align: middle;
+    font-size: 20px;
+    background-color: #bbb;
+    border-color: #aaa;
+}
+
+.toggle-reply:hover,
+.toggle-reply:focus {
+    background-color: #aaa;
+    border-color: #999;
+
 /* Converse JS */
 #chatpanel form#converse-login {
 {% for block in blocks %}
   {% if block.is_reply %}
-    <button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
+    <button class="btn btn-info btn-xs toggle-reply" onclick="$(this).next().toggle();">...</button>
     <div style="display: none; color: #707;">{% else %}<div>{% endif %}{{ block|safe|linebreaksbr }}</div>
 {% endfor %}
@@ -3,6 +3,7 @@
 <html>
   <head>
     {% block head %}
+    <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" />
1	-https://www.djangoproject.com/download/1.6b4/tarball/	1	+https://www.djangoproject.com/download/1.6c1/tarball/
2	#Django==1.5.2	2	#Django==1.5.2
3	South==0.8.1	3	South==0.8.1
4	psycopg2==2.5.1	4	psycopg2==2.5.1
	@@ -247,6 +247,21 @@ ul.unstyled-list .glyphicon-chevron-right {		@@ -247,6 +247,21 @@ ul.unstyled-list .glyphicon-chevron-right {
247	font-weight: bold;	247	font-weight: bold;
248	}	248	}
249		249
		250	+.toggle-reply {
		251	+ height: 10px;
		252	+ line-height: 3px;
		253	+ padding: 0px 5px 14px;
		254	+ vertical-align: middle;
		255	+ font-size: 20px;
		256	+ background-color: #bbb;
		257	+ border-color: #aaa;
		258	+}
		259	+
		260	+.toggle-reply:hover,
		261	+.toggle-reply:focus {
		262	+ background-color: #aaa;
		263	+ border-color: #999;
		264	+
250	/* Converse JS */	265	/* Converse JS */
251		266
252	#chatpanel form#converse-login {	267	#chatpanel form#converse-login {
1	{% for block in blocks %}	1	{% for block in blocks %}
2	{% if block.is_reply %}	2	{% if block.is_reply %}
3	- <button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>	3	+ <button class="btn btn-info btn-xs toggle-reply" onclick="$(this).next().toggle();">...</button>
4	<div style="display: none; color: #707;">{% else %}<div>{% endif %}{{ block\|safe\|linebreaksbr }}</div>	4	<div style="display: none; color: #707;">{% else %}<div>{% endif %}{{ block\|safe\|linebreaksbr }}</div>
5	{% endfor %}	5	{% endfor %}
	@@ -3,6 +3,7 @@		@@ -3,6 +3,7 @@
3	<html>	3	<html>
4	<head>	4	<head>
5	{% block head %}	5	{% block head %}
		6	+ <meta charset="UTF-8" />
6	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />	7	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
7		8
8	<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" />	9	<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" />