DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12832 from Godmartinz/fix_footer_space

Browse source 
Fixed footer space when customized
This commit is contained in:
snipe 2023-04-17 20:11:15 -07:00 committed by GitHub
parent 2b10357c4e aabd5e92a8
commit c12ac9912c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/assets/less/overrides.less
View file

@ -141,6 +141,9 @@ a.accordion-header {
.dropdown-menu li a { .dropdown-menu li a {
//color: inherit; //color: inherit;
} }
.pull-text-right{
text-align: right; !important;
}
.main-header .sidebar-toggle:before { .main-header .sidebar-toggle:before {
content: "\f0c9"; content: "\f0c9";

19
resources/views/layouts/default.blade.php
View file

@ -850,10 +850,12 @@
</section> </section>
</div><!-- /.content-wrapper --> </div><!-- /.content-wrapper -->
@if ($snipeSettings->footer_text!='')
<footer class="main-footer hidden-print" style="display:grid;flex-direction:row;" >
@else
<footer class="main-footer hidden-print"> <footer class="main-footer hidden-print">
@endif
<div class="pull-right hidden-xs"> <div class="pull-text-right hidden-xs">
@if ($snipeSettings->version_footer!='off') @if ($snipeSettings->version_footer!='off')
@if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1'))) @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
&nbsp; <strong>Version</strong> {{ config('version.app_version') }} - &nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
@ -876,19 +878,18 @@
href="{{ $snipeSettings->privacy_policy_link }}" href="{{ $snipeSettings->privacy_policy_link }}"
target="_new" >{{ trans('admin/settings/general.privacy_policy') }}</a> target="_new" >{{ trans('admin/settings/general.privacy_policy') }}</a>
@endif @endif
made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
</div> </div>
<div class="pull-text-right"><a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,</div>
@if ($snipeSettings->footer_text!='') @if ($snipeSettings->footer_text!='')
<div class="pull-right"> <div style="flex-direction: row;">
{!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!} {!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
</div> </div>
@endif @endif
<br>
<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
</footer> </footer>