diff --git a/.chipperci.yml b/.chipperci.yml index fa3b3fd920..663a06350a 100644 --- a/.chipperci.yml +++ b/.chipperci.yml @@ -41,19 +41,18 @@ pipeline: cmd: | # php artisan test --testsuite Feature - - name: Browser Tests - cmd: | - cp -v .env.dusk.example .env.dusk.ci - sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci - sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci - #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci - sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci - sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci - sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci - sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci - - php -S [::0]:8000 -t public 2>server.log & - sleep 2 - php artisan dusk:chrome-driver $CHROME_DRIVER - php artisan dusk --env=ci - +# - name: Browser Tests +# cmd: | +# cp -v .env.dusk.example .env.dusk.ci +# sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci +# sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci +# #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci +# sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci +# sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci +# sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci +# sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci +# +# php -S [::0]:8000 -t public 2>server.log & +# sleep 2 +# php artisan dusk:chrome-driver $CHROME_DRIVER +# php artisan dusk --env=ci diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 2a93845507..76c12d3cf9 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -12,6 +12,7 @@ use App\Models\CheckoutRequest; use App\Models\Company; use App\Models\Location; use App\Models\Setting; +use App\Models\Statuslabel; use App\Models\User; use Auth; use Carbon\Carbon; @@ -324,6 +325,12 @@ class AssetsController extends Controller $asset->rtd_location_id = $request->input('rtd_location_id', null); $asset->byod = $request->input('byod', 0); + $status = Statuslabel::find($asset->status_id); + + if($status->archived){ + $asset->assigned_to = null; + } + if ($asset->assigned_to == '') { $asset->location_id = $request->input('rtd_location_id', null); } diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index 303fc08f18..6119c5824b 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -107,7 +107,7 @@ class CheckoutAssetNotification extends Notification } return (new SlackMessage) - ->content(':arrow_up: :computer: Asset Checked Out') + ->content(':arrow_up: :computer: '.trans('mail.Asset_Checkout_Notification')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $admin, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index e31afa51b5..b92ad70dfa 100644 --- a/public/css/dist/skins/skin-red-dark.css +++ b/public/css/dist/skins/skin-red-dark.css @@ -1 +1 @@ -.skin-red-dark .main-header .navbar{background-color:#dd4b39}.skin-red-dark .main-header .navbar .nav>li>a{color:#fff}.skin-red-dark .main-header .navbar .nav .open>a,.skin-red-dark .main-header .navbar .nav .open>a:focus,.skin-red-dark .main-header .navbar .nav .open>a:hover,.skin-red-dark .main-header .navbar .nav>.active>a,.skin-red-dark .main-header .navbar .nav>li>a:active,.skin-red-dark .main-header .navbar .nav>li>a:focus,.skin-red-dark .main-header .navbar .nav>li>a:hover,.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-red-dark .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red-dark .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1);color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a:hover{background:#d73925;color:#fff}}.skin-red-dark .main-header li.user-header{background-color:#dd4b39}.skin-red-dark .content-header{background:transparent}.skin-red-dark .left-side,.skin-red-dark .main-sidebar,.skin-red-dark .wrapper{background-color:#222d32}.skin-red-dark .user-panel>.info,.skin-red-dark .user-panel>.info>a{color:#fff}.skin-red-dark .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-red-dark .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red-dark .sidebar-menu>li.active>a,.skin-red-dark .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#dd4b39;color:#fff}.skin-red-dark .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-red-dark .sidebar a{color:#b8c7ce}.skin-red-dark .sidebar a:hover{text-decoration:none}.skin-red-dark .treeview-menu>li>a{color:#8aa4af}.skin-red-dark .treeview-menu>li.active>a,.skin-red-dark .treeview-menu>li>a:hover{color:#fff}.skin-red-dark .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-red-dark .sidebar-form .btn,.skin-red-dark .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-red-dark .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus,.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red-dark .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-red-dark.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#fff}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#c23321;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#96271a;border-color:#96271a;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c23321;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#6b1c12;color:#fff}li.dropdown-item-marker{color:var(--button-primary)}.text-primary,a:hover,a:visited{color:#fff}:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#ac2d1e;--button-primary:#802216;--button-hover:#6b1c12;--header:#dd4b39;--text-main:#bbb;--text-alt:#222;--text-sub:#9b9b9b;--link:#e00000;--visited-link:#d24d57;--hover-link:#d24d57;--nav-link:#fff;--light-link:#fff}#ldapad_test_results.well.well-sm{color:var(--back-main)}.pagination>li>a{background-color:var(--back-main);color:var(--light-link)}.pagination>.active>a{background-color:var(--visited-link);border-color:var(--light-link)}.pagination>.active>a:hover{background-color:var(--hover-link)}.tasks-menu>.dropdown-menu>li .menu{background-color:var(--back-main)}.tasks-menu>.dropdown-menu>li .menu>li>a:hover .progress{background-color:var(--background)}h2.task_menu{color:var(--link)}.navbar-custom-menu>.navbar-nav>li>.dropdown-menu{background-color:var(--back-main);color:var(--link)}.main-header .logo,.main-header .navbar{background-color:var(--header);background:linear-gradient(to bottom,var(--header) 0,var(--header) 100%);border-color:var(--header)}.bootstrap-table .fixed-table-container .table thead th .sortable{color:var(--nav-link)}.bootstrap-table .fixed-table-toolbar .columns label{color:#000}.navbar-nav>li>a:link,.thead{color:var(--nav-link)}.modal-content{background-color:var(--back-main);color:var(--text-main)}a:link{color:var(--link)}a:hover{color:var(--hover-link)}.far fa-life-ring{color:var(--link)}.btn-primary.hover{color:var(--nav-link)}.small-box h3,.small-box p{color:var(--nav-link)!important}.small-box h3 a:hover,.small-box p a:hover{color:var(--nav-link)!important;text-decoration:none}#accessoriesTable>tbody>tr>td>nobr>a>i.fa,#assetsListingTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}#assetsListingTable>tbody>tr.selected>td{background-color:var(--back-main)}body{color:var(--text-main)}.box,.box.box-default{border-top-color:var(--header);border-top:3px solid var(--header)}.box-body,.box-footer,.box-header{background-color:var(--back-sub);color:var(--header)}.btn-default{background-color:var(--back-sub)}.btn-default dropdown-toggle{background-color:var(--button-default);color:var(--link)}.btn-default.active,.btn-default:active,.btn-default:focus,.btn-default:hover{background-color:var(--button-hover);color:var(--link)}.btn-primary,.btn-primary.hover,.btn-primary:active,.text-red{color:var(--button-primary)}.btn-primary:hover{background-color:var(--button-primary);color:var(--link)!important}#componentsTable>tbody>tr>td>nobr>a>i.fa,#consumablesTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}.content-wrapper{background-color:var(--background)}#create-form>div>div>div>span>i.fa{background-color:var(--back-sub);color:var(--header)}.datepicker .datepicker-switch:hover,.datepicker .next:hover,.datepicker .prev:hover,.datepicker table tr td.day.focused,.datepicker table tr td.day:hover,.datepicker tfoot tr th:hover{background-color:var(--header)}.datepicker.dropdown-menu{background-color:var(--back-main);color:var(--text-main)}#details>div>div>div>table{background-color:transparent}.dropdown-menu>li>a:hover{background-color:var(--back-main);color:var(--nav-link)}.fixed-table-body thead th .th-inner{color:var(--nav-link)}.form-control,.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:var(--back-main);color:var(--text-main)}h1,h2,h3,h4,h5,h6,p{color:var(--text-main)}.help-block{color:var(--text-sub)}input[type=search],input[type=text]{background-color:var(--back-sub);color:var(--text-main)}.input-group,.input-group-addon{background-color:var(--back-sub)!important;color:var(--text-main)}#licensesTable>tbody>tr>td>nobr>a>i.fa,.main-footer{color:var(--text-main)}.main-footer{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li>a{color:var(--text-main)}.nav-tabs-custom>.nav-tabs>li.active{border-top-color:var(--header)}.nav-tabs-custom>.nav-tabs>li.active>a{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a:hover{background-color:var(--back-sub);color:var(--text-main)}.nav-tabs-custom,.nav-tabs-custom>.tab-content{background-color:var(--back-main)}.navbar-nav>.tasks-menu>.dropdown-menu>li.header{background-color:var(--back-main);color:var(--header)}.open>.dropdown-toggle.btn-default{background-color:var(--back-sub);color:var(--header)}.panel{background-color:var(--back-sub);color:var(--text-main)}.panel-default>.panel-heading{background-color:var(--back-main);color:var(--header)}.select2-container--default .select2-results__option[aria-selected=true],.select2-container--default .select2-results__option[aria-selected=true]:hover{background-color:var(--back-sub);color:var(--header)}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:var(--header);color:var(--back-main)}.select2-container--default .select2-selection--single .select2-selection__rendered{color:var(--text-main)}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:var(--header)}.select2-selection--single{background-color:var(--back-sub)!important;color:var(--text-main)!important}.select2-dropdown{background-color:var(--back-main);color:var(--text-main)}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:var(--header)}.fixed-table-body thead th .th-inner,.sidebar-toggle:hover,.skin-red .sidebar-menu>li:hover>a,.skin-red-dark .sidebar-menu>li.active>a{background-color:var(--header)!important}.tab-content,.tab-pane{background-color:var(--back-main);color:var(--text-main)}.table-striped>tbody>tr:nth-of-type(odd){background-color:var(--back-sub)}.table-striped>tbody>tr:nth-of-type(2n){background-color:var(--back-sub-alt)}#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa,.box-body,.box-footer,.box-header{color:var(--text-main)}.box-header.with-border{border-bottom:#000}a{color:var(--link)}a:hover,a:link{color:var(--nav-link)}a:hover{text-decoration:underline}a:visited{color:var(--nav-link)}#customFieldsTable a[href*="/models"]{color:var(--back-sub)}#customFieldsTable a[href*="/fieldsets"]{background-color:transparent}.row-striped{box-sizing:border-box;display:table;line-height:2.6;margin-left:20px;padding:0;vertical-align:top}.row-striped .row:nth-of-type(2n) div,.row-striped .row:nth-of-type(odd) div{background-color:var(--back-sub);border-top:1px solid #ddd;color:var(--text-main);display:table-cell}.row-new-striped>.row:nth-of-type(odd){background-color:var(--back-sub);color:var(--text-main)}.row-new-striped>.row:nth-of-type(2n){background-color:var(--back-sub-alt);color:var(--text-main)}.search-highlight,.search-highlight:hover{background-color:#e9d15b} +.skin-red-dark .main-header .navbar{background-color:#dd4b39}.skin-red-dark .main-header .navbar .nav>li>a{color:#fff}.skin-red-dark .main-header .navbar .nav .open>a,.skin-red-dark .main-header .navbar .nav .open>a:focus,.skin-red-dark .main-header .navbar .nav .open>a:hover,.skin-red-dark .main-header .navbar .nav>.active>a,.skin-red-dark .main-header .navbar .nav>li>a:active,.skin-red-dark .main-header .navbar .nav>li>a:focus,.skin-red-dark .main-header .navbar .nav>li>a:hover,.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-red-dark .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red-dark .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1);color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a:hover{background:#d73925;color:#fff}}.skin-red-dark .main-header li.user-header{background-color:#dd4b39}.skin-red-dark .content-header{background:transparent}.skin-red-dark .left-side,.skin-red-dark .main-sidebar,.skin-red-dark .wrapper{background-color:#222d32}.skin-red-dark .user-panel>.info,.skin-red-dark .user-panel>.info>a{color:#fff}.skin-red-dark .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-red-dark .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red-dark .sidebar-menu>li.active>a,.skin-red-dark .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#dd4b39;color:#fff}.skin-red-dark .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-red-dark .sidebar a{color:#b8c7ce}.skin-red-dark .sidebar a:hover{text-decoration:none}.skin-red-dark .treeview-menu>li>a{color:#8aa4af}.skin-red-dark .treeview-menu>li.active>a,.skin-red-dark .treeview-menu>li>a:hover{color:#fff}.skin-red-dark .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-red-dark .sidebar-form .btn,.skin-red-dark .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-red-dark .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus,.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red-dark .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-red-dark.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#fff}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#c23321;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#96271a;border-color:#96271a;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c23321;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#6b1c12;color:#fff}li.dropdown-item-marker{color:var(--button-primary)}.text-primary,a:hover,a:visited{color:#fff}:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#ac2d1e;--button-primary:#802216;--button-hover:#6b1c12;--header:#dd4b39;--text-main:#bbb;--text-alt:#222;--text-sub:#9b9b9b;--link:#e00000;--visited-link:#d24d57;--hover-link:#d24d57;--nav-link:#fff;--light-link:#fff}#ldapad_test_results.well.well-sm{color:var(--back-main)}.pagination>li>a{background-color:var(--back-main);color:var(--light-link)}.pagination>.active>a{background-color:var(--visited-link);border-color:var(--light-link)}.pagination>.active>a:hover{background-color:var(--hover-link)}.tasks-menu>.dropdown-menu>li .menu{background-color:var(--back-main)}.tasks-menu>.dropdown-menu>li .menu>li>a:hover .progress{background-color:var(--background)}h2.task_menu{color:var(--link)}.navbar-custom-menu>.navbar-nav>li>.dropdown-menu{background-color:var(--back-main);color:var(--link)}.main-header .logo,.main-header .navbar{background-color:var(--header);background:linear-gradient(to bottom,var(--header) 0,var(--header) 100%);border-color:var(--header)}.bootstrap-table .fixed-table-container .table thead th .sortable{color:var(--nav-link)}.bootstrap-table .fixed-table-toolbar .columns label{color:#000}.navbar-nav>li>a:link,.thead{color:var(--nav-link)}.modal-content{background-color:var(--back-main);color:var(--text-main)}a:link{color:var(--link)}a:hover{color:var(--hover-link)}.far fa-life-ring{color:var(--link)}.btn-primary.hover{color:var(--nav-link)}.small-box h3,.small-box p{color:var(--nav-link)!important}.small-box h3 a:hover,.small-box p a:hover{color:var(--nav-link)!important;text-decoration:none}#accessoriesTable>tbody>tr>td>nobr>a>i.fa,#assetsListingTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}#assetsListingTable>tbody>tr.selected>td{background-color:var(--back-main)}body{color:var(--text-main)}.box,.box.box-default{border-top-color:var(--header);border-top:3px solid var(--header)}.box-body,.box-footer,.box-header{background-color:var(--back-sub);color:var(--header)}.btn-default{background-color:var(--back-sub)}.btn-default dropdown-toggle{background-color:var(--button-default);color:var(--link)}.btn-default.active,.btn-default:active,.btn-default:focus,.btn-default:hover{background-color:var(--button-hover);color:var(--link)}.btn-primary,.btn-primary.hover,.btn-primary:active,.text-red{color:var(--button-primary)}.btn-primary:hover{background-color:var(--button-primary);color:var(--link)!important}#componentsTable>tbody>tr>td>nobr>a>i.fa,#consumablesTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}.content-wrapper{background-color:var(--background)}#create-form>div>div>div>span>i.fa{background-color:var(--back-sub);color:var(--header)}.datepicker .datepicker-switch:hover,.datepicker .next:hover,.datepicker .prev:hover,.datepicker table tr td.day.focused,.datepicker table tr td.day:hover,.datepicker tfoot tr th:hover{background-color:var(--header)}.datepicker.dropdown-menu{background-color:var(--back-main);color:var(--text-main)}#details>div>div>div>table{background-color:transparent}.dropdown-menu>li>a:hover{background-color:var(--back-main);color:var(--nav-link)}.fixed-table-body thead th .th-inner{color:var(--nav-link)}.form-control,.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:var(--back-main);color:var(--text-main)}h1,h2,h3,h4,h5,h6,p{color:var(--text-main)}.help-block{color:var(--text-sub)}input[type=search],input[type=text]{background-color:var(--back-sub);color:var(--text-main)}.input-group,.input-group-addon{background-color:var(--back-sub)!important;color:var(--text-main)}#licensesTable>tbody>tr>td>nobr>a>i.fa,.main-footer{color:var(--text-main)}.main-footer{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li>a{color:var(--text-main)}.nav-tabs-custom>.nav-tabs>li.active{border-top-color:var(--header)}.nav-tabs-custom>.nav-tabs>li.active>a{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a:hover{background-color:var(--back-sub);color:var(--text-main)}.nav-tabs-custom,.nav-tabs-custom>.tab-content{background-color:var(--back-main)}.navbar-nav>.tasks-menu>.dropdown-menu>li.header{background-color:var(--back-main);color:var(--header)}.open>.dropdown-toggle.btn-default{background-color:var(--back-sub);color:var(--header)}.panel{background-color:var(--back-sub);color:var(--text-main)}.panel-default>.panel-heading{background-color:var(--back-main);color:var(--header)}.select2-container--default .select2-results__option[aria-selected=true],.select2-container--default .select2-results__option[aria-selected=true]:hover{background-color:var(--back-sub);color:var(--header)}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:var(--header);color:var(--back-main)}.select2-container--default .select2-selection--single .select2-selection__rendered{color:var(--text-main)}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:var(--header)}.select2-selection--single{background-color:var(--back-sub)!important;color:var(--text-main)!important}.select2-dropdown{background-color:var(--back-main);color:var(--text-main)}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:var(--header)}.fixed-table-body thead th .th-inner,.sidebar-toggle:hover,.skin-red .sidebar-menu>li:hover>a,.skin-red-dark .sidebar-menu>li.active>a{background-color:var(--header)!important}.tab-content,.tab-pane{background-color:var(--back-main);color:var(--text-main)}.table-striped>tbody>tr:nth-of-type(odd){background-color:var(--back-sub)}.table-striped>tbody>tr:nth-of-type(2n){background-color:var(--back-sub-alt)}#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa,.box-body,.box-footer,.box-header{color:var(--text-main)}.box-header.with-border{border-bottom:#000}#upload-table h3,#upload-table p,#upload-table tbody>tr.warning>td{background-color:#fcf8e3;color:#000}a{color:var(--link)}a:hover,a:link{color:var(--nav-link)}a:hover{text-decoration:underline}a:visited{color:var(--nav-link)}#customFieldsTable a[href*="/models"]{color:var(--back-sub)}#customFieldsTable a[href*="/fieldsets"]{background-color:transparent}.row-striped{box-sizing:border-box;display:table;line-height:2.6;margin-left:20px;padding:0;vertical-align:top}.row-striped .row:nth-of-type(2n) div,.row-striped .row:nth-of-type(odd) div{background-color:var(--back-sub);border-top:1px solid #ddd;color:var(--text-main);display:table-cell}.row-new-striped>.row:nth-of-type(odd){background-color:var(--back-sub);color:var(--text-main)}.row-new-striped>.row:nth-of-type(2n){background-color:var(--back-sub-alt);color:var(--text-main)}.search-highlight,.search-highlight:hover{background-color:#e9d15b} diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index 9e320f0a58..afe056285f 100644 --- a/public/css/dist/skins/skin-red-dark.min.css +++ b/public/css/dist/skins/skin-red-dark.min.css @@ -1 +1 @@ -.skin-red-dark .main-header .navbar{background-color:#dd4b39}.skin-red-dark .main-header .navbar .nav>li>a{color:#fff}.skin-red-dark .main-header .navbar .nav .open>a,.skin-red-dark .main-header .navbar .nav .open>a:focus,.skin-red-dark .main-header .navbar .nav .open>a:hover,.skin-red-dark .main-header .navbar .nav>.active>a,.skin-red-dark .main-header .navbar .nav>li>a:active,.skin-red-dark .main-header .navbar .nav>li>a:focus,.skin-red-dark .main-header .navbar .nav>li>a:hover,.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-red-dark .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red-dark .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1);color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a:hover{background:#d73925;color:#fff}}.skin-red-dark .main-header li.user-header{background-color:#dd4b39}.skin-red-dark .content-header{background:0 0}.skin-red-dark .left-side,.skin-red-dark .main-sidebar,.skin-red-dark .wrapper{background-color:#222d32}.skin-red-dark .user-panel>.info,.skin-red-dark .user-panel>.info>a{color:#fff}.skin-red-dark .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-red-dark .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red-dark .sidebar-menu>li.active>a,.skin-red-dark .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#dd4b39;color:#fff}.skin-red-dark .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-red-dark .sidebar a{color:#b8c7ce}.skin-red-dark .sidebar a:hover{text-decoration:none}.skin-red-dark .treeview-menu>li>a{color:#8aa4af}.skin-red-dark .treeview-menu>li.active>a,.skin-red-dark .treeview-menu>li>a:hover{color:#fff}.skin-red-dark .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-red-dark .sidebar-form .btn,.skin-red-dark .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-red-dark .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus,.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red-dark .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-red-dark.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#fff}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#c23321;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#96271a;border-color:#96271a;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c23321;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#6b1c12;color:#fff}li.dropdown-item-marker{color:var(--button-primary)}.text-primary,a:hover,a:visited{color:#fff}:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#ac2d1e;--button-primary:#802216;--button-hover:#6b1c12;--header:#dd4b39;--text-main:#bbb;--text-alt:#222;--text-sub:#9b9b9b;--link:#e00000;--visited-link:#d24d57;--hover-link:#d24d57;--nav-link:#fff;--light-link:#fff}#ldapad_test_results.well.well-sm{color:var(--back-main)}.pagination>li>a{background-color:var(--back-main);color:var(--light-link)}.pagination>.active>a{background-color:var(--visited-link);border-color:var(--light-link)}.pagination>.active>a:hover{background-color:var(--hover-link)}.tasks-menu>.dropdown-menu>li .menu{background-color:var(--back-main)}.tasks-menu>.dropdown-menu>li .menu>li>a:hover .progress{background-color:var(--background)}h2.task_menu{color:var(--link)}.navbar-custom-menu>.navbar-nav>li>.dropdown-menu{background-color:var(--back-main);color:var(--link)}.main-header .logo,.main-header .navbar{background-color:var(--header);background:linear-gradient(to bottom,var(--header) 0,var(--header) 100%);border-color:var(--header)}.bootstrap-table .fixed-table-container .table thead th .sortable{color:var(--nav-link)}.bootstrap-table .fixed-table-toolbar .columns label{color:#000}.navbar-nav>li>a:link,.thead{color:var(--nav-link)}.modal-content{background-color:var(--back-main);color:var(--text-main)}a:link{color:var(--link)}a:hover{color:var(--hover-link)}.far fa-life-ring{color:var(--link)}.btn-primary.hover{color:var(--nav-link)}.small-box h3,.small-box p{color:var(--nav-link)!important}.small-box h3 a:hover,.small-box p a:hover{color:var(--nav-link)!important;text-decoration:none}#accessoriesTable>tbody>tr>td>nobr>a>i.fa,#assetsListingTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}#assetsListingTable>tbody>tr.selected>td{background-color:var(--back-main)}body{color:var(--text-main)}.box,.box.box-default{border-top-color:var(--header);border-top:3px solid var(--header)}.box-body,.box-footer,.box-header{background-color:var(--back-sub);color:var(--header)}.btn-default{background-color:var(--back-sub)}.btn-default dropdown-toggle{background-color:var(--button-default);color:var(--link)}.btn-default.active,.btn-default:active,.btn-default:focus,.btn-default:hover{background-color:var(--button-hover);color:var(--link)}.btn-primary,.btn-primary.hover,.btn-primary:active,.text-red{color:var(--button-primary)}.btn-primary:hover{background-color:var(--button-primary);color:var(--link)!important}#componentsTable>tbody>tr>td>nobr>a>i.fa,#consumablesTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}.content-wrapper{background-color:var(--background)}#create-form>div>div>div>span>i.fa{background-color:var(--back-sub);color:var(--header)}.datepicker .datepicker-switch:hover,.datepicker .next:hover,.datepicker .prev:hover,.datepicker table tr td.day.focused,.datepicker table tr td.day:hover,.datepicker tfoot tr th:hover{background-color:var(--header)}.datepicker.dropdown-menu{background-color:var(--back-main);color:var(--text-main)}#details>div>div>div>table{background-color:transparent}.dropdown-menu>li>a:hover{background-color:var(--back-main);color:var(--nav-link)}.fixed-table-body thead th .th-inner{color:var(--nav-link)}.form-control,.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:var(--back-main);color:var(--text-main)}h1,h2,h3,h4,h5,h6,p{color:var(--text-main)}.help-block{color:var(--text-sub)}input[type=search],input[type=text]{background-color:var(--back-sub);color:var(--text-main)}.input-group,.input-group-addon{background-color:var(--back-sub)!important;color:var(--text-main)}#licensesTable>tbody>tr>td>nobr>a>i.fa,.main-footer{color:var(--text-main)}.main-footer{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li>a{color:var(--text-main)}.nav-tabs-custom>.nav-tabs>li.active{border-top-color:var(--header)}.nav-tabs-custom>.nav-tabs>li.active>a{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a:hover{background-color:var(--back-sub);color:var(--text-main)}.nav-tabs-custom,.nav-tabs-custom>.tab-content{background-color:var(--back-main)}.navbar-nav>.tasks-menu>.dropdown-menu>li.header{background-color:var(--back-main);color:var(--header)}.open>.dropdown-toggle.btn-default{background-color:var(--back-sub);color:var(--header)}.panel{background-color:var(--back-sub);color:var(--text-main)}.panel-default>.panel-heading{background-color:var(--back-main);color:var(--header)}.select2-container--default .select2-results__option[aria-selected=true],.select2-container--default .select2-results__option[aria-selected=true]:hover{background-color:var(--back-sub);color:var(--header)}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:var(--header);color:var(--back-main)}.select2-container--default .select2-selection--single .select2-selection__rendered{color:var(--text-main)}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:var(--header)}.select2-selection--single{background-color:var(--back-sub)!important;color:var(--text-main)!important}.select2-dropdown{background-color:var(--back-main);color:var(--text-main)}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:var(--header)}.fixed-table-body thead th .th-inner,.sidebar-toggle:hover,.skin-red .sidebar-menu>li:hover>a,.skin-red-dark .sidebar-menu>li.active>a{background-color:var(--header)!important}.tab-content,.tab-pane{background-color:var(--back-main);color:var(--text-main)}.table-striped>tbody>tr:nth-of-type(odd){background-color:var(--back-sub)}.table-striped>tbody>tr:nth-of-type(2n){background-color:var(--back-sub-alt)}#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa,.box-body,.box-footer,.box-header{color:var(--text-main)}.box-header.with-border{border-bottom:#000}a{color:var(--link)}a:hover,a:link{color:var(--nav-link)}a:hover{text-decoration:underline}a:visited{color:var(--nav-link)}#customFieldsTable a[href*="/models"]{color:var(--back-sub)}#customFieldsTable a[href*="/fieldsets"]{background-color:transparent}.row-striped{box-sizing:border-box;display:table;line-height:2.6;margin-left:20px;padding:0;vertical-align:top}.row-striped .row:nth-of-type(2n) div,.row-striped .row:nth-of-type(odd) div{background-color:var(--back-sub);border-top:1px solid #ddd;color:var(--text-main);display:table-cell}.row-new-striped>.row:nth-of-type(odd){background-color:var(--back-sub);color:var(--text-main)}.row-new-striped>.row:nth-of-type(2n){background-color:var(--back-sub-alt);color:var(--text-main)}.search-highlight,.search-highlight:hover{background-color:#e9d15b} +.skin-red-dark .main-header .navbar{background-color:#dd4b39}.skin-red-dark .main-header .navbar .nav>li>a{color:#fff}.skin-red-dark .main-header .navbar .nav .open>a,.skin-red-dark .main-header .navbar .nav .open>a:focus,.skin-red-dark .main-header .navbar .nav .open>a:hover,.skin-red-dark .main-header .navbar .nav>.active>a,.skin-red-dark .main-header .navbar .nav>li>a:active,.skin-red-dark .main-header .navbar .nav>li>a:focus,.skin-red-dark .main-header .navbar .nav>li>a:hover,.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-red-dark .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-dark .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red-dark .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1);color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red-dark .main-header .navbar .dropdown-menu li a:hover{background:#d73925;color:#fff}}.skin-red-dark .main-header li.user-header{background-color:#dd4b39}.skin-red-dark .content-header{background:0 0}.skin-red-dark .left-side,.skin-red-dark .main-sidebar,.skin-red-dark .wrapper{background-color:#222d32}.skin-red-dark .user-panel>.info,.skin-red-dark .user-panel>.info>a{color:#fff}.skin-red-dark .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-red-dark .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red-dark .sidebar-menu>li.active>a,.skin-red-dark .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#dd4b39;color:#fff}.skin-red-dark .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-red-dark .sidebar a{color:#b8c7ce}.skin-red-dark .sidebar a:hover{text-decoration:none}.skin-red-dark .treeview-menu>li>a{color:#8aa4af}.skin-red-dark .treeview-menu>li.active>a,.skin-red-dark .treeview-menu>li>a:hover{color:#fff}.skin-red-dark .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-red-dark .sidebar-form .btn,.skin-red-dark .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-red-dark .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus,.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red-dark .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red-dark .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-red-dark.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#fff}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#c23321;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#96271a;border-color:#96271a;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c23321;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#6b1c12;color:#fff}li.dropdown-item-marker{color:var(--button-primary)}.text-primary,a:hover,a:visited{color:#fff}:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#ac2d1e;--button-primary:#802216;--button-hover:#6b1c12;--header:#dd4b39;--text-main:#bbb;--text-alt:#222;--text-sub:#9b9b9b;--link:#e00000;--visited-link:#d24d57;--hover-link:#d24d57;--nav-link:#fff;--light-link:#fff}#ldapad_test_results.well.well-sm{color:var(--back-main)}.pagination>li>a{background-color:var(--back-main);color:var(--light-link)}.pagination>.active>a{background-color:var(--visited-link);border-color:var(--light-link)}.pagination>.active>a:hover{background-color:var(--hover-link)}.tasks-menu>.dropdown-menu>li .menu{background-color:var(--back-main)}.tasks-menu>.dropdown-menu>li .menu>li>a:hover .progress{background-color:var(--background)}h2.task_menu{color:var(--link)}.navbar-custom-menu>.navbar-nav>li>.dropdown-menu{background-color:var(--back-main);color:var(--link)}.main-header .logo,.main-header .navbar{background-color:var(--header);background:linear-gradient(to bottom,var(--header) 0,var(--header) 100%);border-color:var(--header)}.bootstrap-table .fixed-table-container .table thead th .sortable{color:var(--nav-link)}.bootstrap-table .fixed-table-toolbar .columns label{color:#000}.navbar-nav>li>a:link,.thead{color:var(--nav-link)}.modal-content{background-color:var(--back-main);color:var(--text-main)}a:link{color:var(--link)}a:hover{color:var(--hover-link)}.far fa-life-ring{color:var(--link)}.btn-primary.hover{color:var(--nav-link)}.small-box h3,.small-box p{color:var(--nav-link)!important}.small-box h3 a:hover,.small-box p a:hover{color:var(--nav-link)!important;text-decoration:none}#accessoriesTable>tbody>tr>td>nobr>a>i.fa,#assetsListingTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}#assetsListingTable>tbody>tr.selected>td{background-color:var(--back-main)}body{color:var(--text-main)}.box,.box.box-default{border-top-color:var(--header);border-top:3px solid var(--header)}.box-body,.box-footer,.box-header{background-color:var(--back-sub);color:var(--header)}.btn-default{background-color:var(--back-sub)}.btn-default dropdown-toggle{background-color:var(--button-default);color:var(--link)}.btn-default.active,.btn-default:active,.btn-default:focus,.btn-default:hover{background-color:var(--button-hover);color:var(--link)}.btn-primary,.btn-primary.hover,.btn-primary:active,.text-red{color:var(--button-primary)}.btn-primary:hover{background-color:var(--button-primary);color:var(--link)!important}#componentsTable>tbody>tr>td>nobr>a>i.fa,#consumablesTable>tbody>tr>td>nobr>a>i.fa{color:var(--text-main)}.content-wrapper{background-color:var(--background)}#create-form>div>div>div>span>i.fa{background-color:var(--back-sub);color:var(--header)}.datepicker .datepicker-switch:hover,.datepicker .next:hover,.datepicker .prev:hover,.datepicker table tr td.day.focused,.datepicker table tr td.day:hover,.datepicker tfoot tr th:hover{background-color:var(--header)}.datepicker.dropdown-menu{background-color:var(--back-main);color:var(--text-main)}#details>div>div>div>table{background-color:transparent}.dropdown-menu>li>a:hover{background-color:var(--back-main);color:var(--nav-link)}.fixed-table-body thead th .th-inner{color:var(--nav-link)}.form-control,.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:var(--back-main);color:var(--text-main)}h1,h2,h3,h4,h5,h6,p{color:var(--text-main)}.help-block{color:var(--text-sub)}input[type=search],input[type=text]{background-color:var(--back-sub);color:var(--text-main)}.input-group,.input-group-addon{background-color:var(--back-sub)!important;color:var(--text-main)}#licensesTable>tbody>tr>td>nobr>a>i.fa,.main-footer{color:var(--text-main)}.main-footer{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li>a{color:var(--text-main)}.nav-tabs-custom>.nav-tabs>li.active{border-top-color:var(--header)}.nav-tabs-custom>.nav-tabs>li.active>a{background-color:var(--back-main)}.nav-tabs-custom>.nav-tabs>li.active>a:hover{background-color:var(--back-sub);color:var(--text-main)}.nav-tabs-custom,.nav-tabs-custom>.tab-content{background-color:var(--back-main)}.navbar-nav>.tasks-menu>.dropdown-menu>li.header{background-color:var(--back-main);color:var(--header)}.open>.dropdown-toggle.btn-default{background-color:var(--back-sub);color:var(--header)}.panel{background-color:var(--back-sub);color:var(--text-main)}.panel-default>.panel-heading{background-color:var(--back-main);color:var(--header)}.select2-container--default .select2-results__option[aria-selected=true],.select2-container--default .select2-results__option[aria-selected=true]:hover{background-color:var(--back-sub);color:var(--header)}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:var(--header);color:var(--back-main)}.select2-container--default .select2-selection--single .select2-selection__rendered{color:var(--text-main)}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:var(--header)}.select2-selection--single{background-color:var(--back-sub)!important;color:var(--text-main)!important}.select2-dropdown{background-color:var(--back-main);color:var(--text-main)}.skin-red-dark .main-header .navbar .dropdown-menu li a{color:var(--header)}.fixed-table-body thead th .th-inner,.sidebar-toggle:hover,.skin-red .sidebar-menu>li:hover>a,.skin-red-dark .sidebar-menu>li.active>a{background-color:var(--header)!important}.tab-content,.tab-pane{background-color:var(--back-main);color:var(--text-main)}.table-striped>tbody>tr:nth-of-type(odd){background-color:var(--back-sub)}.table-striped>tbody>tr:nth-of-type(2n){background-color:var(--back-sub-alt)}#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa,.box-body,.box-footer,.box-header{color:var(--text-main)}.box-header.with-border{border-bottom:#000}#upload-table h3,#upload-table p,#upload-table tbody>tr.warning>td{background-color:#fcf8e3;color:#000}a{color:var(--link)}a:hover,a:link{color:var(--nav-link)}a:hover{text-decoration:underline}a:visited{color:var(--nav-link)}#customFieldsTable a[href*="/models"]{color:var(--back-sub)}#customFieldsTable a[href*="/fieldsets"]{background-color:transparent}.row-striped{box-sizing:border-box;display:table;line-height:2.6;margin-left:20px;padding:0;vertical-align:top}.row-striped .row:nth-of-type(2n) div,.row-striped .row:nth-of-type(odd) div{background-color:var(--back-sub);border-top:1px solid #ddd;color:var(--text-main);display:table-cell}.row-new-striped>.row:nth-of-type(odd){background-color:var(--back-sub);color:var(--text-main)}.row-new-striped>.row:nth-of-type(2n){background-color:var(--back-sub-alt);color:var(--text-main)}.search-highlight,.search-highlight:hover{background-color:#e9d15b} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index aac67af304..3d6c3a781c 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -11,7 +11,7 @@ "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f", "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9f944e8021781af1ce45d27765d1c0c2", "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=cf6c8c340420724b02d6e787ef9bded5", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=a2face0209dca9d5f2421354057e7360", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=7f0eb9e355b36b41c61c3af3b4d41143", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f4d95ad9d0944587549e35b6929b4b04", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b", "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=44f9320d0739f419c9246f7f39395b02", @@ -42,7 +42,7 @@ "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=fc7adb943668ac69fe4b646625a7571f", "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=3cb840e047cd0c40484a08c7a8e7cdea", "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=b9a74ec0cd68f83e7480d5ae39919beb", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=a2face0209dca9d5f2421354057e7360", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=7f0eb9e355b36b41c61c3af3b4d41143", "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=cf6c8c340420724b02d6e787ef9bded5", "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9f944e8021781af1ce45d27765d1c0c2", "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=268041e902b019730c23ee3875838005", diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 8d75bbc792..3fded5f067 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -385,6 +385,10 @@ input[type=text], input[type=search] { .box-header.with-border { border-bottom: #000; } +#upload-table tbody > tr.warning > td,#upload-table h3,#upload-table p{ + background-color:#fcf8e3; + color:#000; +} a { color: var(--link); diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index 6bf36b4ebf..7dd8d6181c 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -75,6 +75,7 @@ return [ 'your_credentials' => 'Your Snipe-IT credentials', 'Accessory_Checkin_Notification' => 'Accessory checked in', 'Asset_Checkin_Notification' => 'Asset checked in', + 'Asset_Checkout_Notification' => 'Asset checked out', 'License_Checkin_Notification' => 'License checked in', 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',