From 9858b0f37f2f27c43c47e6f437b36e8a72985690 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 20 Aug 2024 14:23:55 -0700 Subject: [PATCH 1/3] fixes info tab for users and assets --- resources/assets/less/overrides.less | 18 ++++++++++++++++++ resources/views/hardware/view.blade.php | 7 ++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 3358e556321b..7b4dfc9bc65a 100644 --- 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:2; + } + .col-md-9.col-xs-12.col-sm-pull-3.info-stack{ + right:auto; + order:1; + } + .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 index 2da403834073..61b90c28dceb 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -160,9 +160,9 @@ @endif - +
-
+
@if (($asset->image) || (($asset->model) && ($asset->model->image!=''))) @@ -334,7 +334,7 @@ -
+
@@ -1078,6 +1078,7 @@
+
From 9d484077ae030020e3b1cd585783d8db03c5c0f5 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 20 Aug 2024 14:24:37 -0700 Subject: [PATCH 2/3] missed a file --- resources/views/users/view.blade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 8fbed865eec4..dd36377c479f 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -159,9 +159,9 @@
@endif - +
-
+
@@ -306,7 +306,7 @@ -
+
@@ -765,6 +765,7 @@ @endif
+
From 963911f2e19b04656b470d00da76cedfe5b3d068 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 21 Aug 2024 00:23:10 -0700 Subject: [PATCH 3/3] changed order of info stgack --- resources/assets/less/overrides.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 7b4dfc9bc65a..735791b4cdcd 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -858,11 +858,11 @@ th.css-component > .th-inner::before } .col-md-3.col-xs-12.col-sm-push-9.info-stack{ left:auto; - order:2; + order:1; } .col-md-9.col-xs-12.col-sm-pull-3.info-stack{ right:auto; - order:1; + 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;