Skip to content

A free open source IT asset/license management system

Styling fixes

snipe891bec9cdbe4
diff --git a/config/permissions.php b/config/permissions.php
index 28be842279..2acf851d8e 100644
--- a/config/permissions.php
+++ b/config/permissions.php
@@ -23,7 +23,7 @@ return [
],
],
- 'CSV Import' => [
+ 'Import' => [
[
'permission' => 'import',
'display' => true,
diff --git a/resources/lang/en-US/permissions.php b/resources/lang/en-US/permissions.php
index 5ed9bc2f31..f91039ca94 100644
--- a/resources/lang/en-US/permissions.php
+++ b/resources/lang/en-US/permissions.php
@@ -24,7 +24,7 @@ return array(
'note' => 'Determines whether the user has access to most aspects of the system EXCEPT the System Admin Settings. These users will be able to manage users, locations, categories, etc, but ARE constrained by Full Multiple Company Support if it is enabled.',
],
- 'csv-import' => [
+ 'import' => [
'name' => 'CSV Import',
'note' => 'This will allow users to import even if access to users, assets, etc is denied elsewhere.',
],
diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php
index 33b511576e..5fcd0386fb 100644
--- a/resources/views/partials/forms/edit/permissions-base.blade.php
+++ b/resources/views/partials/forms/edit/permissions-base.blade.php
@@ -41,7 +41,7 @@
}
.radio-slider-inputs .inherit:checked + label {
- background-color: #f6f5f5;
+ background-color: rgba(255, 204, 51, 0.11);
color: #9a9999;
border-radius: 4px;
border: 1px #d6d6d6 solid;
@@ -103,7 +103,7 @@
@if ($use_inherit)
- <div class="radio-slider-inputs"data-tooltip="true" title="{{ (count($area_permission) > 1) ? trans('permissions.inherit_all', ['area' => $area]) : trans('permissions.inherit', ['area' => $area]) }}">
+ <div class="radio-slider-inputs" data-tooltip="true" title="{{ (count($area_permission) > 1) ? trans('permissions.inherit_all', ['area' => $area]) : trans('permissions.inherit', ['area' => $area]) }}">
<input
class="form-control {{ str_slug($area) }} inherit"
data-checker-group="{{ str_slug($area) }}"
@@ -160,7 +160,7 @@
$section_translation = trans('permissions.'.str_slug($this_permission['permission']).'.name');
@endphp
<div class="{{ ($localPermission['permission']!='superuser') ? ' nonsuperuser' : '' }}{{ ( ($localPermission['permission']!='superuser') && ($localPermission['permission']!='admin')) ? ' nonadmin' : '' }}">
- <div class="form-group" style="border-bottom: 1px solid #eee; padding-right: 9px;">
+ <div class="form-group" style="border-bottom: 1px solid #eee; padding-right: 13px;">
<div class="col-md-10">
<strong>{{ $section_translation }}</strong>
@if (\Lang::has('permissions.'.str_slug($this_permission['permission']).'.note'))