Skip to content
This repository has been archived by the owner on Nov 20, 2020. It is now read-only.

Commit

Permalink
#39 Hamburger menu fixed on admin + Made admin pages more mobile frie…
Browse files Browse the repository at this point in the history 
…ndly
  • Loading branch information
@Izoman
Izoman committed Feb 7, 2017
1 parent 8c486dc commit 23b8c8f
Show file tree
Hide file tree
Showing 3 changed files with 147 additions and 112 deletions.
2 changes: 1 addition & 1 deletion resources/assets/sass/_mediaqueries.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ img {
display: none;
}

.navbar-default{
.navbar-default, .navbar-inverse{
.navbar-brand{
padding: 0 25px
}
Expand Down
34 changes: 32 additions & 2 deletions resources/assets/sass/components/_topnav.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
}

.navbar-default{
.navbar-default, .navbar-inverse{
.navbar-brand{
padding: 0;
}
Expand All @@ -34,8 +34,10 @@
margin-right: 100px;
margin-top: ($navbar-height - $navlogo-height)/2;
}
}

.navbar-nav{
.navbar-default {
.navbar-nav{
li{
a{
box-sizing: border-box;
Expand All @@ -49,6 +51,34 @@
}
}

&.active{
a{
// border-bottom: 0px none;

&:hover, &:focus{
// border-bottom: 0px none;
}
}
}
}
}
}

.navbar-inverse {
.navbar-nav{
li{
a{
box-sizing: border-box;
padding: 0 30px;
height: $navbar-height;
line-height: $navbar-height;

&:hover, &:focus{
// border-bottom: 0px none;
background-color: darken($color-orange, 43%);
}
}

&.active{
a{
// border-bottom: 0px none;
Expand Down
223 changes: 114 additions & 109 deletions resources/views/layouts/backoffice.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,117 +9,122 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css">
</head>
<body>
<nav class="navbar navbar-inverse">
<div class="container-fluid">
<a class="navbar-brand" href="/">{{ \W4P\Models\Setting::get('platform.name') }}</a>
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#hamburger" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
{{-- WRAPPER --}}
<div class="wrapper">
<div class="container">
<div class="row">
{{-- NAVIGATION --}}
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#hamburger" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ URL::route('home') }}">
<p class="navlogo">{{ \W4P\Models\Setting::get('platform.name') }}</p>
</a>
</div>
<div class="collapse navbar-collapse" id="hamburger">
<ul class="nav navbar-nav">
<li>
<a href="{{ URL::route('admin::index') }}">{{ trans('backoffice.dashboard') }}</a>
</li>
{{-- First dropdown --}}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{{ trans('backoffice.platform') }} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="separator">{{ trans('backoffice.manage_pages') }}</li>
<li>
<a href="{{ URL::route('admin::editPage', 'how_it_works') }}">{{ trans('generic.how_does_it_work') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::editPage', 'press') }}">{{ trans('generic.press_materials') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::editPage', 'terms_of_use') }}">{{ trans('generic.terms_of_use') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::editPage', 'privacy_policy') }}">{{ trans('generic.privacy_policy') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.social') }}</li>
<li>
<a href="{{ URL::route('admin::social') }}">{{ trans('backoffice.social_settings') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.administration') }}</li>
<li>
<a href="{{ URL::route('admin::platform') }}">{{ trans('backoffice.general_platform') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::password') }}">{{ trans('backoffice.change_password') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::previous') }}">{{ trans('backoffice.previous_projects') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::email') }}">{{ trans('backoffice.email') }}</a>
</li>
</ul>
</li>

</button>

<div class="collapse navbar-collapse" id="hamburger">
<ul class="nav navbar-nav">
<li>
<a href="{{ URL::route('admin::index') }}">{{ trans('backoffice.dashboard') }}</a>
</li>
{{-- First dropdown --}}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{{ trans('backoffice.platform') }} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="separator">{{ trans('backoffice.manage_pages') }}</li>
<li>
<a href="{{ URL::route('admin::editPage', 'how_it_works') }}">{{ trans('generic.how_does_it_work') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::editPage', 'press') }}">{{ trans('generic.press_materials') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::editPage', 'terms_of_use') }}">{{ trans('generic.terms_of_use') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::editPage', 'privacy_policy') }}">{{ trans('generic.privacy_policy') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.social') }}</li>
<li>
<a href="{{ URL::route('admin::social') }}">{{ trans('backoffice.social_settings') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.administration') }}</li>
<li>
<a href="{{ URL::route('admin::platform') }}">{{ trans('backoffice.general_platform') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::password') }}">{{ trans('backoffice.change_password') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::previous') }}">{{ trans('backoffice.previous_projects') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::email') }}">{{ trans('backoffice.email') }}</a>
</li>
</ul>
</li>

{{-- Second dropdown --}}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{{ trans('backoffice.project') }} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="separator">{{ trans('backoffice.manage') }}</li>
<li>
<a href="{{ URL::route('admin::organisation') }}">{{ trans('backoffice.organisation') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::project') }}">{{ trans('backoffice.project') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::tiers') }}">{{ trans('backoffice.tiers') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::posts') }}">{{ trans('backoffice.posts') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::goals') }}">{{ trans('backoffice.goals') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.view') }}</li>
<li>
<a href="{{ URL::route('admin::donations') }}">{{ trans('backoffice.donations') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.download') }}</li>
<li>
<a href="{{ URL::route('admin::userExport') }}">
{{ trans('backoffice.download_donors') }}
</a>
</li>
<li>
<a href="{{ URL::route('admin::userExportTiers') }}">
{{ trans('backoffice.download_tiers') }}
</a>
</li>
</ul>
</li>
</ul>
</div>
{{-- Second dropdown --}}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{{ trans('backoffice.project') }} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="separator">{{ trans('backoffice.manage') }}</li>
<li>
<a href="{{ URL::route('admin::organisation') }}">{{ trans('backoffice.organisation') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::project') }}">{{ trans('backoffice.project') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::tiers') }}">{{ trans('backoffice.tiers') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::posts') }}">{{ trans('backoffice.posts') }}</a>
</li>
<li>
<a href="{{ URL::route('admin::goals') }}">{{ trans('backoffice.goals') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.view') }}</li>
<li>
<a href="{{ URL::route('admin::donations') }}">{{ trans('backoffice.donations') }}</a>
</li>
<li role="separator" class="divider"></li>
<li class="separator">{{ trans('backoffice.download') }}</li>
<li>
<a href="{{ URL::route('admin::userExport') }}">
{{ trans('backoffice.download_donors') }}
</a>
</li>
<li>
<a href="{{ URL::route('admin::userExportTiers') }}">
{{ trans('backoffice.download_tiers') }}
</a>
</li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
</div>
</div>
</div>
</nav>
<br/>
<div class="container">
<div class="row">
</div>
<div class="content">
@yield('content')
</div>
</div>
@include('partials.footer')
{{-- MAIN CONTENT --}}
<div class="content container">
@yield('content')
</div>
</div>
@include('partials.footer')

</body>
<script src="{{ elixir("js/core.js") }}"></script>
<script src="{{ elixir("js/admin.js") }}"></script>
Expand Down

0 comments on commit 23b8c8f

Please sign in to comment.