Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a bunch of code style problems 

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)
This commit is contained in:
Keegan McAllister 2012-09-11 14:13:53 -04:00
parent c5238e4af5
commit 75c34a7f1b
3 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/zephyr/index.html
View File

@ -28,14 +28,14 @@
{% icanhazjs "zephyr" %} {% icanhazjs "zephyr" %}
{% autoescape off %} {% autoescape off %}
<link href="/static/third/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/third/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/third/bootstrap/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/third/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
<link href="/static/third/jquery/jquery-ui-1.8.23.custom.css" rel="stylesheet"> <link href="/static/third/jquery/jquery-ui-1.8.23.custom.css" rel="stylesheet">
{# We need to import jQuery before Bootstrap #} {# We need to import jQuery before Bootstrap #}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
<script src="/static/third/bootstrap/js/bootstrap.min.js"></script> <script src="/static/third/bootstrap/js/bootstrap.min.js"></script>
<script src="/static/js/common.js"></script> <script src="/static/js/common.js"></script>
<script type="text/javascript" src="/static/third/jquery/jquery.form.js"></script> <script type="text/javascript" src="/static/third/jquery/jquery.form.js"></script>
<script type="text/javascript" src="/static/third/ich/ICanHaz.min.js"></script> <script type="text/javascript" src="/static/third/ich/ICanHaz.min.js"></script>
<script type="text/javascript" src="/static/js/zephyr.js"></script> <script type="text/javascript" src="/static/js/zephyr.js"></script>
@ -87,7 +87,7 @@ var people_list = {{ people }};
<div class="tab-pane active" id="class-message"> <div class="tab-pane active" id="class-message">
<div class="zephyr_comp"> <div class="zephyr_comp">
<br/> <br/>
<table > <table>
<tbody> <tbody>
<tr> <tr>
<td class="pointer"><p></p></td> <td class="pointer"><p></p></td>

8
zephyr/static/js/zephyr.js
View File

@ -540,10 +540,8 @@ function get_updates_longpoll() {
$(function () { $(function () {
update_autocomplete(); update_autocomplete();
}); $('.button-slide').click(function () {
$(document).ready(function(){ $('.zephyr_compose').slideToggle('fast');
$(".button-slide").click(function(){ $('.button-slide').hide();
$(".zephyr_compose").slideToggle("fast");
$(".button-slide").hide();
}); });
}); });

2
zephyr/static/styles/zephyr.css
View File

@ -33,6 +33,7 @@ div.zephyr_list {
bottom: 0; bottom: 0;
width: 640px; width: 640px;
} }
div.zephyr_comp { div.zephyr_comp {
background-color: #EEE; background-color: #EEE;
@ -190,4 +191,3 @@ div.narrow {
border: 1px solid gray; border: 1px solid gray;
top: 0px; top: 0px;
} }