diff --git a/static/css/code_show.css b/static/css/code_show.css index 34ebb59..34a2131 100644 --- a/static/css/code_show.css +++ b/static/css/code_show.css @@ -893,7 +893,7 @@ pre.prettyprint { border: 1px solid transparent; border-bottom: 1px solid #ccc; height: 170px; - margin: 10px 0px 10px 18px; + margin: 15px 0px 10px 18px; box-sizing: border-box; color: black; } @@ -1407,7 +1407,6 @@ color: #FFF !important; white-space: normal; word-wrap: break-word; word-break: break-all; - width: 275px; text-align: left; } .marbox{ @@ -1502,7 +1501,7 @@ color: #FFF !important; .newtopthumbs{ margin: 4px 0px 0px 16px; width: 95%; - padding-left: 55px; + padding-left: 8px; } .thumbsmarginLeft{ margin-left: 0px; @@ -1584,4 +1583,7 @@ color: #FFF !important; } .anno_textarea{ +} +.mt11{ + margin-top:11px !important; } \ No newline at end of file diff --git a/static/js/source.js b/static/js/source.js index 44e3c52..c2ee72d 100644 --- a/static/js/source.js +++ b/static/js/source.js @@ -54,6 +54,7 @@ function show_annotation(file_id, line_num) { } function close_modify_anno(){ + $("#modification").show(); $(".modify_anno_div").remove(); $("#modify_anno_textarea").attr("readonly","readonly") @@ -67,13 +68,14 @@ function close_modify_anno(){ //注入html代码 function inject_modifyAnno_html(item,file_id,linenum,anno_id) { + $("#modification").hide(); $(".modify_anno_div").remove(); $("#modify_anno_textarea").removeAttr("readonly"); $("#modify_anno_textarea").focus() html_str = '
'+ - '提交'+ - '取消'+ + '取消'+ + '提交'+ '
'; $(item).after(html_str) ev = window.event; diff --git a/templates/projects/filesub/annotation.html b/templates/projects/filesub/annotation.html index a6bdf79..2d1f5ee 100644 --- a/templates/projects/filesub/annotation.html +++ b/templates/projects/filesub/annotation.html @@ -27,7 +27,8 @@
{% if allow_modify %} - 修改 + 修改 + {{self_anno.user.nick_name}} {% endif %}
@@ -36,7 +37,6 @@
- {{self_anno.user.nick_name}} 添加评论