Skip to content

A free open source IT asset/license management system

Fixed import view with light/dark

snipe3feee682b68b
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 4b04d1d8ce..419dc804ed 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -609,13 +609,15 @@
.table > tfoot > tr > th,
.table > thead > tr > td,
.table > tbody > tr > td,
- .table > tfoot > tr > td
+ .table > tfoot > tr > td,
+
{
border-top-color: var(--box-header-bottom-border-color) !important;
border-bottom-color: var(--box-header-bottom-border-color) !important;
}
+
.help-block {
color: var(--text-help);
}
@@ -750,6 +752,16 @@
/*color: var(--sidenav-text-hover-color) !important;*/
}
+ .sidebar-toggle.btn,
+ .sidebar-toggle.btn:hover
+ {
+ color: white !important;
+ }
+
+ .chart-responsive {
+ color: var(--color-fg) !important;
+ }
+
</style>
{{-- Custom CSS --}}
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index 0de154360c..23da29e4aa 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -67,20 +67,20 @@
<div class="col-md-12">
@if($progress != -1)
- <div class="col-md-10 col-sm-5 col-xs-12" style="height: 35px;" id='progress-container'>
+ <div class="col-md-10 col-sm-5 col-xs-12" style="height: 33px;" id='progress-container'>
<div class="progress progress-striped-active" style="height: 100%;">
- <div id='progress-bar' class="progress-bar {{ $progress_bar_class }}" role="progressbar" style="width: {{ $progress }}%">
+ <div id='progress-bar' class="progress-bar progress-bar-striped {{ $progress_bar_class }}" role="progressbar" style="width: {{ $progress }}%">
<h4 id="progress-text">{!! $progress_message !!}</h4>
</div>
</div>
</div>
@endif
- <div class="col-md-4 col-sm-5 col-xs-12 text-right pull-right">
+ <div class="col-md-2 col-sm-5 col-xs-12 text-right pull-right">
<!-- The fileinput-button span is used to style the file input field as button -->
@if (!config('app.lock_passwords'))
- <span class="btn btn-primary fileinput-button">
+ <span class="btn btn-theme btn-block fileinput-button">
<span>{{ trans('button.select_file') }}</span>
<!-- The file input field used as target for the file upload widget -->
<label for="files[]"><span class="sr-only">{{ trans('admin/importer/general.select_file') }}</span></label>
@@ -125,7 +125,7 @@
@foreach($this->files as $currentFile)
- <tr style="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'font-weight: bold' : '' }}" class="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'warning' : '' }}">
+ <tr style="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'font-weight: bold' : '' }}" class="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? '' : '' }}">
<td>{{ $currentFile->file_path }}</td>
<td>{{ Helper::getFormattedDateObject($currentFile->created_at, 'datetime', false) }}</td>
<td>{{ ($currentFile->adminuser) ? $currentFile->adminuser->present()->fullName : '--'}}</td>
@@ -145,12 +145,12 @@
</tr>
@if( $currentFile && $this->activeFile && ($currentFile->id == $this->activeFile->id))
- <tr class="warning">
+ <tr class="callout" style="padding-left: 10px;">
<td colspan="5">
<div class="form-group">
- <label for="typeOfImport" class="col-md-3 col-xs-12">
+ <label for="typeOfImport" class="col-md-3 col-xs-12 control-label">
{{ trans('general.import_type') }}
</label>