Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into update_and_create_policy_api_modify

This commit is contained in:
Wenkai Yin 2016-06-22 14:19:31 +08:00
commit 9cdb24f4e1
2 changed files with 6 additions and 3 deletions

View File

@ -33,8 +33,10 @@ body {
background-color: #EFEFEF;
max-height: 100%;
height: 100%;
overflow-y: auto;
overflow-x: hidden;
width: 100%;
min-width: 1px;
overflow: auto;
min-height: 1px;
}
.up-section {
@ -109,4 +111,5 @@ body {
.page-content {
margin: 0 20px 0 20px;
text-align: left;
overflow-y: hidden;
}

View File

@ -47,7 +47,7 @@
<div class="page-content pull-right">
<a href="javascript:void(0);" data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-triangle-right"></span> // 'view_all' | tr //</a>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-8">