Skip to content

T
tl_estate
Commit 4c166725 authored by duxinyuan's avatar duxinyuan
Browse files
Options

1

parent 9ede1b20
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 13 deletions
application/index/view/global/frame_two_tpl.html
View file @ 4c166725
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-us" class="main-index-liu" style="overflow-y: auto;"> <html lang="en-us" class="main-index-liu" >
<head> <head>
<link rel="icon" href="/favicon.ico" type="image/x-icon"> <link rel="icon" href="/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
......
application/index/view/main_index/main_index.html
View file @ 4c166725
...@@ -21,11 +21,15 @@ ...@@ -21,11 +21,15 @@
height:100%; height:100%;
} }
iframe { iframe {
overflow: hidden;; overflow: hidden !important;
}
iframe > html {
overflow: hidden !important;
} }
#mainFrameTabs { #mainFrameTabs {
padding-left:1%; padding-left:1%;
width:86%; width:86%;
overflow-y: scroll;
} }
.nav-tabs { .nav-tabs {
border : none ; border : none ;
...@@ -57,17 +61,17 @@ ...@@ -57,17 +61,17 @@
/* 左侧目录标签的滚动条样式 */ /* 左侧目录标签的滚动条样式 */
html::-webkit-scrollbar-track{ #mainFrameTabs::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important; -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important;
background-color: #ccc !important; background-color: #ccc !important;
} }
/* 滚动条的滑轨背景颜色 */ /* 滚动条的滑轨背景颜色 */
html::-webkit-scrollbar{ #mainFrameTabs::-webkit-scrollbar{
width: 2px !important; width: 4px !important;
background-color: #FF2F2F !important; background-color: #FF2F2F !important;
} }
/* 滑块颜色 */ /* 滑块颜色 */
html::-webkit-scrollbar-thumb{ #mainFrameTabs::-webkit-scrollbar-thumb{
background-color: #CCCCCC !important; background-color: #CCCCCC !important;
} }
</style> </style>
...@@ -83,7 +87,7 @@ ...@@ -83,7 +87,7 @@
<div class="tab-pane active" style="width:100%;" id="bTabs_indexperformanceRanking"> <div class="tab-pane active" style="width:100%;" id="bTabs_indexperformanceRanking">
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px;overflow-y:auto" src="/index/PerformanceRanking"> <iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px" src="/index/PerformanceRanking">
</iframe> </iframe>
......
application/index/view/performance_ranking/performance_ranking.html
View file @ 4c166725
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
html{ html{
font-size:640%; font-size:640%;
width : 98.9%; /*width : 98.9%;*/
overflow : hidden ; overflow : hidden ;
} }
......
public/resource/css/public.css
View file @ 4c166725
...@@ -25,7 +25,7 @@ iframe > html > body { ...@@ -25,7 +25,7 @@ iframe > html > body {
} }
html { html {
height: 100%; height: 100%;
/*overflow-y: scroll;*/ overflow: hidden;
} }
a:hover{ a:hover{
...@@ -138,7 +138,7 @@ a:hover{ ...@@ -138,7 +138,7 @@ a:hover{
} }
/* html滚动条样式 （iframe标签下） */ /* html滚动条样式 （iframe标签下） */
html::-webkit-scrollbar-track{ /*html::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important; -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important;
background-color: #ccc !important; background-color: #ccc !important;
} }
...@@ -148,7 +148,7 @@ html::-webkit-scrollbar{ ...@@ -148,7 +148,7 @@ html::-webkit-scrollbar{
} }
html::-webkit-scrollbar-thumb{ html::-webkit-scrollbar-thumb{
background-color: #CCCCCC !important; background-color: #CCCCCC !important;
} }*/
@keyframes show-mulu-action @keyframes show-mulu-action
{ {
......
public/resource/js/mainIndex.js
View file @ 4c166725
...@@ -15,9 +15,14 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -15,9 +15,14 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
event: function () { event: function () {
var that = this ; var that = this ;
//只在首页显示 菜单 //只在首页显示 菜单
var height1 = $("html").height();
console.log(height1)
var height = $("html").height() -120+ "px !important" ;
console.log(height)
// $('.tab-content').attr("style","height:"+height);
$('#mainFrameTabs').attr("style","height:"+height);
var height = window.screen.availHeight-100;
$('.tab-content').css("height",height);
menu_bar(function(){ menu_bar(function(){
//回调部分 //回调部分
//记录tab的点击状态，对应的标签内容展开，并高亮显示 //记录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