Skip to content

A free open source IT asset/license management system

Fixed new dark mode for bulk model edit

snipeb0ab900a0ffc
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 3c362e5785..4326160b6f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -84,6 +84,7 @@
--link-hover: hsl(from var(--link-color) h s calc(l - 10));
--main-theme-hover: hsl(from var(--main-theme-color) h s calc(l - 10));
--tab-bottom-border: 1px solid var(--box-header-top-border-color);
+ --table-border-row: 1px solid #ecf0f5;
--table-border-row-top: 1px solid #ecf0f5;
--table-stripe-bg-alt: rgba(211, 211, 211, 0.25);
--table-stripe-bg: #ffffff;
@@ -437,7 +438,7 @@
.table > tbody > tr > td,
.table > tfoot > tr > td
{
- border-top: var(--table-border-row);
+ border-top: var(--table-border-row) !important;
}
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 806d587490..a64ddbcb02 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -30,21 +30,20 @@
<table class="table">
- <tbody>
- @foreach ($models as $model)
+ @foreach ($models as $model)
- <tr{!! (($model->assets_count > 0 ) ? ' class="warning"' : ' class="success"') !!}>
- <td>
- <i class="fa {!! (($model->assets_count > 0 ) ? 'fa-warning info' : 'fa-check success') !!}"></i>
- {{ $model->display_name }}
+ <tr>
+ <td>
+ <i class="fa {!! (($model->assets_count > 0 ) ? 'fa-warning text-warning' : 'fa-check success') !!}"></i>
+ {{ $model->display_name }}
- @if ($model->model_number)
- ({{ $model->model_number }})
- @endif
+ @if ($model->model_number)
+ ({{ $model->model_number }})
+ @endif
+ </td>
+ <td>{{ $model->assets_count }} assets
</td>
- <td>{{ $model->assets_count }} assets
- </td>
- </tr>
+ </tr>
@endforeach
</table>
@@ -100,15 +99,9 @@
<div class="col-md-9">
<div class="form-inline" style="display: flex; align-items: center; gap: 8px;">
<input type="checkbox" name="require_serial" value="1" id="require_serial" aria-label="require_serial" />
- <a
- href="#"
- data-tooltip="true"
- title="{{ trans('admin/hardware/general.require_serial_help') }}"
- style="display: inline-flex; align-items: center;"
- >
- <x-icon type="info-circle" />
- <span class="sr-only">{{ trans('admin/hardware/general.require_serial_help') }}</span>
- </a>
+ <x-form-tooltip>
+ {{ trans('admin/hardware/general.require_serial_help') }}
+ </x-form-tooltip>
</div>
</div>
</div>
@@ -142,7 +135,7 @@
<div class="box-footer text-right">
<a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
- <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.update') }}</button>
+ <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div><!-- /.box-footer -->
</div> <!--/.box.box-default-->
</form>