Merge branch 'master' of http://117.50.13.128:8889/wrm1995/codepedia2

static/css/code_show.css

@@ -634,10 +634,10 @@ a:hover {
 /* 提交评论框 */
 
 #ItemcommentPanel {
-    position: fixed;
-    right: 6rem;
-    width: 5rem;
-    top: 3rem;
+   position: absolute;
+    right: 60px;
+    width: 4rem;
+    top: 19px;
     border-radius: 4px;
     background-color: #fff;
     box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
@@ -698,16 +698,15 @@ a:hover {
 /* 问题显示 */
 
 #ItemquestionPanel {
-    width: 700px;
-    position: fixed;
+   width: 700px;
+    position: absolute;
     max-height: 500px;
     overflow-y: auto;
     background-color: #fff;
     box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
-    right:5.5rem;
-    top: 2rem;
+    top: 23px;
     border-radius: 4px;
-
+    right: 32px;
     z-index: 3;
     color:black;
     padding: 15px 0px 3px 0px;
@@ -912,14 +911,14 @@ pre.prettyprint {
     margin-top: 10px;
 }
 .addno-panel {
-    position: fixed;
-    width: 440px;
+    position: absolute;
+    width: 410px;
     border: 1px solid #ccc;
     border-radius: 5px;
     background: #fff;
-    z-index: 236;
-    right: 7rem;
-    top: 2rem;
+    z-index: 1;
+    right: 5px;
+    top: 27px;
     display: none;
 }
 

static/js/source.js

@@ -1492,9 +1492,9 @@ function inject_addnoPanel_html(item,file_id,linenum) {
 
 	$("#ItemcommentPanel").remove();
 	$("#ItemquestionPanel").remove();
-     // '<div class="trangle-op"></div>'+
-    html_str =  '<div class="addno-panel source-addno-panel" id="addno-panelsource-addno-panel" style="display:block">'+
 
+    html_str =  '<div class="addno-panel source-addno-panel" id="addno-panelsource-addno-panel" style="display:block">'+
+                    '<div class="trangle-op"></div>'+
                     '<div class="put-content">'+
                     '<div class="put-content newput-selectspanactive">为该行或该代码块添加注释或者提问:</div>'+
                         '<p class="put-select clearfix" id="addno-select-'+linenum+'">'+

templates/projects/filesub/file-right.html

@@ -78,7 +78,7 @@
             </span>
 
             <div class="addno-panel" id="addno-panel-{{file_id}}" style="top: 303px;right: 35px;">
-{#                <div class="trangle-op"></div>#}
+                <div class="trangle-op"></div>
                 <div class="put-content">
                 {% if isdir %}
                     <div class="put-content newput-selectspanactive">为该代码模块添加注释或者提问:</div>