From 67655ad84bda156c4422e2c908edaf6380082795 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 16 Aug 2024 13:11:33 +0100 Subject: [PATCH 1/2] Dev assets Signed-off-by: snipe --- public/css/build/app.css | 14 +++++++++----- public/css/build/overrides.css | 14 +++++++++----- public/css/dist/all.css | 28 ++++++++++++++++++---------- public/mix-manifest.json | 6 +++--- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index bcc317f06..f70346905 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1123,14 +1123,18 @@ th.css-location > .th-inner::before { } } @media screen and (max-width: 1318px) and (min-width: 1200px) { - .box { + .admin.box { height: 170px; } } -.ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; +@media screen and (max-width: 1494px) and (min-width: 1200px) { + .dashboard.small-box { + white-space: nowrap; + text-overflow: ellipsis; + max-width: 188px; + display: block; + overflow: hidden; + } } /** Form-stuff overrides for checkboxes and stuff **/ label.form-control { diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 7b9e7d1b9..d8169245b 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -756,14 +756,18 @@ th.css-location > .th-inner::before { } } @media screen and (max-width: 1318px) and (min-width: 1200px) { - .box { + .admin.box { height: 170px; } } -.ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; +@media screen and (max-width: 1494px) and (min-width: 1200px) { + .dashboard.small-box { + white-space: nowrap; + text-overflow: ellipsis; + max-width: 188px; + display: block; + overflow: hidden; + } } /** Form-stuff overrides for checkboxes and stuff **/ label.form-control { diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 47beba874..8957c0099 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22095,14 +22095,18 @@ th.css-location > .th-inner::before { } } @media screen and (max-width: 1318px) and (min-width: 1200px) { - .box { + .admin.box { height: 170px; } } -.ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; +@media screen and (max-width: 1494px) and (min-width: 1200px) { + .dashboard.small-box { + white-space: nowrap; + text-overflow: ellipsis; + max-width: 188px; + display: block; + overflow: hidden; + } } /** Form-stuff overrides for checkboxes and stuff **/ label.form-control { @@ -23519,14 +23523,18 @@ th.css-location > .th-inner::before { } } @media screen and (max-width: 1318px) and (min-width: 1200px) { - .box { + .admin.box { height: 170px; } } -.ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; +@media screen and (max-width: 1494px) and (min-width: 1200px) { + .dashboard.small-box { + white-space: nowrap; + text-overflow: ellipsis; + max-width: 188px; + display: block; + overflow: hidden; + } } /** Form-stuff overrides for checkboxes and stuff **/ label.form-control { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 568d8a0bb..547cbd7f5 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=5030f4cb69d0d0b87b7fe6ba1b9eece9", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4", - "/css/build/overrides.css": "/css/build/overrides.css?id=a759aa24710e294392877c5139fda40e", - "/css/build/app.css": "/css/build/app.css?id=b3b3df70f679f45e15a6bcd28a8e87cc", + "/css/build/overrides.css": "/css/build/overrides.css?id=e83697e14b9cd1478ea2bda8fb50f30c", + "/css/build/app.css": "/css/build/app.css?id=ff82b7edca60f7276504bde91568f6d1", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=7b8e04041af3dfe3de25d73107bfda91", + "/css/dist/all.css": "/css/dist/all.css?id=053e0f8c49e8cf1b903c80c8f67639eb", "/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", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", From 43b338d6122dc4a9588fb64af5c07312aeb1209d Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 16 Aug 2024 16:15:58 +0100 Subject: [PATCH 2/2] Fixed translation Signed-off-by: snipe --- resources/lang/en-US/general.php | 1 + resources/views/hardware/view.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 92091f9d2..4144fd2f6 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -560,5 +560,6 @@ return [ 'map_fields'=> 'Map :item_type Field', 'remaining_var' => ':count Remaining', 'assets_in_var' => 'Assets in :name :type', + 'label' => 'Label', ]; diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index a4adb8355..4961cfce2 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1030,7 +1030,7 @@
- {{ trans('general.labels') }} + {{ trans('general.label') }}