Skip to content

A free open source IT asset/license management system

Moved new styles into default layout

snipe0ff2a971a487
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index e71b5fca68..4c0684aa38 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -13,92 +13,7 @@
{{-- Page content --}}
@section('content')
- <style>
- .main-panel-content {
- line-height: 20px;
- border-bottom: var(--tab-bottom-border);
- padding: 10px 15px;
- }
-
-
-
-
- /* table */
-
- dl.table-display {
- float: left;
- width: 100%;
- margin: 1em 0;
- padding: 0;
- }
-
- .table-display dt {
- line-height: 25px;
- clear: left;
- float: left;
- /*text-align: right;*/
- width: 20%;
- margin: 0;
- padding: 8px;
- border-top: var(--tab-bottom-border);
- font-weight: bold;
- }
-
- .table-display dd {
- line-height: 20px;
- float: left;
- width: 80%;
- margin: 0;
- padding: 10px;
- border-top: var(--tab-bottom-border);
- }
-
- .well-display dt {
- line-height: 20px;
- clear: left;
- float: left;
- /*text-align: right;*/
- width: 70%;
- margin: 0;
- padding: 6px;
- border-top: 0;
- font-weight: bold;
- }
-
- .well-display dd {
- line-height: 20px;
- float: left;
- width: 30%;
- margin: 0;
- padding: 6px;
- border-top: 0;
- }
-
-
- .table-display dd:first-of-type, .table-display dt:first-of-type {
- border-top: 0 !important;
- }
-
-
- @media (max-width: 750px) {
- .table-display dd {
- width: 100% !important;
- }
-
- .table-display dt {
- width: 100% !important;
- }
- }
-
- @media print {
- /* All your print styles go here */
- .box-profile {
- display: block !important;
- width: 100% !important;
- }
- }
-
- </style>
+
<x-container columns="2">
@if (!$asset->model)
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index bde601a99a..01d33f07f7 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1021,6 +1021,89 @@
border: 0 !important;
}
+ .main-panel-content {
+ line-height: 20px;
+ border-bottom: var(--tab-bottom-border);
+ padding: 10px 15px;
+ }
+
+
+ /* table */
+
+ dl.table-display {
+ float: left;
+ width: 100%;
+ margin: 1em 0;
+ padding: 0;
+ }
+
+ .table-display dt {
+ line-height: 25px;
+ clear: left;
+ float: left;
+ /*text-align: right;*/
+ width: 20%;
+ margin: 0;
+ padding: 8px;
+ border-top: var(--tab-bottom-border);
+ font-weight: bold;
+ }
+
+ .table-display dd {
+ line-height: 20px;
+ float: left;
+ width: 80%;
+ margin: 0;
+ padding: 10px;
+ border-top: var(--tab-bottom-border);
+ }
+
+ .well-display dt {
+ line-height: 20px;
+ clear: left;
+ float: left;
+ /*text-align: right;*/
+ width: 70%;
+ margin: 0;
+ padding: 6px;
+ border-top: 0;
+ font-weight: bold;
+ }
+
+ .well-display dd {
+ line-height: 20px;
+ float: left;
+ width: 30%;
+ margin: 0;
+ padding: 6px;
+ border-top: 0;
+ }
+
+
+ .table-display dd:first-of-type, .table-display dt:first-of-type {
+ border-top: 0 !important;
+ }
+
+
+ @media (max-width: 750px) {
+ .table-display dd {
+ width: 100% !important;
+ }
+
+ .table-display dt {
+ width: 100% !important;
+ }
+ }
+
+ @media print {
+ /* All your print styles go here */
+ .box-profile {
+ display: block !important;
+ width: 100% !important;
+ }
+ }
+
+
</style>
{{-- Custom CSS --}}
@@ -1244,7 +1327,7 @@
@if (Auth::check())
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- @if (Auth::user()->present()->gravatar())
+ @if (auth()->user()->present()->gravatar())
<img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
alt="">
@else