zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shouye

This commit is contained in:
shilixia 2019-10-12 08:54:46 +08:00
parent 15ff79c60a
commit 1b0b31bae6
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
safesite/static/safesite/easyui/themes/default/easyui.css
View File

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

2
safesite/templates/main.html
View File

@ -326,7 +326,7 @@ float: left;">
</div> </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 id="panelx" class="easyui-panel" data-options="iconCls:'fa-bar-chart'" >
</div> </div>