Skip to content

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

基础样式修改完毕，其余细节调整下一次提交代码

parent 4c2c5f58
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 22 deletions
application/index/view/global/frame_tpl.html
View file @ 4f4fbccb
...@@ -18,25 +18,31 @@ ...@@ -18,25 +18,31 @@
position: relative; position: relative;
right:1px; right:1px;
border-top: 0px solid transparent; border-top: 0px solid transparent;
border-bottom: 20px solid transparent; border-bottom: 0px solid transparent;
border-right: 22px solid #1a1a1a; border-right: 20px solid #FF0000;
border-left: 0px solid #1a1a1a ; border-left: 0px solid #ffffFF0000ff ;
height: 80px; height: 80px;
width: 0; width: 0;
line-height: 20px; line-height: 20px;
font-size:12px; font-size:14px;
color:#fffff;
} }
.hideBtn2{ .hideBtn2{
position: relative; position: relative;
right:1px; right:1px;
border-top: 0px solid transparent; /*border-top: 0px solid transparent;
border-bottom: 20px solid transparent; border-bottom: 20px solid transparent;
border-right: 0px solid #ff9419; border-right: 0px solid #ff9419;
border-left: 22px solid #ff9419 ; border-left: 22px solid #ff9419 ; */
border-top: 0px solid transparent;
border-bottom: 0px solid transparent;
border-right: 20px solid #ff9419;
border-left: 0px solid #ff9419 ;
height: 80px; height: 80px;
width: 0; width: 0;
line-height: 20px; line-height: 20px;
font-size:12px; font-size:14px;
color:#fffff;
} }
</style> </style>
</head> </head>
...@@ -71,15 +77,16 @@ ...@@ -71,15 +77,16 @@
<!--<div id="hideLine" style="width:2px;height:80px;background-color: #000000;float:left;display:inline;display:none"></div> <!--<div id="hideLine" style="width:2px;height:80px;background-color: #000000;float:left;display:inline;display:none"></div>
--><!--添加隐藏按钮--> --><!--添加隐藏按钮-->
<div id="hide_menu" class="" style="width:2%;display:inline;">
<div id="hide_menu" class="" style="width:2%;display:inline;position:absolute;z-index:10000;top:80px;left:0px;">
<div class="width-136-hide hideBtn1" style=";text-align:center;"> <div class="width-136-hide hideBtn1" style=";text-align:center;">
<span style="position:relative;left:3px;top:10px">隐藏</span> <div style="width:100%;"><img src="/resource/image/-@1x.png" style="width:14px;height:14px;margin-left:4px;" class="houtai_footer_icon1"></div>
<span style="position:absolute;left:4px;top:28px">隐藏</span>
<!--<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>--> <!--<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>-->
</div> </div>
</div> </div>
<div id="wrapper" style="width:100% !important;float:left !important;display:inline">
<div id="wrapper" style="width:98% !important;float:left !important;display:inline">
{__CONTENT__} {__CONTENT__}
{include file="global/footer_tpl" /} {include file="global/footer_tpl" /}
</div> </div>
......
application/index/view/main_index/main_index.html
View file @ 4f4fbccb
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
} }
#mainFrameTabs { #mainFrameTabs {
padding-left:1%; padding-left:1%;
/*width:99%;*/ /*width:88%;*/
} }
.nav-tabs { .nav-tabs {
border : none ; border : none ;
...@@ -51,6 +51,22 @@ ...@@ -51,6 +51,22 @@
.tab-content{ .tab-content{
border: none ; border: none ;
} }
/* 左侧目录标签的滚动条样式 */
.iframe-type #document html::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important;
background-color: #ccc !important;
}
/* 滚动条的滑轨背景颜色 */
.iframe-type #document html::-webkit-scrollbar{
width: 2px !important;
background-color: #FF2F2F !important;
}
/* 滑块颜色 */
.iframe-type #document html::-webkit-scrollbar-thumb{
background-color: #CCCCCC !important;
}
</style> </style>
<!--<div class="backer"></div>--> <!--<div class="backer"></div>-->
<!--切换不同的页面 框架--> <!--切换不同的页面 框架-->
......
application/index/view/performance_ranking/performance_ranking.html
View file @ 4f4fbccb
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
html{ html{
font-size:640%; font-size:640%;
width : 98.9%;
overflow : hidden ;
} }
.panel { .panel {
margin-bottom:0rem; margin-bottom:0rem;
overflow:hidden; overflow:hidden;
......
public/resource/css/public.css
View file @ 4f4fbccb
...@@ -96,10 +96,10 @@ a:hover{ ...@@ -96,10 +96,10 @@ a:hover{
-moz-transition: all 0.5s ease; -moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease; -o-transition: all 0.5s ease;
-webkit-transition: all 0.5s ease; -webkit-transition: all 0.5s ease;
background: -webkit-linear-gradient(#0B1223, #172452); /* Safari 5.1 - 6.0 */ background: -webkit-linear-gradient(#0B1223, #172452);
background: -o-linear-gradient(#0B1223, #172452); /* Opera 11.1 - 12.0 */ background: -o-linear-gradient(#0B1223, #172452);
background: -moz-linear-gradient(#0B1223, #172452); /* Firefox 3.6 - 15 */ background: -moz-linear-gradient(#0B1223, #172452);
background: linear-gradient(#0B1223, #172452); /* 标准的语法 */ background: linear-gradient(#0B1223, #172452);
/*background: #1a1a1a;*/ /*background: #1a1a1a;*/
height: 100%; height: 100%;
overflow-x: hidden; overflow-x: hidden;
...@@ -113,6 +113,21 @@ a:hover{ ...@@ -113,6 +113,21 @@ a:hover{
/*目录显示的动画效果（from透明 to 全部显示，用时1.5秒）*/ /*目录显示的动画效果（from透明 to 全部显示，用时1.5秒）*/
} }
/* 左侧目录标签的滚动条样式 */
#sidebar-wrapper::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #ccc;
}
/* 滚动条的滑轨背景颜色 */
#sidebar-wrapper::-webkit-scrollbar{
width: 2px !important;
background-color: #FF2F2F;
}
/* 滑块颜色 */
#sidebar-wrapper::-webkit-scrollbar-thumb{
background-color: #CCCCCC;
}
@keyframes show-mulu-action @keyframes show-mulu-action
{ {
0% { 0% {
...@@ -244,7 +259,10 @@ a:hover{ ...@@ -244,7 +259,10 @@ a:hover{
} }
.sidebar-nav .open .dropdown-toggle{ .sidebar-nav .open .dropdown-toggle{
font-weight: 700; font-weight: 700;
}
.dropdown-toggle {
margin-left:30px;
} }
.sidebar-nav li.open:hover before { .sidebar-nav li.open:hover before {
...@@ -392,8 +410,12 @@ a:hover{ ...@@ -392,8 +410,12 @@ a:hover{
.menu-sub-alink.active-a{ .menu-sub-alink.active-a{
/*background-color: #ff9419!important;*/ /*background-color: #ff9419!important;*/
background-color: rgba(255, 148, 25,.7)!important; /*background-color: rgba(255, 148, 25,.7)!important;*/
background: -webkit-linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: -o-linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: -moz-linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2) !important;
color :#1a1a1a;
} }
/*商铺列表，商铺动态，跟进信息样式*/ /*商铺列表，商铺动态，跟进信息样式*/
......
public/resource/js/mainIndex.js
View file @ 4f4fbccb
...@@ -24,7 +24,27 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -24,7 +24,27 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
_tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open'); _tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open');
}); });
$(document).on('click','#topList li', function(e){
var title = $(this).find("a").text();
if ( title == "首页" ){
title = title.replace(/(^\s*)|(\s*$)/g, "") ;
} else {
title = title.substr(0,title.length-1).replace(/(^\s*)|(\s*$)/g, "");
}
$('.active-a').removeClass("active-a");
$('.open').removeClass("open");
$('.active-main-li').removeClass("active-main-li");
$('.menuSideBar').find('li').each(function(index,e){
var str = $(this).find("span.span-list").text();
if ( str == title ){
$(this).find("a").addClass("active-a");
$(this).parent().parent().addClass("open");
$(this).parent().parent().addClass("active-main-li");
}
})
});
function menu_bar(fn) { function menu_bar(fn) {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
//登录时间无效 直接跳转登录页面 //登录时间无效 直接跳转登录页面
......
public/resource/js/public.js
View file @ 4f4fbccb
define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function (doT, $,template, layer) { define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function (doT, $,template, layer) {
//初始化左侧隐藏按钮的位置（屏幕宽度-body宽度 之后再/ 2 + px）
//使用jquery进行数据处理
//代码行数：2
//修改人：杜欣源
var totalHeighe = ($(document).width() - $("body").width()) / 2 +"px";
$('#hide_menu').css("left",totalHeighe);
var init = { var init = {
doTinit: function () { doTinit: function () {
doT.templateSettings = { doT.templateSettings = {
...@@ -60,6 +68,8 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -60,6 +68,8 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
var _this = $(this); var _this = $(this);
$('.active-a').removeClass("active-a");
_this.addClass("active-a");
location.href = _this.attr('href'); location.href = _this.attr('href');
}); });
...@@ -79,11 +89,12 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -79,11 +89,12 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
//$('#hideLine').show(); //隐藏一条线，作用是在目录隐藏的时候附加的一个显示效果 //$('#hideLine').show(); //隐藏一条线，作用是在目录隐藏的时候附加的一个显示效果
$('.width-136-hide').removeClass("hideBtn1"); $('.width-136-hide').removeClass("hideBtn1");
$('.width-136-hide').addClass("hideBtn2"); $('.width-136-hide').addClass("hideBtn2");
$('.width-136-hide').find('span').css("left","-17px"); //通过绝对定位来操作文字的位置，如果后期有所偏移可以纪念性微调 // $('.width-136-hide').find('span').css("left","-17px"); //通过绝对定位来操作文字的位置，如果后期有所偏移可以纪念性微调
$('#sidebar-wrapper').hide(); $('#sidebar-wrapper').hide();
$('.width-136-hide').find('span').text("显示"); $('.width-136-hide').find('span').text("显示");
//_this.html('显示<img src="/resource/image/icon_down_hide@2x.png" class="text-icon-hide"/>'); //_this.html('显示<img src="/resource/image/icon_down_hide@2x.png" class="text-icon-hide"/>');
$("#page-content-wrapper").css("width","100%");//内容显示大小 $("#page-content-wrapper").css("width","100%");//内容显示大小
$('#mainFrameTabs').css("width","100%");
}else{ }else{
//$('#hideLine').hide(); //$('#hideLine').hide();
$('.width-136-hide').removeClass("hideBtn2"); $('.width-136-hide').removeClass("hideBtn2");
...@@ -91,8 +102,9 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -91,8 +102,9 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
$('.width-136-hide').find('span').css("left","3px"); $('.width-136-hide').find('span').css("left","3px");
$('#sidebar-wrapper').show(); $('#sidebar-wrapper').show();
//_this.html('隐藏<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>'); //_this.html('隐藏<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>');
$("#page-content-wrapper").css("width","88%");//内容显示大小 $("#page-content-wrapper").css("width","100%");//内容显示大小
$('.width-136-hide').find('span').text("隐藏"); $('.width-136-hide').find('span').text("隐藏");
$('#mainFrameTabs').css("width","");
} }
}); });
//显示操作里的按钮 //显示操作里的按钮
......
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