Skip to content

Commit b1ef3f5

Browse files
authored
Merge pull request #18064 from grokability/new-fieldsets
Use new fieldset component
2 parents a472ded + e1b6488 commit b1ef3f5

File tree

26 files changed

+213
-167
lines changed

26 files changed

+213
-167
lines changed

public/css/build/app.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/app.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/all.css

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"/js/dist/all.js": "/js/dist/all.js?id=76d88f0f91b852f7eecbce357ab5858b",
33
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=42f97cd5b9ee7521b04a448e7fc16ac9",
44
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=3e8b8221c159b829a0edd562eb717563",
5-
"/css/build/overrides.css": "/css/build/overrides.css?id=03eb857d917f847b2e217f5da4fdccd9",
6-
"/css/build/app.css": "/css/build/app.css?id=41485c02f3c1c2e7407a99aefcec351c",
5+
"/css/build/overrides.css": "/css/build/overrides.css?id=90ab037d5e54c03ee5894399bab1a776",
6+
"/css/build/app.css": "/css/build/app.css?id=d9fc713cecd32af72efd1e924a35da5a",
77
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
88
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=3d8a3d2035ea28aaad4a703c2646f515",
99
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=3979929a3423ff35b96b1fc84299fdf3",
@@ -19,7 +19,7 @@
1919
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=b2cd9f59d7e8587939ce27b2d3363d82",
2020
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=7277edd636cf46aa7786a4449ce0ead7",
2121
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=cbd06cc1d58197ccc81d4376bbaf0d28",
22-
"/css/dist/all.css": "/css/dist/all.css?id=4a00fb8a56de5ca4588584132099f17d",
22+
"/css/dist/all.css": "/css/dist/all.css?id=c76b90bf82e812fe159cc4b4be143aa5",
2323
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2424
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2525
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

resources/assets/less/overrides.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,12 @@ input[name="columnsSearch"] {
12811281
margin-bottom: 0px;
12821282
}
12831283

1284+
.callout.callout-legend a {
1285+
color: #333333;
1286+
text-decoration: none;
1287+
cursor: pointer;
1288+
}
1289+
12841290
p.callout-subtext {
12851291
margin-top: 5px;
12861292
}

resources/lang/en-US/admin/custom_fields/general.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,5 @@
6767
'checkbox' => 'Checkbox',
6868
'radio' => 'Radio Buttons',
6969
],
70+
'general_help_text' => 'Custom fields store additional information not covered by the default asset fields. <a href="https://snipe-it.readme.io/docs/custom-fields#/"><i class="fa fa-external-link"></i></a>.',
7071
];

resources/lang/en-US/admin/settings/general.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'alert_email' => 'Send alerts to',
1919
'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
2020
'alerts_enabled' => 'Email Alerts Enabled',
21-
'alert_interval' => 'Expiring Alerts Threshold (in days)',
21+
'alert_interval' => 'Expiring Alerts Threshold',
2222
'alert_inv_threshold' => 'Inventory Alert Threshold',
2323
'allow_user_skin' => 'Allow User Skin',
2424
'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
@@ -489,6 +489,7 @@
489489
'server' => 'Server Settings',
490490
'scoping' => 'Scoping',
491491
'security' => 'Security Preferences',
492+
'passwords' => 'Password Security Preferences',
492493
],
493494

494495

resources/views/auth/login.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656

5757
<fieldset name="login" aria-label="login">
58-
<legend></legend>
5958

6059
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
6160
<label for="username">

0 commit comments

Comments
 (0)