From 887e5c9d49da6e0fab7bf2066f5a05a329962c31 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 9 Feb 2018 14:55:45 +0000 Subject: [PATCH] some updates to the default colours and styling --- app/SupportedApps/Duplicati.php | 2 +- app/SupportedApps/Nzbget.php | 2 +- app/SupportedApps/Pfsense.php | 2 +- app/SupportedApps/Pihole.php | 2 +- app/SupportedApps/Portainer.php | 2 +- app/SupportedApps/Sabnzbd.php | 2 +- app/SupportedApps/Unifi.php | 2 +- public/css/app.css | 6 ++++-- public/mix-manifest.json | 2 +- resources/assets/sass/_app.scss | 7 ++++++- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/SupportedApps/Duplicati.php b/app/SupportedApps/Duplicati.php index 939a95f8..44abd327 100644 --- a/app/SupportedApps/Duplicati.php +++ b/app/SupportedApps/Duplicati.php @@ -3,7 +3,7 @@ class Duplicati implements Contracts\Applications { public function defaultColour() { - return '#222'; + return '#2c3744'; } public function icon() { diff --git a/app/SupportedApps/Nzbget.php b/app/SupportedApps/Nzbget.php index 407efc7b..0f5a481c 100644 --- a/app/SupportedApps/Nzbget.php +++ b/app/SupportedApps/Nzbget.php @@ -9,7 +9,7 @@ class Nzbget implements Contracts\Applications, Contracts\Livestats { public function defaultColour() { - return '#124019'; + return '#253827'; } public function icon() { diff --git a/app/SupportedApps/Pfsense.php b/app/SupportedApps/Pfsense.php index df2c4de4..eadbb096 100644 --- a/app/SupportedApps/Pfsense.php +++ b/app/SupportedApps/Pfsense.php @@ -3,7 +3,7 @@ class Pfsense implements Contracts\Applications { public function defaultColour() { - return '#222'; + return '#4e4742'; } public function icon() { diff --git a/app/SupportedApps/Pihole.php b/app/SupportedApps/Pihole.php index f140776e..83b132a0 100644 --- a/app/SupportedApps/Pihole.php +++ b/app/SupportedApps/Pihole.php @@ -6,7 +6,7 @@ use GuzzleHttp\Client; class Pihole implements Contracts\Applications, Contracts\Livestats { public function defaultColour() { - return '#2b0909'; + return '#352222'; } public function icon() { diff --git a/app/SupportedApps/Portainer.php b/app/SupportedApps/Portainer.php index fc8cc388..f0a34b56 100644 --- a/app/SupportedApps/Portainer.php +++ b/app/SupportedApps/Portainer.php @@ -3,7 +3,7 @@ class Portainer implements Contracts\Applications { public function defaultColour() { - return '#222'; + return '#283f44'; } public function icon() { diff --git a/app/SupportedApps/Sabnzbd.php b/app/SupportedApps/Sabnzbd.php index a67b8d89..b4f2864c 100644 --- a/app/SupportedApps/Sabnzbd.php +++ b/app/SupportedApps/Sabnzbd.php @@ -9,7 +9,7 @@ class Sabnzbd implements Contracts\Applications, Contracts\Livestats { public function defaultColour() { - return '#463b06'; + return '#3e3924'; } public function icon() { diff --git a/app/SupportedApps/Unifi.php b/app/SupportedApps/Unifi.php index 0870e5b1..9484e789 100644 --- a/app/SupportedApps/Unifi.php +++ b/app/SupportedApps/Unifi.php @@ -3,7 +3,7 @@ class Unifi implements Contracts\Applications { public function defaultColour() { - return '#222'; + return '#363840'; } public function icon() { diff --git a/public/css/app.css b/public/css/app.css index a5400d50..29b87483 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -519,8 +519,6 @@ body { border-radius: 6px; padding: 15px; padding-right: 55px; - -webkit-box-shadow: 0 0 20px 2px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 20px 2px rgba(0, 0, 0, 0.3); color: white; overflow: hidden; position: relative; @@ -533,6 +531,10 @@ body { -webkit-box-align: center; -ms-flex-align: center; align-items: center; + border: 1px solid #333333; + border: 1px solid #4a4a4a; + border: 1px solid rgba(76, 76, 76, 0.4); + background-clip: padding-box; } .item:after { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 09975517..f38f5909 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=2c26ceaac3fea305ee9d", + "/css/app.css": "/css/app.css?id=70973f59883db8552bcd", "/js/app.js": "/js/app.js?id=8dfc323d4d8919d6f3bf" } \ No newline at end of file diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index a67272d7..12b0239b 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -232,7 +232,7 @@ body { padding: 15px; padding-right: 55px; //border: 2px solid rgba(0,0,0,0.4); - box-shadow: 0 0 20px 2px rgba(0,0,0,0.3); + //box-shadow: 0 0 15px 1px rgba(35, 35, 35, 0.44); color: white; overflow: hidden; position: relative; @@ -240,6 +240,11 @@ body { outline: 1px solid transparent; display: flex; align-items: center; + border: 1px solid #333333; + border: 1px solid rgb(74, 74, 74); + border: 1px solid rgba(76, 76, 76, 0.4); + -webkit-background-clip: padding-box; + background-clip: padding-box; &:after { content: ""; position: absolute;