Merge pull request #376 from thusithak/master

EMM 2.2.0-Alpha2 theme migration and issue fixes
revert-70aa11f8
Kamidu Sachith Punchihewa 8 years ago committed by GitHub
commit 5e6d8e667d

@ -31,12 +31,8 @@
{{/if}}
</span>
</a>
<ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
<ul class="dropdown-menu dropdown-menu-right slideInDown"
role="menu">
<li class="dropdown-header visible-xs">
{{@user.username}}<span class="caret"></span>
</li>
<li class="divider visible-xs"></li>
<li>
<a href="javascript:void(0)" id="change-password">Change password</a>
</li>

@ -30,13 +30,11 @@
</button>
{{defineZone "navbarHeader"}}
</div>
<div class="navbar-collapse collapse" aria-expanded="false">
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav">
{{defineZone "navbarCollapsableLeftItems"}}
</ul>
<ul class="nav navbar-nav navbar-right">
{{defineZone "navbarCollapsableRightItems"}}
</ul>
</div>
</div>
{{defineZone "navbarBelow"}}

@ -3054,7 +3054,7 @@ tbody.collapse.in {
right: auto;
}
}
@media (max-width : 480px) {
@media (max-width : 768px) {
.navbar-right .dropdown-menu-right {
left: auto;
right: 0;
@ -3901,6 +3901,33 @@ tbody.collapse.in {
margin-right: 0;
}
}
@media (max-width: 768px) {
.navbar-right {
margin-right: -15px;
}
.navbar-default .navbar-toggle{
}
.navbar-default .navbar-toggle .icon-bar{
background-color:#fff!important;
}
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus{
background-color:#526a84!important;
}
.navbar-default .navbar-toggle:hover .icon-bar, .navbar-default .navbar-toggle:focus .icon-bar{
background-color:#798EA5!important;
}
.navbar-toggle {
margin-right: 10px;
padding: 13px;
margin-top: 0px;
margin-bottom: 0px;
}
#navbar .navbar-nav{
margin:0px;
border-bottom:1px solid #798EA5;
}
}
.navbar-default {
background-color: #f8f8f8;
border-color: #e7e7e7;

Loading…
Cancel
Save