Skip to content

Improve navbar (for mobile) #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzur merged 4 commits into from
Oct 24, 2023
Merged

Improve navbar (for mobile) #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
273cd35
Implement navbar links as buttons
mzur Oct 23, 2023
be499d4
Implement mobile behavior of navbar
mzur Oct 23, 2023
22a8b07
Mabe navbar button default background transparent
mzur Oct 24, 2023
bf58e81
Fix navbar height caused by buttons
mzur Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions resources/assets/sass/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,43 @@
// Disable navbar collapse on small screens.
.navbar-header {
float: left !important;
}

.navbar-right {
float: right !important;
}

.navbar-nav {
margin-top: 0 !important;
margin-bottom: 0 !important;

.open .dropdown-menu {
position: absolute !important;
}
}

.navbar-right .dropdown-menu {
right: 0 !important;
left: auto !important;
}

.navbar-nav > li {
float: left !important;
}

.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: $gray-darker !important;
}

@media (max-width: $screen-sm-max) {
.navbar-left {
display: none;
}
}

.dropdown-menu {
background-color: $gray-lighter !important;

.divider {
margin: 3px 0;
}
Expand Down Expand Up @@ -89,3 +128,17 @@
}
}
}

.navbar-btn-link {
.btn-default:not(:hover) {
background-color: transparent;
}
}

.nav > li > a.navbar-btn-link {
padding: 8px 3px;
}

.nav > li:last-child > a.navbar-btn-link {
margin-right: 12px; // 15px space with the 3px padding
}
22 changes: 0 additions & 22 deletions resources/assets/sass/_notifications.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
@keyframes notification-blink {
0% {opacity: 0;}
1% {opacity: 1;}
2% {opacity: 0;}
3% {opacity: 1;}
4% {opacity: 0;}
5% {opacity: 1;}
}

.notifications-icon {
position: relative;
}

.notifications-icon__count {
position: absolute;
display: block;
top: 10px;
right: 7px;
width: 10px;
height: 10px;
border-radius: 5px;
background-color: $brand-info;
border: 1px solid white;
animation: notification-blink 20s infinite;
}

.notification__action {
margin-top: 10px;
margin-bottom: 0;
Expand Down
6 changes: 5 additions & 1 deletion resources/views/partials/help-menu.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<li id="help-menu" is="dropdown" ref="dropdown" tag="li">
<a href="#" onclick="event.preventDefault()" class="dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" title="Help menu"><i class="fa fa-question-circle"></i></a>
<a href="#" onclick="event.preventDefault()" class="dropdown-toggle navbar-btn-link" role="button" aria-haspopup="true" aria-expanded="false" title="Help menu">
<span class="btn btn-default">
<i class="fa fa-question-circle"></i> <span class="caret"></span>
</span>
</a>
<template slot="dropdown">
<li>
<a href="{{ route('manual') }}" title="View the manual">Manual</a>
Expand Down
17 changes: 10 additions & 7 deletions resources/views/partials/navbar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,21 @@
<ul class="nav navbar-nav">
@can('sudo')
<li class="sudo-mode-indicator" title="You are in Super User Mode">
<p class="navbar-text">su</p>
<a href="{{route('settings-account')}}" class="navbar-btn-link">
<span class="btn btn-danger">
su
</span>
</a>
</li>
@endcan
<li>
<a href="{{route('search')}}" title="Search"><i class="fa fa-search"></i></a>
<a href="{{route('search')}}" title="Search" class="navbar-btn-link"><span class="btn btn-default"><i class="fa fa-search"></i></span></a>
</li>
<li>
<a href="{{route('notifications')}}" class="notifications-icon" @if ($hasNotification) title="You have unread notifications" @else title="Notifications" @endif>
<i class="fa fa-bell"></i>
@if ($hasNotification)
<span class="notifications-icon__count"></span>
@endif
<a href="{{route('notifications')}}" class="notifications-icon navbar-btn-link" @if ($hasNotification) title="You have unread notifications" @else title="Notifications" @endif>
<span class="btn @if ($hasNotification) btn-info @else btn-default @endif">
<i class="fa fa-bell"></i>
</span>
</a>
</li>
@include('partials.help-menu')
Expand Down
6 changes: 5 additions & 1 deletion resources/views/partials/top-menu.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<li id="top-menu" is="dropdown" ref="dropdown" tag="li">
<a href="#" onclick="event.preventDefault()" class="dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" title="Main menu"><i class="fa fa-bars"></i></a>
<a href="#" onclick="event.preventDefault()" class="dropdown-toggle navbar-btn-link" role="button" aria-haspopup="true" aria-expanded="false" title="Main menu">
<span class="btn btn-default">
<i class="fa fa-bars"></i> <span class="caret"></span>
</span>
</a>
<template slot="dropdown">
<li class="dropdown-header">
Signed in as <strong>{{ $user->firstname }} {{ $user->lastname }}</strong>
Expand Down