diff --git a/public/css/build/app.css b/public/css/build/app.css index 3cea5e2d0..d35eebb0a 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -942,20 +942,21 @@ h4 { background-color: #f9f9f9; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-striped .row:nth-of-type(even) div { background: #FFFFFF; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-new-striped { vertical-align: top; - line-height: 2.6; - padding: 0px; - margin-left: 20px; + padding: 3px; display: table; width: 100%; - padding-right: 20px; + word-wrap: break-word; + table-layout: fixed; } /** * NEW STRIPING @@ -965,20 +966,25 @@ h4 { .row-new-striped > .row:nth-of-type(even) { background: #FFFFFF; border-top: 1px solid #dddddd; + line-height: 1.9; display: table-row; } .row-new-striped > .row:nth-of-type(odd) { background-color: #F8F8F8; border-top: 1px solid #dddddd; display: table-row; + line-height: 1.9; + padding: 2px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div[class^="col"]:first-child { font-weight: bold; diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 52c81f55f..6e4825dc4 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -574,20 +574,21 @@ h4 { background-color: #f9f9f9; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-striped .row:nth-of-type(even) div { background: #FFFFFF; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-new-striped { vertical-align: top; - line-height: 2.6; - padding: 0px; - margin-left: 20px; + padding: 3px; display: table; width: 100%; - padding-right: 20px; + word-wrap: break-word; + table-layout: fixed; } /** * NEW STRIPING @@ -597,20 +598,25 @@ h4 { .row-new-striped > .row:nth-of-type(even) { background: #FFFFFF; border-top: 1px solid #dddddd; + line-height: 1.9; display: table-row; } .row-new-striped > .row:nth-of-type(odd) { background-color: #F8F8F8; border-top: 1px solid #dddddd; display: table-row; + line-height: 1.9; + padding: 2px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div[class^="col"]:first-child { font-weight: bold; diff --git a/public/css/dist/all.css b/public/css/dist/all.css index eda068945..3d3cc4f98 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -21914,20 +21914,21 @@ h4 { background-color: #f9f9f9; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-striped .row:nth-of-type(even) div { background: #FFFFFF; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-new-striped { vertical-align: top; - line-height: 2.6; - padding: 0px; - margin-left: 20px; + padding: 3px; display: table; width: 100%; - padding-right: 20px; + word-wrap: break-word; + table-layout: fixed; } /** * NEW STRIPING @@ -21937,20 +21938,25 @@ h4 { .row-new-striped > .row:nth-of-type(even) { background: #FFFFFF; border-top: 1px solid #dddddd; + line-height: 1.9; display: table-row; } .row-new-striped > .row:nth-of-type(odd) { background-color: #F8F8F8; border-top: 1px solid #dddddd; display: table-row; + line-height: 1.9; + padding: 2px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div[class^="col"]:first-child { font-weight: bold; @@ -23389,20 +23395,21 @@ h4 { background-color: #f9f9f9; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-striped .row:nth-of-type(even) div { background: #FFFFFF; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-new-striped { vertical-align: top; - line-height: 2.6; - padding: 0px; - margin-left: 20px; + padding: 3px; display: table; width: 100%; - padding-right: 20px; + word-wrap: break-word; + table-layout: fixed; } /** * NEW STRIPING @@ -23412,20 +23419,25 @@ h4 { .row-new-striped > .row:nth-of-type(even) { background: #FFFFFF; border-top: 1px solid #dddddd; + line-height: 1.9; display: table-row; } .row-new-striped > .row:nth-of-type(odd) { background-color: #F8F8F8; border-top: 1px solid #dddddd; display: table-row; + line-height: 1.9; + padding: 2px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div[class^="col"]:first-child { font-weight: bold; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 0290e23df..291f4f95f 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/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/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4", - "/css/build/overrides.css": "/css/build/overrides.css?id=efd9f439cb0586512d03172bcd9a5752", - "/css/build/app.css": "/css/build/app.css?id=2f45befb40b9d7f038eeae9569c33a5f", + "/css/build/overrides.css": "/css/build/overrides.css?id=1c3ffc5fb379e21523f2a9b03f986edb", + "/css/build/app.css": "/css/build/app.css?id=d04f32982fb319ac35a32d362089f18b", "/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=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.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 0721c401d..8c4f2113a 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -621,31 +621,30 @@ h4 { //border-left: 1px solid #dddddd; //border-right: 1px solid #dddddd; display: table; - } .row-striped .row:nth-of-type(odd) div { background-color: #f9f9f9; border-top: 1px solid #dddddd; display: table-cell; - + word-wrap: break-word; } .row-striped .row:nth-of-type(even) div { background: #FFFFFF; border-top: 1px solid #dddddd; display: table-cell; + word-wrap: break-word; } .row-new-striped { vertical-align: top; - line-height: 2.6; - padding: 0px; - margin-left: 20px; + padding: 3px; display: table; 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) { background: #FFFFFF; border-top: 1px solid #dddddd; + line-height: 1.9; display: table-row; - } .row-new-striped > .row:nth-of-type(odd) { background-color: #F8F8F8; border-top: 1px solid #dddddd; display: table-row; - + line-height: 1.9; + padding: 2px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } .row-new-striped div { display: table-cell; border-top: 1px solid #dddddd; + padding: 6px; } diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 41e8d1c41..1f7e5f0b9 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -301,7 +301,7 @@ {{ trans('general.notes') }} -
+
{!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index b726d22e9..2c3790b1a 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -177,8 +177,6 @@
{{ $user->present()->fullName() }}
- - @can('update', $user)