kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Made the sidebar menu items a little smaller

Browse Source
This commit is contained in:
Bernd Bestel
2020-01-27 22:34:48 +01:00
parent 0e41500a63
commit a64b35e9d4
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/55_UNRELEASED_2020-01-31.md
View File

@@ -71,7 +71,7 @@
- New user options in the display settings menu in the top right corner (defaults to disabled) - New user options in the display settings menu in the top right corner (defaults to disabled)
- Slightly optimized table loading & search performance (thanks @lwis) - Slightly optimized table loading & search performance (thanks @lwis)
- Added that the currently active sidebar menu item is always in view - Added that the currently active sidebar menu item is always in view
- Reordered the sidebar menu items a little bit and grouped them by borders to waste less space - Reordered the sidebar menu items a little bit, grouped them by borders and made them a little smaller to waste less space
- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field - Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field
- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis) - Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
- For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu) - For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu)

4
public/css/grocy.css
View File

@@ -319,6 +319,10 @@ html {
padding-right: 1.25em !important; padding-right: 1.25em !important;
} }
#sidebarResponsive .nav-item-sidebar {
line-height: 1;
}
/* Third party component customizations - Tempus Dominus */ /* Third party component customizations - Tempus Dominus */
.bootstrap-datetimepicker-widget.dropdown-menu { .bootstrap-datetimepicker-widget.dropdown-menu {
width: auto !important; width: auto !important;

BIN
publication_assets/dashboard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 125 KiB

34
views/layout/default.blade.php
View File

@@ -88,7 +88,7 @@
<ul class="navbar-nav navbar-sidenav"> <ul class="navbar-nav navbar-sidenav">
@if(GROCY_FEATURE_FLAG_STOCK) @if(GROCY_FEATURE_FLAG_STOCK)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Stock overview') }}" data-nav-for-page="stockoverview"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Stock overview') }}" data-nav-for-page="stockoverview">
<a class="nav-link discrete-link" href="{{ $U('/stockoverview') }}"> <a class="nav-link discrete-link" href="{{ $U('/stockoverview') }}">
<i class="fas fa-box"></i> <i class="fas fa-box"></i>
<span class="nav-link-text">{{ $__t('Stock overview') }}</span> <span class="nav-link-text">{{ $__t('Stock overview') }}</span>
@@ -96,7 +96,7 @@
</li> </li>
@endif @endif
@if(GROCY_FEATURE_FLAG_SHOPPINGLIST) @if(GROCY_FEATURE_FLAG_SHOPPINGLIST)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Shopping list') }}" data-nav-for-page="shoppinglist"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Shopping list') }}" data-nav-for-page="shoppinglist">
<a class="nav-link discrete-link" href="{{ $U('/shoppinglist') }}"> <a class="nav-link discrete-link" href="{{ $U('/shoppinglist') }}">
<i class="fas fa-shopping-cart"></i> <i class="fas fa-shopping-cart"></i>
<span class="nav-link-text">{{ $__t('Shopping list') }}</span> <span class="nav-link-text">{{ $__t('Shopping list') }}</span>
@@ -105,13 +105,13 @@
@endif @endif
@if(GROCY_FEATURE_FLAG_RECIPES) @if(GROCY_FEATURE_FLAG_RECIPES)
<div class="nav-item-divider"></div> <div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Recipes') }}" data-nav-for-page="recipes"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Recipes') }}" data-nav-for-page="recipes">
<a class="nav-link discrete-link" href="{{ $U('/recipes') }}"> <a class="nav-link discrete-link" href="{{ $U('/recipes') }}">
<i class="fas fa-cocktail"></i> <i class="fas fa-cocktail"></i>
<span class="nav-link-text">{{ $__t('Recipes') }}</span> <span class="nav-link-text">{{ $__t('Recipes') }}</span>
</a> </a>
</li> </li>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Meal plan') }}" data-nav-for-page="mealplan"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Meal plan') }}" data-nav-for-page="mealplan">
<a class="nav-link discrete-link" href="{{ $U('/mealplan') }}"> <a class="nav-link discrete-link" href="{{ $U('/mealplan') }}">
<i class="fas fa-paper-plane"></i> <i class="fas fa-paper-plane"></i>
<span class="nav-link-text">{{ $__t('Meal plan') }}</span> <span class="nav-link-text">{{ $__t('Meal plan') }}</span>
@@ -120,7 +120,7 @@
@endif @endif
@if(GROCY_FEATURE_FLAG_CHORES) @if(GROCY_FEATURE_FLAG_CHORES)
<div class="nav-item-divider"></div> <div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Chores overview') }}" data-nav-for-page="choresoverview"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Chores overview') }}" data-nav-for-page="choresoverview">
<a class="nav-link discrete-link" href="{{ $U('/choresoverview') }}"> <a class="nav-link discrete-link" href="{{ $U('/choresoverview') }}">
<i class="fas fa-home"></i> <i class="fas fa-home"></i>
<span class="nav-link-text">{{ $__t('Chores overview') }}</span> <span class="nav-link-text">{{ $__t('Chores overview') }}</span>
@@ -128,7 +128,7 @@
</li> </li>
@endif @endif
@if(GROCY_FEATURE_FLAG_TASKS) @if(GROCY_FEATURE_FLAG_TASKS)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Tasks') }}" data-nav-for-page="tasks"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Tasks') }}" data-nav-for-page="tasks">
<a class="nav-link discrete-link" href="{{ $U('/tasks') }}"> <a class="nav-link discrete-link" href="{{ $U('/tasks') }}">
<i class="fas fa-tasks"></i> <i class="fas fa-tasks"></i>
<span class="nav-link-text">{{ $__t('Tasks') }}</span> <span class="nav-link-text">{{ $__t('Tasks') }}</span>
@@ -136,7 +136,7 @@
</li> </li>
@endif @endif
@if(GROCY_FEATURE_FLAG_BATTERIES) @if(GROCY_FEATURE_FLAG_BATTERIES)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Batteries overview') }}" data-nav-for-page="batteriesoverview"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Batteries overview') }}" data-nav-for-page="batteriesoverview">
<a class="nav-link discrete-link" href="{{ $U('/batteriesoverview') }}"> <a class="nav-link discrete-link" href="{{ $U('/batteriesoverview') }}">
<i class="fas fa-battery-half"></i> <i class="fas fa-battery-half"></i>
<span class="nav-link-text">{{ $__t('Batteries overview') }}</span> <span class="nav-link-text">{{ $__t('Batteries overview') }}</span>
@@ -144,7 +144,7 @@
</li> </li>
@endif @endif
@if(GROCY_FEATURE_FLAG_EQUIPMENT) @if(GROCY_FEATURE_FLAG_EQUIPMENT)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Equipment') }}" data-nav-for-page="equipment"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Equipment') }}" data-nav-for-page="equipment">
<a class="nav-link discrete-link" href="{{ $U('/equipment') }}"> <a class="nav-link discrete-link" href="{{ $U('/equipment') }}">
<i class="fas fa-toolbox"></i> <i class="fas fa-toolbox"></i>
<span class="nav-link-text">{{ $__t('Equipment') }}</span> <span class="nav-link-text">{{ $__t('Equipment') }}</span>
@@ -153,7 +153,7 @@
@endif @endif
@if(GROCY_FEATURE_FLAG_CALENDAR) @if(GROCY_FEATURE_FLAG_CALENDAR)
<div class="nav-item-divider"></div> <div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Calendar') }}" data-nav-for-page="calendar"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Calendar') }}" data-nav-for-page="calendar">
<a class="nav-link discrete-link" href="{{ $U('/calendar') }}"> <a class="nav-link discrete-link" href="{{ $U('/calendar') }}">
<i class="fas fa-calendar-alt"></i> <i class="fas fa-calendar-alt"></i>
<span class="nav-link-text">{{ $__t('Calendar') }}</span> <span class="nav-link-text">{{ $__t('Calendar') }}</span>
@@ -163,27 +163,27 @@
@if(GROCY_FEATURE_FLAG_STOCK) @if(GROCY_FEATURE_FLAG_STOCK)
<div class="nav-item-divider"></div> <div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Purchase') }}" data-nav-for-page="purchase"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Purchase') }}" data-nav-for-page="purchase">
<a class="nav-link discrete-link" href="{{ $U('/purchase') }}"> <a class="nav-link discrete-link" href="{{ $U('/purchase') }}">
<i class="fas fa-shopping-cart"></i> <i class="fas fa-shopping-cart"></i>
<span class="nav-link-text">{{ $__t('Purchase') }}</span> <span class="nav-link-text">{{ $__t('Purchase') }}</span>
</a> </a>
</li> </li>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Consume') }}" data-nav-for-page="consume"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Consume') }}" data-nav-for-page="consume">
<a class="nav-link discrete-link" href="{{ $U('/consume') }}"> <a class="nav-link discrete-link" href="{{ $U('/consume') }}">
<i class="fas fa-utensils"></i> <i class="fas fa-utensils"></i>
<span class="nav-link-text">{{ $__t('Consume') }}</span> <span class="nav-link-text">{{ $__t('Consume') }}</span>
</a> </a>
</li> </li>
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Transfer') }}" data-nav-for-page="transfer"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Transfer') }}" data-nav-for-page="transfer">
<a class="nav-link discrete-link" href="{{ $U('/transfer') }}"> <a class="nav-link discrete-link" href="{{ $U('/transfer') }}">
<i class="fas fa-exchange-alt"></i> <i class="fas fa-exchange-alt"></i>
<span class="nav-link-text">{{ $__t('Transfer') }}</span> <span class="nav-link-text">{{ $__t('Transfer') }}</span>
</a> </a>
</li> </li>
@endif @endif
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Inventory') }}" data-nav-for-page="inventory"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Inventory') }}" data-nav-for-page="inventory">
<a class="nav-link discrete-link" href="{{ $U('/inventory') }}"> <a class="nav-link discrete-link" href="{{ $U('/inventory') }}">
<i class="fas fa-list"></i> <i class="fas fa-list"></i>
<span class="nav-link-text">{{ $__t('Inventory') }}</span> <span class="nav-link-text">{{ $__t('Inventory') }}</span>
@@ -191,7 +191,7 @@
</li> </li>
@endif @endif
@if(GROCY_FEATURE_FLAG_CHORES) @if(GROCY_FEATURE_FLAG_CHORES)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Chore tracking') }}" data-nav-for-page="choretracking"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Chore tracking') }}" data-nav-for-page="choretracking">
<a class="nav-link discrete-link" href="{{ $U('/choretracking') }}"> <a class="nav-link discrete-link" href="{{ $U('/choretracking') }}">
<i class="fas fa-play"></i> <i class="fas fa-play"></i>
<span class="nav-link-text">{{ $__t('Chore tracking') }}</span> <span class="nav-link-text">{{ $__t('Chore tracking') }}</span>
@@ -199,7 +199,7 @@
</li> </li>
@endif @endif
@if(GROCY_FEATURE_FLAG_BATTERIES) @if(GROCY_FEATURE_FLAG_BATTERIES)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Battery tracking') }}" data-nav-for-page="batterytracking"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Battery tracking') }}" data-nav-for-page="batterytracking">
<a class="nav-link discrete-link" href="{{ $U('/batterytracking') }}"> <a class="nav-link discrete-link" href="{{ $U('/batterytracking') }}">
<i class="fas fa-fire"></i> <i class="fas fa-fire"></i>
<span class="nav-link-text">{{ $__t('Battery tracking') }}</span> <span class="nav-link-text">{{ $__t('Battery tracking') }}</span>
@@ -212,7 +212,7 @@
@if($firstUserentity) @if($firstUserentity)
<div class="nav-item-divider"></div> <div class="nav-item-divider"></div>
@endif @endif
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $userentity->caption }}" data-nav-for-page="userentity-{{ $userentity->name }}"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $userentity->caption }}" data-nav-for-page="userentity-{{ $userentity->name }}">
<a class="nav-link discrete-link" href="{{ $U('/userobjects/' . $userentity->name) }}"> <a class="nav-link discrete-link" href="{{ $U('/userobjects/' . $userentity->name) }}">
<i class="{{ $userentity->icon_css_class }}"></i> <i class="{{ $userentity->icon_css_class }}"></i>
<span class="nav-link-text">{{ $userentity->caption }}</span> <span class="nav-link-text">{{ $userentity->caption }}</span>
@@ -222,7 +222,7 @@
@endforeach @endforeach
<div class="nav-item-divider"></div> <div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Manage master data') }}"> <li class="nav-item nav-item-sidebar" data-toggle="tooltip" data-placement="right" title="{{ $__t('Manage master data') }}">
<a class="nav-link nav-link-collapse collapsed discrete-link" data-toggle="collapse" href="#top-nav-manager-master-data"> <a class="nav-link nav-link-collapse collapsed discrete-link" data-toggle="collapse" href="#top-nav-manager-master-data">
<i class="fas fa-table"></i> <i class="fas fa-table"></i>
<span class="nav-link-text">{{ $__t('Manage master data') }}</span> <span class="nav-link-text">{{ $__t('Manage master data') }}</span>