From addd806653dbdd65cde7826928e8ec9a4455b7fb Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 17 May 2023 10:47:50 -0700 Subject: [PATCH 1/4] testing overflow solutions --- resources/assets/less/overrides.less | 6 +++++- resources/views/hardware/view.blade.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index e8dc67ce3..ebe6ec4e4 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -841,7 +841,11 @@ input[type="radio"]:checked::before { grid-template-columns: .1em auto; gap: 1.5em; } - +.info-overflow { + overflow:hidden; + white-space:nowrap; + text-overflow: ellipsis; +} /** --------------------------------------- **/ /** End checkbox styles to replace iCheck **/ /** --------------------------------------- **/ \ No newline at end of file diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index c08d5dcfb..e1cd8dc4f 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -730,7 +730,7 @@
- {!! nl2br(e($asset->notes)) !!} + {!! nl2br(e($asset->notes)) !!}
From 608d07d03cdfd77a93384aafe3f1103baea5206c Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 17 May 2023 13:08:53 -0700 Subject: [PATCH 2/4] adds overflow-wrap to asset info table --- resources/assets/less/overrides.less | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index ebe6ec4e4..8a7aac965 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -841,10 +841,8 @@ input[type="radio"]:checked::before { grid-template-columns: .1em auto; gap: 1.5em; } -.info-overflow { - overflow:hidden; - white-space:nowrap; - text-overflow: ellipsis; +.container.row-striped .col-md-6 { + overflow-wrap:anywhere; } /** --------------------------------------- **/ /** End checkbox styles to replace iCheck **/ From 60d2046b6d42bfc3142da41deb70c4c9e403c3cc Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 24 May 2023 16:13:33 -0700 Subject: [PATCH 3/4] Updated dev assets Signed-off-by: snipe --- public/css/build/app.css | 3 +++ public/css/build/overrides.css | 3 +++ public/css/dist/all.css | 6 ++++++ public/mix-manifest.json | 6 +++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 3dcf69f07..c8fc02559 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1107,6 +1107,9 @@ input[type="radio"]:checked::before { grid-template-columns: 0.1em auto; gap: 1.5em; } +.container.row-striped .col-md-6 { + overflow-wrap: anywhere; +} .nav-tabs-custom > .nav-tabs > li { z-index: 1; } diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 49639b90b..5111695ac 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -740,6 +740,9 @@ input[type="radio"]:checked::before { grid-template-columns: 0.1em auto; gap: 1.5em; } +.container.row-striped .col-md-6 { + overflow-wrap: anywhere; +} .nav-tabs-custom > .nav-tabs > li { z-index: 1; } diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 4cfddd898..e6f7b8dd7 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -23873,6 +23873,9 @@ input[type="radio"]:checked::before { grid-template-columns: 0.1em auto; gap: 1.5em; } +.container.row-striped .col-md-6 { + overflow-wrap: anywhere; +} .nav-tabs-custom > .nav-tabs > li { z-index: 1; } @@ -25108,6 +25111,9 @@ input[type="radio"]:checked::before { grid-template-columns: 0.1em auto; gap: 1.5em; } +.container.row-striped .col-md-6 { + overflow-wrap: anywhere; +} .nav-tabs-custom > .nav-tabs > li { z-index: 1; } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index e0cb5a7f1..2a800b5aa 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=7caeae38608edd96421f8ef59d33f5f6", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=9e6c4692f7a97b389e2ae0bbb0b8510d", - "/css/build/app.css": "/css/build/app.css?id=069433b5e037df6b9c7c677afb9762cc", + "/css/build/overrides.css": "/css/build/overrides.css?id=5166569ede5a36802eadeea982686ca6", + "/css/build/app.css": "/css/build/app.css?id=b612c48e78fece2e1e8042ae24cc5f1e", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6e53eef152bba01a4c666a4d8b01117", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=bc21420f64ac29cad10ea119d35d95b9", + "/css/dist/all.css": "/css/dist/all.css?id=f9cf53aca9755a528550786f25e3179c", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=e2e2b1797606a266ed55549f5bb5a179", From 13e8f91a59c41f6fe8e02a076d8d904c43f245c1 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 29 May 2023 18:18:46 -0400 Subject: [PATCH 4/4] Fixed typo Signed-off-by: snipe --- resources/lang/en/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 57b08017f..01779a885 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -442,7 +442,7 @@ return [ 'importer_generic_error' => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.', 'confirm' => 'Confirm', 'autoassign_licenses' => 'Auto-Assign Licenses', - 'autoassign_licenses_help' => 'Allow user to be have licenses assigned via the bulk-assign license UI or cli tools.', + 'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.', 'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)', 'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.', 'modal_confirm_generic' => 'Are you sure?',