diff --git a/public/css/build/app.css b/public/css/build/app.css index 3a5e50d53d..4100b09c82 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1439,4 +1439,13 @@ p.monospace, span.monospace { font-family: monospace, monospace; } +legend { + background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px); + color: #fff; + font-size: 18px; + padding: 6px; +} +fieldset { + padding-bottom: 20px; +} diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 4aa4625901..37f704b657 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -1070,4 +1070,13 @@ p.monospace, span.monospace { font-family: monospace, monospace; } +legend { + background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px); + color: #fff; + font-size: 18px; + padding: 6px; +} +fieldset { + padding-bottom: 20px; +} diff --git a/public/css/dist/all.css b/public/css/dist/all.css index f795b17622..4400eade77 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22774,6 +22774,15 @@ p.monospace, span.monospace { font-family: monospace, monospace; } +legend { + background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px); + color: #fff; + font-size: 18px; + padding: 6px; +} +fieldset { + padding-bottom: 20px; +} .select2-container { @@ -24330,4 +24339,13 @@ p.monospace, span.monospace { font-family: monospace, monospace; } +legend { + background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px); + color: #fff; + font-size: 18px; + padding: 6px; +} +fieldset { + padding-bottom: 20px; +} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 360d35dc7b..83f7c564b9 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=19253af36b58ed3fb6770c7bb944f079", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd", - "/css/build/overrides.css": "/css/build/overrides.css?id=95567897762fdc429b1dba7f536fc5e6", - "/css/build/app.css": "/css/build/app.css?id=910fd122e36ad81638f79e4813e4bce7", + "/css/build/overrides.css": "/css/build/overrides.css?id=23b8695f142b81daac944f9e04651c0c", + "/css/build/app.css": "/css/build/app.css?id=a48ed31ea3de97ccacd8c082c3170419", "/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=ea22079836a432d7f46a5d390c445e13", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a82b065847bf3cd5d713c04ee8dc86c6", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=6ea836d8126de101081c49abbdb89417", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=e7a4652b5674820210772aa4a7a85c19", + "/css/dist/all.css": "/css/dist/all.css?id=ffee9ce5396c4880dc0b461586638497", "/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 bf11881b3a..e0429b1fab 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -1187,3 +1187,21 @@ code.single-line { p.monospace, span.monospace { font-family: monospace, monospace; } + +legend { + background: repeating-linear-gradient( + 45deg, + #222d32, + #222d32 10px, + #444 10px, + #444 11px + ); + + color: #fff; + font-size: 18px; + padding: 6px; +} + +fieldset { + padding-bottom: 20px; +} diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 158f512a58..7d25489a2a 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -151,7 +151,7 @@ return [ 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', 'scope_locations_fmcs_support_text' => 'Scope Locations with Full Multiple Companies Support', - 'scope_locations_fmcs_support_help_text' => 'If this setting is enabled, locations are restricted to their selected company.', + 'scope_locations_fmcs_support_help_text' => 'Restrict locations to their selected company.', 'scope_locations_fmcs_support_disabled_text' => 'This option is disabled because you have conflicting locations set for :count or more items.', 'show_in_model_list' => 'Show in Model Dropdowns', 'optional' => 'optional', diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 879a2e45d5..3a2ff392cf 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -14,30 +14,6 @@ {{-- Page content --}} @section('content') - - - -