代码重构:移除Menu-Content样式,重新调整所有窗口布局

This commit is contained in:
Argo-Lenovo 2017-04-25 12:56:47 +08:00
parent 1a612c542e
commit 44c80659af
4 changed files with 20 additions and 51 deletions

View File

@ -73,41 +73,33 @@
}
}
@media (min-height: 375px) {
.modal-body {
height: 160px;
}
}
@media (min-height: 414px) {
.modal-body {
height: 200px;
.modal .modal-body {
max-height: 200px;
}
}
@media (min-height: 568px) {
.modal-body {
height: 350px;
.modal .modal-body {
max-height: 350px;
}
}
@media (min-height: 667px) {
.modal-body {
height: 450px;
.modal .modal-body {
max-height: 450px;
}
}
@media (min-height: 736px) {
.modal-body {
height: 510px;
.modal .modal-body {
max-height: 510px;
}
}
@media (min-height: 768px) {
.modal-body {
height: auto;
.modal .modal-body {
max-height: 540px;
min-height: 100px;
}
}

View File

@ -56,10 +56,6 @@
vertical-align: middle;
}
.modal-body {
height: 160px;
overflow: auto;
}
.modal-dialog .modal-body, .panel-body {
padding-bottom: 0;
@ -81,6 +77,12 @@
padding: 0 15px;
}
.modal .modal-body {
max-height: 164px;
overflow: auto;
-webkit-overflow-scrolling: touch;
}
.modal.file-zoom-dialog .modal-dialog {
max-width: none;
}

View File

@ -75,7 +75,6 @@
right: 15px;
z-index: 1051;
display: none;
min-height: 240px;
}
.icon-content .fa-nav {
@ -90,7 +89,7 @@
right: 0;
top: 46px;
bottom: 65px;
max-height: none;
overflow: auto;
-webkit-overflow-scrolling: touch;
}
@ -138,15 +137,15 @@
margin-bottom: 20px;
}
.modal .modal-dialog .menu-content {
.modal .modal-dialog .icon-content {
position: static;
}
.modal .modal-dialog .menu-content .modal-body {
.modal .modal-dialog .icon-content .modal-body {
position: static;
}
.modal .modal-dialog .menu-content .modal-footer {
.modal .modal-dialog .icon-content .modal-footer {
position: static;
}
@ -256,28 +255,4 @@
.fa-icons {
margin-right: 160px;
}
.menu-content {
top: 0;
right: auto;
bottom: 0;
left: auto;
width: 600px;
}
}
@media (min-width: 940px) {
.menu-content {
width: 900px;
}
}
@media (min-height: 672px) {
.menu-content {
height: 600px;
}
.modal .menu-content .modal-body {
height: 490px;
}
}

View File

@ -1,5 +1,5 @@
<div id="dialogSubMenu" class="modal-dialog">
<div class="modal-content icon-content menu-content">
<div class="modal-content icon-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myMenuModalLabel">请选择菜单</h4>