修改BUG:选择图标页面第二个面板激活时右边快捷指示显示内容不正确,应该隐藏掉

This commit is contained in:
Argo-Lenovo 2016-11-21 01:53:03 +08:00
parent 37bf8042cb
commit 2e333dd7bb
5 changed files with 44 additions and 21 deletions

View File

@ -1,9 +1,4 @@
body {
font-family: 'Open Sans', sans-serif;
font-size: 13px;
}
.modal-body #fa-top {
.modal-body #fa-top {
float: left;
margin-top: -15px;
}
@ -30,9 +25,9 @@
.fb-timeliner {
position: fixed;
top: 80px;
right: 40px;
width: 150px;
top: 96px;
right: 46px;
width: 140px;
bottom: 100px;
}
@ -177,6 +172,7 @@
padding-bottom: 4px;
height: 32px;
vertical-align: middle;
color: #222;
}
.fontawesome-icon-list ul li:hover {
@ -211,3 +207,17 @@
.menu-content .dd {
max-width: inherit;
}
.faicon {
padding-bottom: 15px;
}
.faicon .fb-timeliner {
top: 130px;
right: 32px;
bottom: 70px;
}
.faicon .nav-tabs > li.active > a, .faicon .nav-tabs > li.active > a:hover, .faicon .nav-tabs > li.active > a:focus {
background-color: #41CAC0;
}

View File

@ -75,10 +75,10 @@ namespace Bootstrap.Admin.Controllers
///
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ActionResult FAIcon()
{
return View();
var v = new NavigatorBarModel("~/Admin/FAIcon");
return View(v);
}
/// <summary>
///

View File

@ -1,5 +1,8 @@
$(function () {
var $iconList = $('#iconTab').find('div.fontawesome-icon-list');
var $main = $('#main-content');
var $tl = $('#timeline');
$iconList.on('click', 'a', function () {
window.console.log($(this).children('i').attr('class'));
return false;
@ -10,4 +13,10 @@
});
$iconList.find('ul li').addClass('col-md-3 col-sm-4 col-xs-6');
$iconList.find('div').addClass('col-xs-6');
$main.scrollspy({ offset: 150, target: '#timeline' });
$('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
if (e.target.href.indexOf("#Glyphicons") > -1) $tl.attr('style', 'display: none;');
else $tl.removeAttr('style');
})
});

View File

@ -1,17 +1,21 @@
@{
ViewBag.Title = "Icon";
Layout = "~/Views/Shared/_Layout.cshtml";
@model NavigatorBarModel
@{
ViewBag.Title = "图标集";
Layout = "~/Views/Shared/_Admin.cshtml";
}
@section css {
<link href="~/Content/css/fa.css" rel="stylesheet" />
<link href="~/Content/css/fa.responsive.css" rel="stylesheet" />
<link href="~/Content/css/font-awesome.css" rel="stylesheet" />
}
@section javascript {
<script src="~/Scripts/icon.js"></script>
}
<section class="container">
<div class="panel-body" data-spy="scroll" data-target=".fb-timeliner">
@section header {
@Html.Partial("Header", Model)
}
@section navigator {
@Html.Partial("Navigator", Model)
}
<div class="faicon">
@Html.Partial("IconView")
</div>
</section>

View File

@ -9,7 +9,7 @@
<div role="tabpanel" class="tab-pane" id="Glyphicons">@Html.Partial("Glyphicons")</div>
</div>
</div>
<div class="fb-timeliner">
<div id="timeline" class="fb-timeliner">
<h2 class="recent-highlight">图标分类</h2>
<ul class="nav navbar">
<li><a href="#new">新图标</a></li>