Skip to content

Commit 255e0c3

Browse files
snipesnipe
authored
Merge pull request #16602 from akemidx/bug/sc-25897-2
FIXED: Text Overflow on Settings Tiles
2 parents 8984d60 + 392db81 commit 255e0c3

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

‎resources/assets/less/app.less‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,17 @@ a.logo.no-hover a:hover {
384384
background-color: transparent;
385385
}
386386

387+
.index-block {
388+
overflow: hidden;
389+
text-overflow: ellipsis;
390+
white-space: nowrap;
391+
}
392+
.index-block:hover{
393+
overflow: visible;
394+
white-space: normal;
395+
height:auto;
396+
}
397+
387398
input:required, select:required, textarea:required {
388399
border-right: 6px solid orange;
389400
}

‎resources/views/settings/index.blade.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.brand') }}</span>
6868
</a>
6969
</h5>
70-
<p class="help-block">{{ trans('admin/settings/general.brand_help') }}</p>
70+
<p class="index-block">{{ trans('admin/settings/general.brand_help') }}</p>
7171
</div>
7272
</div>
7373
</div>
@@ -84,7 +84,7 @@
8484
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.general_settings') }}</span>
8585
</a>
8686
</h5>
87-
<p class="help-block">{{ trans('admin/settings/general.general_settings_help') }}</p>
87+
<p class="index-block">{{ trans('admin/settings/general.general_settings_help') }}</p>
8888
</div>
8989
</div>
9090
</div>
@@ -101,7 +101,7 @@
101101
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.security') }}</span>
102102
</a>
103103
</h5>
104-
<p class="help-block">{{ trans('admin/settings/general.security_help') }}</p>
104+
<p class="index-block">{{ trans('admin/settings/general.security_help') }}</p>
105105
</div>
106106
</div>
107107
</div>
@@ -117,7 +117,7 @@
117117
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.groups') }}</span>
118118
</a>
119119
</h5>
120-
<p class="help-block">{{ trans('admin/settings/general.groups_help') }}</p>
120+
<p class="index-block">{{ trans('admin/settings/general.groups_help') }}</p>
121121
</div>
122122
</div>
123123
</div>
@@ -134,7 +134,7 @@
134134
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.localization') }}</span>
135135
</a>
136136
</h5>
137-
<p class="help-block">{{ trans('admin/settings/general.localization_help') }}</p>
137+
<p class="index-block">{{ trans('admin/settings/general.localization_help') }}</p>
138138

139139
</div>
140140
</div>
@@ -152,7 +152,7 @@
152152

153153
</a>
154154
</h5>
155-
<p class="help-block">{{ trans('admin/settings/general.notifications_help') }}</p>
155+
<p class="index-block">{{ trans('admin/settings/general.notifications_help') }}</p>
156156
</div>
157157
</div>
158158
</div>
@@ -167,7 +167,7 @@
167167
<span class="name">{{ trans('admin/settings/general.integrations') }}</span>
168168
</a>
169169
</h5>
170-
<p class="help-block">{{ trans('admin/settings/general.webhook_help') }}</p>
170+
<p class="index-block">{{ trans('admin/settings/general.webhook_help') }}</p>
171171
</div>
172172
</div>
173173
</div>
@@ -182,7 +182,7 @@
182182
<span class="name">{{ trans('general.asset_tags') }}</span>
183183
</a>
184184
</h5>
185-
<p class="help-block">{{ trans('admin/settings/general.asset_tags_help') }}</p>
185+
<p class="index-block">{{ trans('admin/settings/general.asset_tags_help') }}</p>
186186
</div>
187187
</div>
188188
</div>
@@ -198,7 +198,7 @@
198198
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.labels') }}</span>
199199
</a>
200200
</h5>
201-
<p class="help-block">{!! trans('admin/settings/general.labels_help') !!}</p>
201+
<p class="index-block">{!! trans('admin/settings/general.labels_help') !!}</p>
202202
</div>
203203
</div>
204204
</div>
@@ -214,7 +214,7 @@
214214
<span class="name">{{ trans('admin/settings/general.ldap') }}</span>
215215
</a>
216216
</h5>
217-
<p class="help-block">{{ trans('admin/settings/general.ldap_help') }}</p>
217+
<p class="index-block">{{ trans('admin/settings/general.ldap_help') }}</p>
218218
</div>
219219
</div>
220220
</div>
@@ -229,7 +229,7 @@
229229
<span class="name">Google</span>
230230
</a>
231231
</h5>
232-
<p class="help-block">{{ trans('admin/settings/general.google_login') }}</p>
232+
<p class="index-block">{{ trans('admin/settings/general.google_login') }}</p>
233233
</div>
234234
</div>
235235
</div>
@@ -244,7 +244,7 @@
244244
<span class="name">{{ trans('admin/settings/general.saml') }}</span>
245245
</a>
246246
</h5>
247-
<p class="help-block">{{ trans('admin/settings/general.saml_help') }}</p>
247+
<p class="index-block">{{ trans('admin/settings/general.saml_help') }}</p>
248248
</div>
249249
</div>
250250
</div>
@@ -259,7 +259,7 @@
259259
<span class="name">{{ trans('admin/settings/general.backups') }}</span>
260260
</a>
261261
</h5>
262-
<p class="help-block">{!! trans('admin/settings/general.backups_help') !!}</p>
262+
<p class="index-block">{!! trans('admin/settings/general.backups_help') !!}</p>
263263
</div>
264264
</div>
265265
</div>
@@ -275,7 +275,7 @@
275275
<span class="name">{{ trans('admin/settings/general.login') }}</span>
276276
</a>
277277
</h5>
278-
<p class="help-block">{{ trans('admin/settings/general.login_help') }} </p>
278+
<p class="index-block">{{ trans('admin/settings/general.login_help') }} </p>
279279
</div>
280280
</div>
281281
</div>
@@ -290,7 +290,7 @@
290290
<span class="name">{{ trans('admin/settings/general.oauth') }}</span>
291291
</a>
292292
</h5>
293-
<p class="help-block">{{ trans('admin/settings/general.oauth_help') }}</p>
293+
<p class="index-block">{{ trans('admin/settings/general.oauth_help') }}</p>
294294
</div>
295295
</div>
296296
</div>
@@ -307,7 +307,7 @@
307307
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.php_overview') }}</span>
308308
</a>
309309
</h5>
310-
<p class="help-block">{{ trans('admin/settings/general.php_overview_help') }}</p>
310+
<p class="index-block">{{ trans('admin/settings/general.php_overview_help') }}</p>
311311
</div>
312312
</div>
313313
</div>
@@ -325,7 +325,7 @@
325325
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.purge') }}</span>
326326
</a>
327327
</h5>
328-
<p class="help-block">{{ trans('admin/settings/general.purge_help') }}</p>
328+
<p class="index-block">{{ trans('admin/settings/general.purge_help') }}</p>
329329
</div>
330330
</div>
331331
</div>
@@ -448,7 +448,7 @@
448448
449449
450450
var options = {
451-
valueNames: [ 'name', 'keywords', 'summary', 'help-block']
451+
valueNames: [ 'name', 'keywords', 'summary', 'index-block']
452452
};
453453
454454
var settingList = new List('setting-list', options);

0 commit comments

Comments
 (0)