DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15613 from snipe/css_fixes_for_long_values
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details

Browse source 
Smarter word-wrapping on long text
This commit is contained in:
snipe 2024-10-03 17:39:18 +01:00 committed by GitHub
parent 78ca1026fd cb281c6408
commit 7fc498a597
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/build/app.css
View file

Binary file not shown.

BIN
public/css/build/overrides.css
View file

Binary file not shown.

BIN
public/css/dist/all.css vendored
View file

Binary file not shown.

6
public/mix-manifest.json
View file

@ -2,8 +2,8 @@
"/js/build/app.js": "/js/build/app.js?id=5e9ac5c1a7e089f056fb1dba566193a6", "/js/build/app.js": "/js/build/app.js?id=5e9ac5c1a7e089f056fb1dba566193a6",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9", "/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/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4",
"/css/build/overrides.css": "/css/build/overrides.css?id=efd9f439cb0586512d03172bcd9a5752", "/css/build/overrides.css": "/css/build/overrides.css?id=1c3ffc5fb379e21523f2a9b03f986edb",
"/css/build/app.css": "/css/build/app.css?id=2f45befb40b9d7f038eeae9569c33a5f", "/css/build/app.css": "/css/build/app.css?id=d04f32982fb319ac35a32d362089f18b",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/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.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", "/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.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-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/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
"/css/dist/all.css": "/css/dist/all.css?id=e9509d7591637153f667461642e47e30", "/css/dist/all.css": "/css/dist/all.css?id=9f69886d7a8e4c383cd09a48573922b7",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/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/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", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

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

@ -621,31 +621,30 @@ h4 {
//border-left: 1px solid #dddddd; //border-left: 1px solid #dddddd;
//border-right: 1px solid #dddddd; //border-right: 1px solid #dddddd;
display: table; display: table;
} }
.row-striped .row:nth-of-type(odd) div { .row-striped .row:nth-of-type(odd) div {
background-color: #f9f9f9; background-color: #f9f9f9;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
display: table-cell; display: table-cell;
word-wrap: break-word;
} }
.row-striped .row:nth-of-type(even) div { .row-striped .row:nth-of-type(even) div {
background: #FFFFFF; background: #FFFFFF;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
display: table-cell; display: table-cell;
word-wrap: break-word;
} }
.row-new-striped { .row-new-striped {
vertical-align: top; vertical-align: top;
line-height: 2.6; padding: 3px;
padding: 0px;
margin-left: 20px;
display: table; display: table;
width: 100%; width: 100%;
padding-right: 20px; word-wrap: break-word;
table-layout:fixed;
} }
/** /**
@ -656,25 +655,28 @@ h4 {
.row-new-striped > .row:nth-of-type(even) { .row-new-striped > .row:nth-of-type(even) {
background: #FFFFFF; background: #FFFFFF;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
line-height: 1.9;
display: table-row; display: table-row;
} }
.row-new-striped > .row:nth-of-type(odd) { .row-new-striped > .row:nth-of-type(odd) {
background-color: #F8F8F8; background-color: #F8F8F8;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
display: table-row; display: table-row;
line-height: 1.9;
padding: 2px;
} }
.row-new-striped div { .row-new-striped div {
display: table-cell; display: table-cell;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
padding: 6px;
} }
.row-new-striped div { .row-new-striped div {
display: table-cell; display: table-cell;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
padding: 6px;
} }

2
resources/views/accessories/view.blade.php
View file

@ -301,7 +301,7 @@
{{ trans('general.notes') }} {{ trans('general.notes') }}
</strong> </strong>
</div> </div>
<div class="col-md-9"> <div class="col-md-9" style="word-wrap: break-word;">
{!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!} {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
</div> </div>
</div> </div>

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

@ -177,8 +177,6 @@
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<img src="{{ $user->present()->gravatar() }}" class=" img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}"> <img src="{{ $user->present()->gravatar() }}" class=" img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}">
</div> </div>
@can('update', $user) @can('update', $user)
<div class="col-md-12"> <div class="col-md-12">