Skip to content

Commit

Permalink
Fix issue ColorlibHQ#1093
Browse files Browse the repository at this point in the history
  • Loading branch information
@almasaeed2010
almasaeed2010 committed Jul 1, 2016
1 parent bca8e8e commit 8e278e1
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion build/less/core.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ body.hold-transition {
.main-footer,
.main-sidebar,
.left-side,
.main-header > .navbar,
.main-header .navbar,
.main-header .logo {
/* Fix for IE */
.transition(none);
Expand Down
2 changes: 1 addition & 1 deletion build/less/header.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
max-height: 100px;
z-index: 1030;
//Navbar
> .navbar {
.navbar {
.transition(margin-left @transition-speed @transition-fn);
margin-bottom: 0;
margin-left: @sidebar-width;
Expand Down
2 changes: 1 addition & 1 deletion build/less/skins/skin-black-light.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
color: #333;
border-right: 1px solid #eee;
}
> .navbar {
.navbar {
.navbar-variant(#fff; #333; #999; #fff);
> .sidebar-toggle {
color: #333;
Expand Down
2 changes: 1 addition & 1 deletion build/less/skins/skin-black.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
color: #333;
border-right: 1px solid #eee;
}
> .navbar {
.navbar {
.navbar-variant(#fff; #333; #999; #fff);
> .sidebar-toggle {
color: #333;
Expand Down
6 changes: 3 additions & 3 deletions dist/css/AdminLTE.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ body.hold-transition .right-side,
body.hold-transition .main-footer,
body.hold-transition .main-sidebar,
body.hold-transition .left-side,
body.hold-transition .main-header > .navbar,
body.hold-transition .main-header .navbar,
body.hold-transition .main-header .logo {
/* Fix for IE */
-webkit-transition: none;
Expand Down Expand Up @@ -195,7 +195,7 @@ a:focus {
max-height: 100px;
z-index: 1030;
}
.main-header > .navbar {
.main-header .navbar {
-webkit-transition: margin-left 0.3s ease-in-out;
-o-transition: margin-left 0.3s ease-in-out;
transition: margin-left 0.3s ease-in-out;
Expand All @@ -205,7 +205,7 @@ a:focus {
min-height: 50px;
border-radius: 0;
}
.layout-top-nav .main-header > .navbar {
.layout-top-nav .main-header .navbar {
margin-left: 0;
}
.main-header #navbar-search-input.form-control {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/AdminLTE.min.css
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions dist/css/skins/_all-skins.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,38 +317,38 @@
color: #333;
border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar {
.skin-black .main-header .navbar {
background-color: #ffffff;
}
.skin-black .main-header > .navbar .nav > li > a {
.skin-black .main-header .navbar .nav > li > a {
color: #333333;
}
.skin-black .main-header > .navbar .nav > li > a:hover,
.skin-black .main-header > .navbar .nav > li > a:active,
.skin-black .main-header > .navbar .nav > li > a:focus,
.skin-black .main-header > .navbar .nav .open > a,
.skin-black .main-header > .navbar .nav .open > a:hover,
.skin-black .main-header > .navbar .nav .open > a:focus,
.skin-black .main-header > .navbar .nav > .active > a {
.skin-black .main-header .navbar .nav > li > a:hover,
.skin-black .main-header .navbar .nav > li > a:active,
.skin-black .main-header .navbar .nav > li > a:focus,
.skin-black .main-header .navbar .nav .open > a,
.skin-black .main-header .navbar .nav .open > a:hover,
.skin-black .main-header .navbar .nav .open > a:focus,
.skin-black .main-header .navbar .nav > .active > a {
background: #ffffff;
color: #999999;
}
.skin-black .main-header > .navbar .sidebar-toggle {
.skin-black .main-header .navbar .sidebar-toggle {
color: #333333;
}
.skin-black .main-header > .navbar .sidebar-toggle:hover {
.skin-black .main-header .navbar .sidebar-toggle:hover {
color: #999999;
background: #ffffff;
}
.skin-black .main-header > .navbar > .sidebar-toggle {
.skin-black .main-header .navbar > .sidebar-toggle {
color: #333;
border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-nav > li > a {
.skin-black .main-header .navbar .navbar-nav > li > a {
border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black .main-header > .navbar .navbar-right > li > a {
.skin-black .main-header .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black .main-header .navbar .navbar-right > li > a {
border-left: 1px solid #eee;
border-right-width: 0;
}
Expand Down Expand Up @@ -475,38 +475,38 @@
color: #333;
border-right: 1px solid #eee;
}
.skin-black-light .main-header > .navbar {
.skin-black-light .main-header .navbar {
background-color: #ffffff;
}
.skin-black-light .main-header > .navbar .nav > li > a {
.skin-black-light .main-header .navbar .nav > li > a {
color: #333333;
}
.skin-black-light .main-header > .navbar .nav > li > a:hover,
.skin-black-light .main-header > .navbar .nav > li > a:active,
.skin-black-light .main-header > .navbar .nav > li > a:focus,
.skin-black-light .main-header > .navbar .nav .open > a,
.skin-black-light .main-header > .navbar .nav .open > a:hover,
.skin-black-light .main-header > .navbar .nav .open > a:focus,
.skin-black-light .main-header > .navbar .nav > .active > a {
.skin-black-light .main-header .navbar .nav > li > a:hover,
.skin-black-light .main-header .navbar .nav > li > a:active,
.skin-black-light .main-header .navbar .nav > li > a:focus,
.skin-black-light .main-header .navbar .nav .open > a,
.skin-black-light .main-header .navbar .nav .open > a:hover,
.skin-black-light .main-header .navbar .nav .open > a:focus,
.skin-black-light .main-header .navbar .nav > .active > a {
background: #ffffff;
color: #999999;
}
.skin-black-light .main-header > .navbar .sidebar-toggle {
.skin-black-light .main-header .navbar .sidebar-toggle {
color: #333333;
}
.skin-black-light .main-header > .navbar .sidebar-toggle:hover {
.skin-black-light .main-header .navbar .sidebar-toggle:hover {
color: #999999;
background: #ffffff;
}
.skin-black-light .main-header > .navbar > .sidebar-toggle {
.skin-black-light .main-header .navbar > .sidebar-toggle {
color: #333;
border-right: 1px solid #eee;
}
.skin-black-light .main-header > .navbar .navbar-nav > li > a {
.skin-black-light .main-header .navbar .navbar-nav > li > a {
border-right: 1px solid #eee;
}
.skin-black-light .main-header > .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black-light .main-header > .navbar .navbar-right > li > a {
.skin-black-light .main-header .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black-light .main-header .navbar .navbar-right > li > a {
border-left: 1px solid #eee;
border-right-width: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/css/skins/_all-skins.min.css
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions dist/css/skins/skin-black-light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,38 @@
color: #333;
border-right: 1px solid #eee;
}
.skin-black-light .main-header > .navbar {
.skin-black-light .main-header .navbar {
background-color: #ffffff;
}
.skin-black-light .main-header > .navbar .nav > li > a {
.skin-black-light .main-header .navbar .nav > li > a {
color: #333333;
}
.skin-black-light .main-header > .navbar .nav > li > a:hover,
.skin-black-light .main-header > .navbar .nav > li > a:active,
.skin-black-light .main-header > .navbar .nav > li > a:focus,
.skin-black-light .main-header > .navbar .nav .open > a,
.skin-black-light .main-header > .navbar .nav .open > a:hover,
.skin-black-light .main-header > .navbar .nav .open > a:focus,
.skin-black-light .main-header > .navbar .nav > .active > a {
.skin-black-light .main-header .navbar .nav > li > a:hover,
.skin-black-light .main-header .navbar .nav > li > a:active,
.skin-black-light .main-header .navbar .nav > li > a:focus,
.skin-black-light .main-header .navbar .nav .open > a,
.skin-black-light .main-header .navbar .nav .open > a:hover,
.skin-black-light .main-header .navbar .nav .open > a:focus,
.skin-black-light .main-header .navbar .nav > .active > a {
background: #ffffff;
color: #999999;
}
.skin-black-light .main-header > .navbar .sidebar-toggle {
.skin-black-light .main-header .navbar .sidebar-toggle {
color: #333333;
}
.skin-black-light .main-header > .navbar .sidebar-toggle:hover {
.skin-black-light .main-header .navbar .sidebar-toggle:hover {
color: #999999;
background: #ffffff;
}
.skin-black-light .main-header > .navbar > .sidebar-toggle {
.skin-black-light .main-header .navbar > .sidebar-toggle {
color: #333;
border-right: 1px solid #eee;
}
.skin-black-light .main-header > .navbar .navbar-nav > li > a {
.skin-black-light .main-header .navbar .navbar-nav > li > a {
border-right: 1px solid #eee;
}
.skin-black-light .main-header > .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black-light .main-header > .navbar .navbar-right > li > a {
.skin-black-light .main-header .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black-light .main-header .navbar .navbar-right > li > a {
border-left: 1px solid #eee;
border-right-width: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/css/skins/skin-black-light.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions dist/css/skins/skin-black.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,38 @@
color: #333;
border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar {
.skin-black .main-header .navbar {
background-color: #ffffff;
}
.skin-black .main-header > .navbar .nav > li > a {
.skin-black .main-header .navbar .nav > li > a {
color: #333333;
}
.skin-black .main-header > .navbar .nav > li > a:hover,
.skin-black .main-header > .navbar .nav > li > a:active,
.skin-black .main-header > .navbar .nav > li > a:focus,
.skin-black .main-header > .navbar .nav .open > a,
.skin-black .main-header > .navbar .nav .open > a:hover,
.skin-black .main-header > .navbar .nav .open > a:focus,
.skin-black .main-header > .navbar .nav > .active > a {
.skin-black .main-header .navbar .nav > li > a:hover,
.skin-black .main-header .navbar .nav > li > a:active,
.skin-black .main-header .navbar .nav > li > a:focus,
.skin-black .main-header .navbar .nav .open > a,
.skin-black .main-header .navbar .nav .open > a:hover,
.skin-black .main-header .navbar .nav .open > a:focus,
.skin-black .main-header .navbar .nav > .active > a {
background: #ffffff;
color: #999999;
}
.skin-black .main-header > .navbar .sidebar-toggle {
.skin-black .main-header .navbar .sidebar-toggle {
color: #333333;
}
.skin-black .main-header > .navbar .sidebar-toggle:hover {
.skin-black .main-header .navbar .sidebar-toggle:hover {
color: #999999;
background: #ffffff;
}
.skin-black .main-header > .navbar > .sidebar-toggle {
.skin-black .main-header .navbar > .sidebar-toggle {
color: #333;
border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-nav > li > a {
.skin-black .main-header .navbar .navbar-nav > li > a {
border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black .main-header > .navbar .navbar-right > li > a {
.skin-black .main-header .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black .main-header .navbar .navbar-right > li > a {
border-left: 1px solid #eee;
border-right-width: 0;
}
Expand Down
Loading

0 comments on commit 8e278e1

Please sign in to comment.