lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #15352 from Godmartinz/mobile_breakpoint

Browse source 
Fixed Mobile misalignment of info on Assets and Users view pages
This commit is contained in:
snipe 2024-08-22 11:18:06 +01:00 • committed by GitHub
commit bc9ea5a2ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -851,6 +851,24 @@ th.css-component > .th-inner::before
margin-top:50px margin-top:50px
} }
} }
@media screen and (max-width: 992px){
.info-stack-container {
display: flex;
flex-direction: column;
}
.col-md-3.col-xs-12.col-sm-push-9.info-stack{
left:auto;
order:1;
}
.col-md-9.col-xs-12.col-sm-pull-3.info-stack{
right:auto;
order:2;
}
.info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2{
width:auto;
float:none;
}
}
@media screen and (max-width: 1318px) and (min-width: 1200px){ @media screen and (max-width: 1318px) and (min-width: 1200px){
.admin.box{ .admin.box{
height:170px; height:170px;

7
resources/views/hardware/view.blade.php
View file

@ -160,9 +160,9 @@
</div> </div>
</div> </div>
@endif @endif
<div class="info-stack-container">
<!-- Start button column --> <!-- Start button column -->
<div class="col-md-3 col-xs-12 col-sm-push-9"> <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
@if (($asset->image) || (($asset->model) && ($asset->model->image!=''))) @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
@ -334,7 +334,7 @@
<!-- End button column --> <!-- End button column -->
<div class="col-md-9 col-xs-12 col-sm-pull-3"> <div class="col-md-9 col-xs-12 col-sm-pull-3 info-stack">
<div class="row-new-striped"> <div class="row-new-striped">
@ -1078,6 +1078,7 @@
</div> <!--/end striped container--> </div> <!--/end striped container-->
</div> <!-- end col-md-9 --> </div> <!-- end col-md-9 -->
</div><!-- end info-stack-container -->
</div> <!--/.row--> </div> <!--/.row-->
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->

7
resources/views/users/view.blade.php
View file

@ -159,9 +159,9 @@
</div> </div>
</div> </div>
@endif @endif
<div class="info-stack-container">
<!-- Start button column --> <!-- Start button column -->
<div class="col-md-3 col-xs-12 col-sm-push-9"> <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
@ -308,7 +308,7 @@
<!-- End button column --> <!-- End button column -->
<div class="col-md-9 col-xs-12 col-sm-pull-3"> <div class="col-md-9 col-xs-12 col-sm-pull-3 info-stack">
<div class="row-new-striped"> <div class="row-new-striped">
@ -767,6 +767,7 @@
@endif @endif
</div> <!--/end striped container--> </div> <!--/end striped container-->
</div> <!-- end col-md-9 --> </div> <!-- end col-md-9 -->
</div><!-- end info-stack-container-->
</div> <!--/.row--> </div> <!--/.row-->
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->