Merge pull request #11386 from snipe/fixes/default_skin_settings_colors

Small fixes to default blue

public/mix-manifest.json

@@ -1,12 +1,12 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e15573e394b96f249",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f577ce74b0dc04d0ec2bdc31b6b57e54",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=2921802af70bd9f0c247e5dd4e23c442",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=850778acc6fa9f9ba0c399c026608d4d",
-    "/css/build/app.css": "/css/build/app.css?id=6c9a6e04ac7d56ee6fdb027488627b3c",
+    "/css/build/app.css": "/css/build/app.css?id=d7704c35fe632144a1c62703a7441a1f",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=c17de79571bc6dc421127b87cab2e2dc",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=d7326fc67c3ca143b9233b7a43051840",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=e8c9cf22560dcdec04ec955198160463",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8b9d88179519a78562f039983f31e093",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6ba9ca371ded3",
     "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=d8ff93a7b6938b2bf01c12d3c11d1a76",
@@ -16,9 +16,9 @@
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=924fd5e1d5d41ffc483841a628eb9c58",
     "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=ad668346fb0a97b86491ce33d995c9b6",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6fcff8c440044",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7",
-    "/css/dist/all.css": "/css/dist/all.css?id=a183b0847d54643c0936b906d72cef13",
+    "/css/dist/all.css": "/css/dist/all.css?id=e96c361789791e57cb4510157fd914f6",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
     "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
@@ -31,8 +31,8 @@
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=ad668346fb0a97b86491ce33d995c9b6",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=924fd5e1d5d41ffc483841a628eb9c58",
     "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=81f5e6c7216d0fe56425e158a5446ce0",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f577ce74b0dc04d0ec2bdc31b6b57e54",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=71977934351d63b126c6b3573baf3349",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=d7326fc67c3ca143b9233b7a43051840",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=e8c9cf22560dcdec04ec955198160463",
     "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6ba9ca371ded3",
     "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8b9d88179519a78562f039983f31e093",
     "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1701082bec9f7",
@@ -41,5 +41,5 @@
     "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=d8ff93a7b6938b2bf01c12d3c11d1a76",
     "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768c093ee3a5a8f",
     "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=c17de79571bc6dc421127b87cab2e2dc",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=6a9d0ac448c28b88e5d6fcff8c440044"
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b"
 }

resources/assets/less/overrides.less

@@ -197,8 +197,8 @@ a.accordion-header {
   color: #f0ad4e;
 }
 
-.btn-danger.btn-outline {
+.btn-danger.btn-outline, a.link-danger:link, a.link-danger:visited, a.link-danger:hover {
-  color: #d9534f;
+  color: #dd4b39;
 }
 
 .btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover {

resources/assets/less/skins/skin-blue.less

@@ -98,15 +98,20 @@
     color: #fff;
 }
 
+.btn-default:link, a.btn-default:hover, .btn-default:visited,
+{
+  color: @dark-gray;
+}
+
 
 :root {
-  --button-default: darken(@blue, 15%);
+  --button-default: @dark-gray;
   --button-primary: darken(@blue, 25%);
   --button-hover: darken(@blue, 30%);
   --header: @blue; /* Use same as Header picker */
   --text-main: #BBB;
   --text-sub: #9b9b9b;
-  --link: @blue; /* Use same as Header picker, lighten by 70% */
+  --link:darken(@blue, 15%); /* Use same as Header picker, lighten by 70% */
   --visited-link: lighten(@blue,10%); /* Use same as Header picker, lighten by 70% */
   --hover-link: lighten(@blue,20%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
@@ -145,3 +150,8 @@ a:hover {
 .search-highlight, .search-highlight:hover {
   background-color: #e9d15b;
 }
+
+// Link colors for the settings page
+a.settings_button:link, a.settings_button:visited, a.settings_button:hover {
+  color: @light-blue;
+}

resources/assets/less/variables.less

@@ -13,7 +13,7 @@
 @aqua: #00c0ef;
 // Warning
 @yellow: #f39c12;
-@blue: #0073b7;
+@blue: #3c8dbc;
 @navy: #001F3F;
 @teal: #39CCCC;
 @olive: #3D9970;

resources/views/settings/index.blade.php

@@ -50,7 +50,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-              <a href="{{ route('settings.branding.index') }}">
+              <a href="{{ route('settings.branding.index') }}" class="settings_button">
                 <i class="fas fa-copyright fa-4x" aria-hidden="true"></i>
                 <br><br>
                 <span class="name">{{ trans('admin/settings/general.brand') }}</span>
@@ -67,7 +67,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.general.index') }}">
+                <a href="{{ route('settings.general.index') }}" class="settings_button">
                   <i class="fas fa-wrench fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name"> {{ trans('admin/settings/general.general_settings') }}</span>
@@ -84,7 +84,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.security.index') }}">
+                <a href="{{ route('settings.security.index') }}" class="settings_button">
                   <i class="fas fa-lock fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.security') }}</span>
@@ -100,7 +100,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('groups.index') }}">
+                <a href="{{ route('groups.index') }}" class="settings_button">
                   <i class="fas fa-user-friends fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('general.groups') }}</span>
@@ -117,7 +117,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.localization.index') }}">
+                <a href="{{ route('settings.localization.index') }}" class="settings_button">
                   <i class="fas fa-globe-americas fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.localization') }}</span>
@@ -135,7 +135,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.alerts.index') }}">
+                <a href="{{ route('settings.alerts.index') }}" class="settings_button">
                   <i class="fas fa-bell fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.notifications') }}</span>
@@ -151,7 +151,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.slack.index') }}">
+                <a href="{{ route('settings.slack.index') }}" class="settings_button">
                   <i class="fab fa-slack fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.slack') }}</span>
@@ -166,7 +166,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.asset_tags.index') }}">
+                <a href="{{ route('settings.asset_tags.index') }}" class="settings_button">
                   <i class="fas fa-list-ol fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('general.asset_tags') }}</span>
@@ -181,7 +181,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.barcodes.index') }}">
+                <a href="{{ route('settings.barcodes.index') }}" class="settings_button">
                   <i class="fas fa-barcode fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.barcodes') }}</span>
@@ -196,7 +196,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.labels.index') }}">
+                <a href="{{ route('settings.labels.index') }}" class="settings_button">
                   <i class="fas fa-tags fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.labels') }}</span>
@@ -212,7 +212,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.ldap.index') }}">
+                <a href="{{ route('settings.ldap.index') }}" class="settings_button">
                   <i class="fas fa-sitemap fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.ldap') }}</span>
@@ -227,7 +227,7 @@
         <div class="box box-default">
           <div class="box-body text-center">
             <h5>
-              <a href="{{ route('settings.saml.index') }}">
+              <a href="{{ route('settings.saml.index') }}" class="settings_button">
                 <i class="fas fa-sign-in-alt fa-4x" aria-hidden="true"></i>
                 <br><br>
                 <span class="name">{{ trans('admin/settings/general.saml') }}</span>
@@ -242,7 +242,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-                <a href="{{ route('settings.backups.index') }}">
+                <a href="{{ route('settings.backups.index') }}" class="settings_button">
                   <i class="fas fa-file-archive fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.backups') }}</span>
@@ -258,7 +258,7 @@
         <div class="box box-default">
           <div class="box-body text-center">
             <h5>
-              <a href="{{ route('settings.logins.index') }}">
+              <a href="{{ route('settings.logins.index') }}" class="settings_button">
                 <i class="fas fa-crosshairs fa-4x" aria-hidden="true"></i>
                 <br><br>
                 <span class="name">{{ trans('admin/settings/general.login') }}</span>
@@ -273,7 +273,7 @@
           <div class="box box-default">
             <div class="box-body text-center">
               <h5>
-              <a href="{{ route('settings.oauth.index') }}">
+              <a href="{{ route('settings.oauth.index') }}" class="settings_button">
                 <i class="fas fa-user-secret fa-4x" aria-hidden="true"></i>
                 <br><br>
                 <span class="name">{{  trans('admin/settings/general.oauth') }}</span>
@@ -289,7 +289,7 @@
             <div class="box box-default">
               <div class="box-body text-center">
                 <h5>
-                  <a href="{{ route('settings.phpinfo.index') }}">
+                  <a href="{{ route('settings.phpinfo.index') }}" class="settings_button">
                     <i class="fab fa-php fa-4x" aria-hidden="true"></i>
                     <br><br>
                     <span class="name">{{ trans('admin/settings/general.php_overview') }}</span>
@@ -306,7 +306,7 @@
       <div class="box box-danger">
         <div class="box-body text-center">
           <h5>
-            <a href="{{ route('settings.purge.index') }}">
+            <a href="{{ route('settings.purge.index') }}" class="link-danger">
               <i class="fas fa-trash fa-4x" aria-hidden="true"></i>
               <br><br>
               <span class="name">{{ trans('admin/settings/general.purge') }}</span>