orga0063
/
BootstrapAdmin11
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化左侧项目名称与侧边栏Bar合并功能

This commit is contained in:
Argo-Lenovo 2016-11-07 17:26:17 +08:00
parent 25e17069e0
commit bb82b88756
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Bootstrap.Admin/Content/css/site-responsive.css
View File

@ -46,10 +46,6 @@
margin: 0px !important; margin: 0px !important;
} }
.logo {
display: none;
}
.fb-timeliner { .fb-timeliner {
display: none; display: none;
} }
@ -70,10 +66,22 @@
} }
} }
@media (max-width: 480px) { @media (max-width: 666px) {
.notify-row { .notify-row {
display: none; display: none;
} }
}
@media (max-width: 548px) {
.top-menu .search {
display: none;
}
}
@media (max-width: 480px) {
.sidebar-toggle-box span, .notify-row {
display: none;
}
.modal-dialog { .modal-dialog {
width: 370px; width: 370px;
@ -82,10 +90,6 @@
.top-menu > li { .top-menu > li {
float: right; float: right;
} }
.top-menu .search {
display: none;
}
} }
@media (max-width: 320px) { @media (max-width: 320px) {

24
Bootstrap.Admin/Content/css/site.css
View File

@ -61,7 +61,6 @@ div button span {
border-bottom: 1px solid #f1f2f7; border-bottom: 1px solid #f1f2f7;
} }
.arrow-up { .arrow-up {
background: url("../images/arrow-up.png") no-repeat; background: url("../images/arrow-up.png") no-repeat;
width: 20px; width: 20px;
@ -72,29 +71,24 @@ div button span {
} }
/*Title*/ /*Title*/
a.logo { .sidebar-toggle-box {
margin-top: 20px;
font-size: 21px; font-size: 21px;
color: #2e2e2e; color: #333;
float: left; float: left;
margin-top: 15px; margin-top: 15px;
text-transform: uppercase; text-transform: uppercase;
} }
a.logo:hover, a.logo:focus { .sidebar-toggle-box:hover, .sidebar-toggle-box:focus {
text-decoration: none; text-decoration: none;
outline: none; outline: none;
color: #337ab7;
} }
a.logo span { .sidebar-toggle-box span {
color: #FF6C60; padding-left: 6px;
} }
/*end title*/
.sidebar-toggle-box {
float: left;
padding-right: 15px;
margin-top: 20px;
}
.sidebar-toggle-box .fa-bars { .sidebar-toggle-box .fa-bars {
cursor: pointer; cursor: pointer;
@ -108,6 +102,7 @@ a.logo {
padding: 10px 4px; padding: 10px 4px;
height: 40px; height: 40px;
} }
/*end title*/
.go-top { .go-top {
margin-right: 1%; margin-right: 1%;
@ -280,7 +275,8 @@ a.logo {
/*notify bar*/ /*notify bar*/
.notify-row { .notify-row {
margin-top: 20px; margin-top: 20px;
float: left; padding-left: 20px;
display: inline-block;
} }
.notify-row > li { .notify-row > li {

5
Bootstrap.Admin/Content/js/Longbow.Common.js
View File

@ -189,4 +189,9 @@ $(function () {
}); });
$('.site-footer div span').text($('#footer').val()); $('.site-footer div span').text($('#footer').val());
$('.sidebar-toggle-box').click(function () {
window.console.log('1');
$(this).next('a').toggle();
});
}); });

2
Bootstrap.Admin/Content/js/common-scripts.js
View File

@ -42,7 +42,7 @@ $(function () {
$("#sidebar").scrollTo("+=" + Math.abs(diff), 500); $("#sidebar").scrollTo("+=" + Math.abs(diff), 500);
}); });
$('.fa-bars').click(function () { $('.sidebar-toggle-box').click(function () {
if ($('#sidebar > ul').is(":visible") === true) { if ($('#sidebar > ul').is(":visible") === true) {
$('#main-content').css({ $('#main-content').css({

10
Bootstrap.Admin/Views/Shared/Header.cshtml
View File

@ -1,11 +1,11 @@
@model Bootstrap.Admin.Models.HeaderBarModel @model Bootstrap.Admin.Models.HeaderBarModel
<!--header start--> <!--header start-->
<header class="header white-bg"> <header class="header white-bg">
<div class="sidebar-toggle-box"> <a href="#" data-toggle="dropdown" class="sidebar-toggle-box dropdown-toggle">
<div class="fa fa-bars tooltips" data-placement="right" data-original-title="展开/收起 导航条"></div> <i class="fa fa-bars"></i>
</div> <!--logo start-->
<!--logo start--> <span>@Model.Title</span>
<a href="#" data-toggle="dropdown" class="logo dropdown-toggle">@Model.Title</a> </a>
<!--logo end--> <!--logo end-->
@if (Model.Menus.Count() > 0 && Model.ShowMenu) @if (Model.Menus.Count() > 0 && Model.ShowMenu)
{ {