Skip to content

Commit

Permalink
Merge pull request #12869 from Godmartinz/bug/sc-23134
Browse files Browse the repository at this point in the history
Fixed footer sizing issue
  • Loading branch information
snipe authored Sep 15, 2023
2 parents 054d876 + c9eb141 commit 131ccaa
Showing 1 changed file with 15 additions and 17 deletions.
32 changes: 15 additions & 17 deletions resources/views/layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -849,9 +849,15 @@ class="fas fa-check text-blue fa-fw"></i>
</section>

</div><!-- /.content-wrapper -->
<footer class="main-footer hidden-print">
<footer class="main-footer hidden-print" style="display:grid;flex-direction:column;">

<div class="pull-right hidden-xs">
<div class="1hidden-xs pull-left">
<div class="pull-left" >
<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>.
</div>
<div class="pull-right">
@if ($snipeSettings->version_footer!='off')
@if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
&nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
Expand All @@ -874,23 +880,15 @@ class="fas fa-check text-blue fa-fw"></i>
href="{{ $snipeSettings->privacy_policy_link }}"
target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
@endif


</div>
@if ($snipeSettings->footer_text!='')
<div class="pull-right">
{!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
</div>
@endif


<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>.
<br>
@if ($snipeSettings->footer_text!='')
<div class="pull-left">
{!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
</div>
@endif
</div>
</footer>



</div><!-- ./wrapper -->


Expand Down

0 comments on commit 131ccaa

Please sign in to comment.