Skip to content

Commit

Permalink
Merge pull request #15613 from snipe/css_fixes_for_long_values
Browse files Browse the repository at this point in the history
Smarter word-wrapping on long text
  • Loading branch information
snipe authored Oct 3, 2024
2 parents 78ca102 + cb281c6 commit 7fc498a
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 30 deletions.
14 changes: 10 additions & 4 deletions public/css/build/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
14 changes: 10 additions & 4 deletions public/css/build/overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
28 changes: 20 additions & 8 deletions public/css/dist/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
18 changes: 10 additions & 8 deletions resources/assets/less/overrides.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand All @@ -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;
}


Expand Down
2 changes: 1 addition & 1 deletion resources/views/accessories/view.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class="table table-striped snipe-table"
{{ trans('general.notes') }}
</strong>
</div>
<div class="col-md-9">
<div class="col-md-9" style="word-wrap: break-word;">
{!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions resources/views/users/view.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,6 @@
<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() }}">
</div>



@can('update', $user)
<div class="col-md-12">
Expand Down

0 comments on commit 7fc498a

Please sign in to comment.