don't remember

pull/325/merge
Abdullah Almsaeed 2015-03-25 19:00:53 -04:00
parent d0664b2695
commit c2158b1138
4 changed files with 77 additions and 7 deletions

View File

@ -9,6 +9,7 @@
z-index: 1030;
//Navbar
> .navbar {
.transition(margin-left @transition-speed @transition-fn);
margin-bottom: 0;
margin-left: @sidebar-width;
border: none;
@ -76,6 +77,10 @@
&:hover {
color: #fff;
}
&:focus,
&:active {
background: transparent;
}
}
.sidebar-toggle .icon-bar {
display: none;
@ -102,6 +107,7 @@
//Logo bar
.logo {
.transition(width @transition-speed @transition-fn);
display: block;
float: left;
height: 50px;
@ -112,6 +118,15 @@
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
padding: 0 15px;
font-weight: 300;
//Add support to sidebar mini by allowing the user to create
//2 logo designs. mini and lg
.logo-lg {
//should be visibile when sidebar isn't collapsed
display: block;
}
.logo-mini {
display: none;
}
}
//Navbar Brand. Alternative logo with layout-top-nav
.navbar-brand {

View File

@ -6,6 +6,7 @@
.sidebar-mini {
//Sidebar mini should work only on devices larger than @screen-sm
@media (min-width: @screen-sm) {
//When the sidebar is collapsed...
&.sidebar-collapse {
//Apply the new margining to the main content and footer
@ -35,7 +36,7 @@
}
}
}
.sidebar-menu {
//Make the sidebar links, menus, labels, badeges
//and angle icons disappear
@ -50,17 +51,17 @@
&.header {
display: none!important;
}
> a > span {
border-top-right-radius: 4px;
}
&:not(.treeview) {
> a > span {
border-bottom-right-radius: 4px;
}
}
> .treeview-menu {
//Add some padding to the treeview menu
padding-top: 5px;
@ -71,13 +72,13 @@
//Show menu items on hover
&:hover {
> a > span:not(.pull-right),
> .treeview-menu {
> .treeview-menu {
display: block!important;
position: absolute;
width: @sidebar-width - 50;
left: 50px;
}
//position the header & treeview menus
> a > span {
top: 0;
@ -96,6 +97,29 @@
.sidebar-form {
display: none;
}
.main-header {
//Lets make the logo also shrink and the mini logo to appear
.logo {
width: 50px;
> .logo-mini {
display: block;
margin-left: -15px;
margin-right: -15px;
font-size: 18px;
}
> .logo-lg {
display: none;
}
}
//Of course, since the logo got smaller, we need to fix the
//navbar's position
.navbar {
margin-left: 50px;
}
}
}
}
}

31
dist/css/AdminLTE.css vendored
View File

@ -184,6 +184,9 @@ a:focus {
z-index: 1030;
}
.main-header > .navbar {
-webkit-transition: margin-left 0.3s cubic-bezier(0.32, 1.25, 0.375, 1.15);
-o-transition: margin-left 0.3s cubic-bezier(0.32, 1.25, 0.375, 1.15);
transition: margin-left 0.3s cubic-bezier(0.32, 1.25, 0.375, 1.15);
margin-bottom: 0;
margin-left: 230px;
border: none;
@ -249,6 +252,10 @@ a:focus {
.main-header .sidebar-toggle:hover {
color: #fff;
}
.main-header .sidebar-toggle:focus,
.main-header .sidebar-toggle:active {
background: transparent;
}
.main-header .sidebar-toggle .icon-bar {
display: none;
}
@ -267,6 +274,9 @@ a:focus {
line-height: .9;
}
.main-header .logo {
-webkit-transition: width 0.3s cubic-bezier(0.32, 1.25, 0.375, 1.15);
-o-transition: width 0.3s cubic-bezier(0.32, 1.25, 0.375, 1.15);
transition: width 0.3s cubic-bezier(0.32, 1.25, 0.375, 1.15);
display: block;
float: left;
height: 50px;
@ -278,6 +288,12 @@ a:focus {
padding: 0 15px;
font-weight: 300;
}
.main-header .logo .logo-lg {
display: block;
}
.main-header .logo .logo-mini {
display: none;
}
.main-header .navbar-brand {
color: #fff;
}
@ -600,6 +616,21 @@ a:focus {
.sidebar-mini.sidebar-collapse .sidebar-form {
display: none;
}
.sidebar-mini.sidebar-collapse .main-header .logo {
width: 50px;
}
.sidebar-mini.sidebar-collapse .main-header .logo > .logo-mini {
display: block;
margin-left: -15px;
margin-right: -15px;
font-size: 18px;
}
.sidebar-mini.sidebar-collapse .main-header .logo > .logo-lg {
display: none;
}
.sidebar-mini.sidebar-collapse .main-header .navbar {
margin-left: 50px;
}
}
/*
* Component: Dropdown menus

File diff suppressed because one or more lines are too long