Skip to content

T
tl_estate
Commit 0e6ede95 authored by duxinyuan's avatar duxinyuan
Browse files
Options

修改样式，调整滚动方式和最小宽度

parent c2388c36
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 13 deletions
application/index/view/global/frame_tpl.html
View file @ 0e6ede95
......@@ -110,9 +110,10 @@
}
</style>
</head>
<body style="margin: 0 auto !important">
<!--<body style="margin: 0 auto !important">-->
<body>
<div class="navbar" style="background: #FF750E !important;">
<div class="navbar" style="background: #FF750E !important;" id="headTileNavBar">
<div class="container-fluid">
<a class="brand">
<i><img src="/resource/image/logo@1x.png" class="houtai_footer_icon1"></i>
......
application/index/view/main_index/main_index.html
View file @ 0e6ede95
......@@ -6,11 +6,11 @@
html{
font-size:640%;
/*overflow:hidden !important;*/
overflow:scroll !important;
padding: 0 15px;
}
body {
overflow: hidden;;
/*overflow: scroll;;*/
}
.container{
width: 100%;
......@@ -28,7 +28,7 @@
}
#mainFrameTabs {
padding-left:1%;
width:86%;
width:87%;
overflow-y: scroll;
}
.nav-tabs {
......@@ -67,7 +67,7 @@
}
/* 滚动条的滑轨背景颜色 */
#mainFrameTabs::-webkit-scrollbar{
width: 4px !important;
width: 0px ;
background-color: #FF2F2F !important;
}
/* 滑块颜色 */
......
public/resource/css/public.css
View file @ 0e6ede95
......@@ -17,12 +17,12 @@ iframe > html > body {
padding:0px;
}
/*适配 不同屏幕*/
@media (min-width:1680px){
/*@media (min-width:1680px){
body{
width:1560px !important;
};
}
}*/
html {
height: 100%;
overflow: hidden;
......@@ -31,6 +31,12 @@ html {
a:hover{
text-decoration:none;
}
#headTileNavBar{
background: #ff9419;
width: 100%;
height: 40px;
margin-bottom: 15px!important;
}
.navbar{
background: #ff9419;
width: 100%;
......@@ -93,7 +99,8 @@ a:hover{
padding-left: 0;
/*height: 1300px;*/
transition: all 0.5s ease;
width: 98%!important;
/*width: 98%!important;*/
display:inline-block
}
#wrapper.toggled {
}
......@@ -114,10 +121,12 @@ a:hover{
overflow-y: auto;
/*transition: all 0.5s ease;*/
/*width: 136px;*/
width: 13%;
width: 10%;
min-width : 165px;
z-index: 1000;
float: left;
height: 820px;
display:inline
/*animation: show-mulu-action 1.3s;*/
/*目录显示的动画效果（from透明 to 全部显示，用时1.5秒）*/
}
......
public/resource/js/mainIndex.js
View file @ 0e6ede95
......@@ -16,11 +16,27 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
var that = this ;
//只在首页显示 菜单
var height1 = $("html").height();
var height = $("html").height() -120+ "px !important" ;
var height = $("html").height() -80+ "px !important" ;
// $('.tab-content').attr("style","height:"+height);
$('#mainFrameTabs').attr("style","height:"+height);
$('#mainFrameTabs').attr("style","height:"+height);
$('#sidebar-wrapper').attr("style","height:"+height);
// var width = $("html").width() - 160 + "px !important" ;
var sceenWidth = window.screen.width < 1200 ? 1200 : window.screen.width ;
var width = sceenWidth - $('#sidebar-wrapper').width() + "px !important";
var sceen = sceenWidth+ "px !important";
$('#mainFrameTabs').attr("style","min-width:989px !important");
// $('#mainFrameTabs').attr("style","min-width:"+height);
$('#wrapper').attr("style","min-width:"+sceen );
$('#headTileNavBar').attr("style","min-width:"+sceen);
// $('#mainFrameTabs').attr("style","min-width:1200px !important");
// $('#wrapper').attr("style","min-width:1570px !important" );
// $('#headTileNavBar').attr("style","min-width:1570px !important");
menu_bar(function(){
//回调部分
//记录tab的点击状态，对应的标签内容展开，并高亮显示
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment