提交 c2158b11 编写于 作者: A Abdullah Almsaeed

don't remember

上级 d0664b26
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
z-index: 1030; z-index: 1030;
//Navbar //Navbar
> .navbar { > .navbar {
.transition(margin-left @transition-speed @transition-fn);
margin-bottom: 0; margin-bottom: 0;
margin-left: @sidebar-width; margin-left: @sidebar-width;
border: none; border: none;
...@@ -76,6 +77,10 @@ ...@@ -76,6 +77,10 @@
&:hover { &:hover {
color: #fff; color: #fff;
} }
&:focus,
&:active {
background: transparent;
}
} }
.sidebar-toggle .icon-bar { .sidebar-toggle .icon-bar {
display: none; display: none;
...@@ -102,6 +107,7 @@ ...@@ -102,6 +107,7 @@
//Logo bar //Logo bar
.logo { .logo {
.transition(width @transition-speed @transition-fn);
display: block; display: block;
float: left; float: left;
height: 50px; height: 50px;
...@@ -112,6 +118,15 @@ ...@@ -112,6 +118,15 @@
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
padding: 0 15px; padding: 0 15px;
font-weight: 300; 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. Alternative logo with layout-top-nav
.navbar-brand { .navbar-brand {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.sidebar-mini { .sidebar-mini {
//Sidebar mini should work only on devices larger than @screen-sm //Sidebar mini should work only on devices larger than @screen-sm
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
//When the sidebar is collapsed...
&.sidebar-collapse { &.sidebar-collapse {
//Apply the new margining to the main content and footer //Apply the new margining to the main content and footer
...@@ -96,6 +97,29 @@ ...@@ -96,6 +97,29 @@
.sidebar-form { .sidebar-form {
display: none; 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;
}
} }
} }
}
} }
\ No newline at end of file
...@@ -184,6 +184,9 @@ a:focus { ...@@ -184,6 +184,9 @@ a:focus {
z-index: 1030; z-index: 1030;
} }
.main-header > .navbar { .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-bottom: 0;
margin-left: 230px; margin-left: 230px;
border: none; border: none;
...@@ -249,6 +252,10 @@ a:focus { ...@@ -249,6 +252,10 @@ a:focus {
.main-header .sidebar-toggle:hover { .main-header .sidebar-toggle:hover {
color: #fff; color: #fff;
} }
.main-header .sidebar-toggle:focus,
.main-header .sidebar-toggle:active {
background: transparent;
}
.main-header .sidebar-toggle .icon-bar { .main-header .sidebar-toggle .icon-bar {
display: none; display: none;
} }
...@@ -267,6 +274,9 @@ a:focus { ...@@ -267,6 +274,9 @@ a:focus {
line-height: .9; line-height: .9;
} }
.main-header .logo { .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; display: block;
float: left; float: left;
height: 50px; height: 50px;
...@@ -278,6 +288,12 @@ a:focus { ...@@ -278,6 +288,12 @@ a:focus {
padding: 0 15px; padding: 0 15px;
font-weight: 300; font-weight: 300;
} }
.main-header .logo .logo-lg {
display: block;
}
.main-header .logo .logo-mini {
display: none;
}
.main-header .navbar-brand { .main-header .navbar-brand {
color: #fff; color: #fff;
} }
...@@ -600,6 +616,21 @@ a:focus { ...@@ -600,6 +616,21 @@ a:focus {
.sidebar-mini.sidebar-collapse .sidebar-form { .sidebar-mini.sidebar-collapse .sidebar-form {
display: none; 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 * Component: Dropdown menus
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册