shouye

safesite/static/safesite/easyui/themes/default/easyui.css

@@ -1,5 +1,5 @@
 .panel {
-  overflow: hidden;
+  /*overflow: hidden;*/
   text-align: left;
   margin: 0;
   border: 0;
@@ -37,11 +37,7 @@
   border-bottom-width: 0;
 }
 .panel-with-icon {
-<<<<<<< HEAD
-  padding-left: 20px;
-=======
-  padding-left: 10px;
->>>>>>> 0ed848ff177ad9c427f58c714cb22f8012e2c913
+ padding-left: 20px;
 }
 .panel-icon,
 .panel-tool {
@@ -3411,7 +3407,7 @@
     height: 40px;
     line-height: 30px;
     color: #313030;
-    margin-left: 25px;
+    margin-left: 10px;
 }
 .sidemenu .accordion-header:hover {
     background: #0066cc;

safesite/templates/main.html

@@ -326,7 +326,7 @@ float: left;">
 
 </div>
 
-<div style="width:100%;height:800px">
+<div style="width:98%;margin-left:1%;margin-right:1%;height:800px">
 <div id="panelx" class="easyui-panel"  data-options="iconCls:'fa-bar-chart'" >
     
 </div>