diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 05f80e23b8..8a324efbae 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -12,7 +12,7 @@ @if ($snipeSettings->dashboard_message!='')
-
+
@@ -151,7 +151,7 @@
-
+

{{ trans('general.dashboard_info') }}

@@ -235,6 +235,7 @@ data-side-pagination="server" data-id-table="dashActivityReport" data-sort-order="desc" + data-show-columns="false" data-sort-name="created_at" id="dashActivityReport" class="table table-striped snipe-table" @@ -315,6 +316,7 @@ data-pagination="false" data-side-pagination="server" data-sort-order="desc" + data-show-columns="false" data-sort-field="assets_count" id="dashCompanySummary" class="table table-striped snipe-table" @@ -385,6 +387,7 @@ data-sort-order="desc" data-sort-field="assets_count" id="dashLocationSummary" + data-show-columns="false" class="table table-striped snipe-table" data-url="{{ route('api.locations.index', ['sort' => 'assets_count', 'order' => 'asc']) }}"> @@ -444,6 +447,7 @@ data-height="400" data-pagination="false" data-side-pagination="server" + data-show-columns="false" data-sort-order="desc" data-sort-field="assets_count" id="dashCategorySummary" diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 4690b66aeb..8545d75634 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -51,7 +51,7 @@
-
+
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index db96b556b9..a96efc3db3 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -15,7 +15,7 @@
-
+
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 8196b768df..f36dbf6378 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -58,7 +58,7 @@ --header-color: #000000; --link-color: {{ $snipeSettings->header_color }}; --nav-primary-font-color: #ffffff; - --table-border-row-top: 1px solid #434243; + --table-border-row-top: 1px solid #ecf0f5; --table-stripe-bg-alt: rgba(211, 211, 211, 0.25); --table-stripe-bg: #ffffff; --text-blue: #d6d6d6; @@ -200,10 +200,15 @@ border-bottom: var(--box-header-top-border); border-top-right-radius: 3px; border-top-left-radius: 3px; - margin-bottom: 0; - padding-bottom: 2px; + margin-bottom: -1px; + padding-bottom: 0; + } + .nav-tabs > li > a { + margin-right: 0; + border: 0; + } .box, .box-footer, @@ -225,14 +230,17 @@ .nav-tabs-custom > .nav-tabs > li.active { border-top-color: var(--main-theme-color) !important; - background-color: var(--box-header-top-border) !important; - border-bottom-color: var(--box-bg) !important; - border-left: 1px solid var(--box-header-top-border) ; - border-right: 1px solid var(--box-header-top-border) ; + background-color: var(--box-header-top-border-color) !important; + border-bottom: 1px solid var(--box-bg) !important; + border-right: 1px solid var(--box-header-top-border-color) ; border-top-right-radius: 3px; border-top-left-radius: 3px; } + .nav-tabs-custom > .nav-tabs > li:first-of-type { + border-left: 0; + } + /** table rows @@ -250,13 +258,18 @@ .table-striped > tbody > tr:nth-of-type(even), - .row-new-striped > .row:nth-of-type(even) { - background-color: var(--table-stripe-bg); + .row-new-striped > .row:nth-of-type(even), + .row-new-striped > .div:nth-of-type(odd) { + background-color: var(--table-stripe-bg) !important; + border-top: var(--table-border-row-top) !important; } .table-striped > tbody > tr:nth-of-type(odd), - .row-new-striped > .row:nth-of-type(odd){ - background-color: var(--table-stripe-bg-alt); + .row-new-striped > .row:nth-of-type(even), + .row-new-striped > .div:nth-of-type(odd) + { + background-color: var(--table-stripe-bg-alt) !important; + border-top: var(--table-border-row-top) !important; } @@ -348,13 +361,6 @@ color: var(--nav-primary-font-color); } - - .btn-primary { - background-color: var(--main-theme-color); - border-color: hsl(from var(--main-theme-color) h s calc(l - 15)); - } - - .btn:link, .btn:hover, .btn:visited, @@ -363,16 +369,21 @@ color: white !important; } + + .btn-primary, .btn-primary:hover, .btn-primary:active, .btn-primary.hover { background-color: hsl(from var(--main-theme-color) h s calc(l - 5)); border-color: hsl(from var(--main-theme-color) h s calc(l - 15)); - color: hsl(from var(--main-theme-color) h s calc(l + 55)) !important; + color: white; + } + + .navbar-nav > .notifications-menu > .dropdown-menu > li.header, .navbar-nav > .messages-menu > .dropdown-menu > li.header, .navbar-nav > .tasks-menu > .dropdown-menu > li.header, @@ -468,12 +479,13 @@ .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, - .table > tfoot > tr > td, - .sticky-header { + .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); } @@ -491,6 +503,14 @@ color: hsl(from var(--main-theme-color) h s calc(l - 5)); } + .dropdown-menu > .divider { + background-color: hsl(from var(--main-theme-color) h s calc(l - 10)); + margin-top: 0; + margin-bottom: 0; + padding-top: 1px; + + } + @@ -823,6 +843,11 @@ @endif +
  • + + {{ trans('general.dark_mode') }} + +
    • @can('self.api')
  • @@ -832,12 +857,7 @@
    • @endcan -
  • - - Dark Mode - -
    • -
  • +
  • @@ -1541,7 +1561,7 @@ * Utility function to update the button text and aria-label. */ function updateButton({ buttonEl, isDark }) { - const newCta = isDark ? ' Light mode' : ' Dark theme'; + const newCta = isDark ? ' {{ trans('general.light_mode') }}' : ' {{ trans('general.dark_mode') }}'; // use an aria-label if you are omitting text on the button // and using a sun/moon icon, for example buttonEl.setAttribute("aria-label", newCta); diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php index 8012cc2bbe..133ebf1a2f 100755 --- a/resources/views/licenses/index.blade.php +++ b/resources/views/licenses/index.blade.php @@ -13,7 +13,7 @@
    -
    +
    -
    +
    @@ -60,7 +60,7 @@ @endif
    -
    +
    diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index e3ed850f3f..2699a386e8 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -226,7 +226,7 @@ }, attributes: { title: '{{ trans('general.create') }}', - class: 'btn-info', + class: 'btn-sm btn-info', @if ($snipeSettings->shortcuts_enabled == 1) accesskey: 'n' @endif @@ -1048,18 +1048,18 @@ } if ((row.available_actions) && (row.available_actions.clone === true)) { - actions += '{{ trans('general.clone_item') }} '; + actions += '{{ trans('general.clone_item') }} '; } if ((row.available_actions) && (row.available_actions.audit === true)) { - actions += '{{ trans('general.audit') }} '; + actions += '{{ trans('general.audit') }} '; } if ((row.available_actions) && (row.available_actions.update === true)) { - actions += '{{ trans('general.update') }} '; + actions += '{{ trans('general.update') }} '; } else { if ((row.available_actions) && (row.available_actions.update != true)) { - actions += ' '; + actions += ' '; } } @@ -1080,11 +1080,11 @@ + ' data-toggle="modal" data-icon="fa-trash"' + ' data-content="{{ trans('general.sure_to_delete') }}: ' + name_for_box + '?" ' + ' data-title="{{ trans('general.delete') }}" onClick="return false;">' - + '{{ trans('general.delete') }} '; + + '{{ trans('general.delete') }} '; } else { // Do not show the delete button on things that are already deleted if ((row.available_actions) && (row.available_actions.restore != true)) { - actions += '{{ trans('general.cannot_be_deleted') }} '; + actions += '{{ trans('general.cannot_be_deleted') }} '; } } diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php index 17e7a96599..c96c42ac32 100755 --- a/resources/views/statuslabels/index.blade.php +++ b/resources/views/statuslabels/index.blade.php @@ -38,7 +38,7 @@

    {{ trans('admin/statuslabels/table.about') }}

    -
    +

    {!! trans('admin/statuslabels/table.info') !!}

    diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php index 46d356c3ef..a99bd21ad3 100644 --- a/resources/views/statuslabels/view.blade.php +++ b/resources/views/statuslabels/view.blade.php @@ -10,7 +10,7 @@
    -
    +
    @include('partials.asset-bulk-actions')