Merge pull request #15352 from Godmartinz/mobile_breakpoint

Fixed Mobile misalignment of info on Assets and Users view pages
snipe · Aug 22, 2024 · bc9ea5a · bc9ea5a
2 parents 4635a6e + 963911f
commit bc9ea5a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
@@ -851,6 +851,24 @@ th.css-component > .th-inner::before
     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){
   .admin.box{
     height:170px;

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
@@ -160,9 +160,9 @@
                                     </div>
                                 </div>
                             @endif
-
+                        <div class="info-stack-container">
                             <!-- 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">
                                     @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
@@ -334,7 +334,7 @@
 
                             <!-- 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">
 
@@ -1078,6 +1078,7 @@
 
                                 </div> <!--/end striped container-->
                             </div> <!-- end col-md-9 -->
+                        </div><!-- end info-stack-container -->
                         </div> <!--/.row-->
                     </div><!-- /.tab-pane -->
 

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
@@ -159,9 +159,9 @@
                 </div>
               </div>
             @endif
-
+        <div class="info-stack-container">
             <!-- 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 -->
 
-            <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">
 
@@ -767,6 +767,7 @@
                    @endif
                   </div> <!--/end striped container-->
                 </div> <!-- end col-md-9 -->
+             </div><!-- end info-stack-container-->
           </div> <!--/.row-->
         </div><!-- /.tab-pane -->