hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2739 from yariplus/mobifix

Browse Source 
Fix #2684 ACP navbar on mobile.
v1.18.x
Julian Lam 10 years ago
parent 4dad7de33f 6c44de27ed
commit 4ba6d44858
2 changed files with 89 additions and 62 deletions
Show Stats Download Patch File Download Diff File

72
public/less/admin/admin.less
Unescape Escape View File

@ -183,15 +183,18 @@
.box-header-font
}
#user_dropdown {
padding: 6px;
img {
width: 30px;
height: 30px;
vertical-align: -88%;
margin-right: 5px;
}
#user_label {
a {
padding-top: 13px;
padding-bottom: 13px;
img {
width: 24px;
height: 24px;
border-radius: 50%;
border: 1px solid #454;
}
}
}
.icon-container {
@ -213,24 +216,39 @@
}
}
.navbar {
padding: 0 5px;
.nav-home a, .nav-home a:hover {
width: 30px;
height: 30px;
padding: 5px;
text-align: center;
margin-top: 10px;
background: #DDD;
i {
color: black;
font-size: 17px;
}
}
}
.navbar-static-top, .navbar-fixed-top {
box-shadow: 0px -3px 12px rgba(0, 0, 0, 0.5);
}
.navbar-header > .navbar-toggle {
margin-right: 8px;
}
.navbar-nav {
margin-top: 0;
margin-bottom: 0;
>li {
>a {
padding-top: 15px;
padding-bottom: 15px;
}
>a:hover, >a:focus {
color: @gray-dark;
background-color: @gray-light;
}
>#reconnect {
color: @gray-light;
}
>#reconnect:focus, >#reconnect:hover {
color: @gray-light;
background-color: transparent;
}
}
}
#acp-search {
input {

79
src/views/admin/header.tpl
Unescape Escape View File

@ -56,46 +56,55 @@
</head>
<body class="admin">
<div class="navbar navbar-inverse navbar-fixed-top header">
<nav class="navbar navbar-inverse navbar-fixed-top header">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand nodebb-logo" href="{relative_path}/admin/general/dashboard"><img src="{relative_path}/images/logo.png" alt="NodeBB ACP" /> Admin Control Panel <span id="breadcrumbs" class="hidden-xs"></span></a>
<ul class="nav navbar-nav pull-left">
<li>
<a href="#" id="reconnect"></a>
</li>
</ul>
</div>
<ul class="nav navbar-nav">
<li>
<a href="#" id="reconnect"></a>
</li>
</ul>
<ul id="logged-in-menu" class="nav navbar-nav navbar-right">
<form class="navbar-form navbar-left hidden-xs" role="search">
<div class="form-group" id="acp-search" >
<div class="dropdown" >
<input type="text" data-toggle="dropdown" class="form-control" placeholder="/">
<ul class="dropdown-menu" role="menu"></ul>
</div>
</div>
</form>
<li class="nav-home">
<a href="{relative_path}/" target="_blank" title="Open forum homepage"><i class="fa fa-home"></i></a>
</li>
<li id="user_label" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown">
<img src="{userpicture}"/>
</a>
<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
<li>
<a id="user-profile-link" href="{relative_path}/user/{userslug}" target="_top"><span>Profile</span></a>
</li>
<li id="logout-link">
<a href="#">Log out</a>
</li>
</ul>
</li>
</ul>
<div class="navbar-collapse collapse">
<ul id="logged-in-menu" class="navbar-nav nav navbar-right pull-right">
<li style="float:left;">
<form class="navbar-form hidden-xs" role="search">
<div class="form-group" id="acp-search" >
<div class="dropdown" >
<input type="text" data-toggle="dropdown" class="form-control" placeholder="/">
<ul class="dropdown-menu" role="menu"></ul>
</div>
</div>
</form>
</li>
<li id="user_label" class="dropdown pull-right">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown">
<img src="{userpicture}"/>
</a>
<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
<li>
<a id="user-profile-link" href="{relative_path}/user/{userslug}" target="_top"><span>Profile</span></a>
</li>
<li id="logout-link">
<a href="#">Log out</a>
</li>
</ul>
</li>
<li class="nav-home pull-right">
<a href="{relative_path}/" target="_blank" title="Open forum homepage" data-original-title="Open forum homepage">
<i class="fa fa-home fa-fw"></i>
</a>
</li>
</ul>
</div>
</div>
</div>
</nav>
<div class="wrapper">
<div id="main-menu" class="nano">

Write Preview
Loading…
Cancel
Save