Update branding (logos + colours)

app/Composers/ThemeComposer.php

@@ -57,11 +57,11 @@ class ThemeComposer
         $view->withThemeTextColor($this->config->get('setting.style_text_color', '#333333'));
         $view->withThemeReds($this->config->get('setting.style_reds', '#FF6F6F'));
         $view->withThemeBlues($this->config->get('setting.style_blues', '#3498DB'));
-        $view->withThemeGreens($this->config->get('setting.style_greens', '#7ED321'));
+        $view->withThemeGreens($this->config->get('setting.style_greens', '#04C147'));
         $view->withThemeYellows($this->config->get('setting.style_yellows', '#F7CA18'));
-        $view->withThemeOranges($this->config->get('setting.style_oranges', '#FF8800'));
+        $view->withThemeOranges($this->config->get('setting.style_oranges', '#fed7aa'));
         $view->withThemeGreys($this->config->get('setting.style_greys', '#888888'));
-        $view->withThemeMetrics($this->config->get('setting.style_metrics', '#0DCCC0'));
-        $view->withThemeLinks($this->config->get('setting.style_links', '#7ED321'));
+        $view->withThemeMetrics($this->config->get('setting.style_metrics', '#04C147'));
+        $view->withThemeLinks($this->config->get('setting.style_links', '#04C147'));
     }
 }

public/dist/js/app.js.LICENSE.txt

@@ -0,0 +1,63 @@
+/* flatpickr v4.5.7, @license MIT */
+
+/*!
+ * Bootstrap v3.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * Sizzle CSS Selector Engine v2.3.4
+ * https://sizzlejs.com/
+ *
+ * Copyright JS Foundation and other contributors
+ * Released under the MIT license
+ * https://js.foundation/
+ *
+ * Date: 2019-04-08
+ */
+
+/*!
+ * jQuery JavaScript Library v3.4.1
+ * https://jquery.com/
+ *
+ * Includes Sizzle.js
+ * https://sizzlejs.com/
+ *
+ * Copyright JS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2019-05-01T21:04Z
+ */
+
+/*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of the
+    License at http://www.apache.org/licenses/LICENSE-2.0
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */
+
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */

public/dist/js/vendor.js.LICENSE.txt

@@ -0,0 +1,12 @@
+/*!
+ * Chart.js v2.9.4
+ * https://www.chartjs.org
+ * (c) 2020 Chart.js Contributors
+ * Released under the MIT License
+ */
+
+/*!
+ * Vue.js v2.7.15
+ * (c) 2014-2023 Evan You
+ * Released under the MIT License.
+ */

public/mix-manifest.json

@@ -1,7 +1,7 @@
 {
     "/dist/js/app.js": "/dist/js/app.js?id=077e70541c0df5adf687",
-    "/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=7e9267fcdd1150802d64",
-    "/dist/css/app.css": "/dist/css/app.css?id=1de6dbcedf7e30bc18d0",
+    "/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=b6814ae6d4140a3f21a2",
+    "/dist/css/app.css": "/dist/css/app.css?id=12a7a6aec1dbf6049d7d",
     "/dist/js/manifest.js": "/dist/js/manifest.js?id=3c768977c2574a34506e",
     "/dist/js/vendor.js": "/dist/js/vendor.js?id=669b7556d754809958ea",
     "/dist/js/all.js": "/dist/js/all.js?id=fe2ebcf0bbbd7868bf49"

resources/assets/sass/_palette.scss

@@ -3,11 +3,11 @@ $cachet-base-light: #fff;
 $cachet-base-medium: #f0f3f4;
 $cachet-base-dark: #333;
 
-$cachet-primary: #7ED321;
-$cachet-secondary: #6DB81C;
+$cachet-primary: #04C147;
+$cachet-secondary: darken($cachet-primary, 20%);
 
-$cachet-link: #7ed321;
-$cachet-link-hover: #01579b;
+$cachet-link: $cachet-primary;
+$cachet-link-hover: darken($cachet-primary, 40%);
 
 $cachet-gray-light: #e8e8e8;
 $cachet-gray: #999;
@@ -19,10 +19,10 @@ $cachet-icons: #5e5e5e;
 $cachet-green: $cachet-primary;
 $cachet-dark-green: darken($cachet-green, 10%);
 
-$cachet-blue: #3498db;
+$cachet-blue: #BFDBFE;
 $cachet-dark-blue: darken($cachet-blue, 10%);
 
-$cachet-red: #ff6f6f;
+$cachet-red: #fed7aa;
 $cachet-dark-red: darken($cachet-red, 10%);
 
 $cachet-teal: #0dccc0;
@@ -31,11 +31,11 @@ $cachet-dark-teal: darken($cachet-teal, 10%);
 $cachet-yellow: #F7CA18;
 $cachet-dark-yellow: darken($cachet-yellow, 10%);
 
-$cachet-pink: #b23f73;
+$cachet-pink: #d4d4d8;
 $cachet-dark-pink: darken($cachet-pink, 10%);
 
 $cachet-grey: #ecf0f1;
 $cachet-dark-grey: darken($cachet-grey, 10%);
 
-$cachet-orange: #FF8800;
+$cachet-orange: #fed7aa;
 $dark-orange: darken($cachet-orange, 10%);

resources/assets/sass/modules/_alerts.scss

@@ -1,11 +1,11 @@
 .alert {
     border-radius: 4px;
-    background: $cachet_yellow;
-    border: solid 2px $cachet_dark-yellow;
+    background: $cachet-yellow;
+    border: solid 2px $cachet-dark-yellow;
 
     &.alert-success {
-        background-color: $cachet_green;
-        border: solid 2px $cachet_dark-green;
+        background-color: $cachet-green;
+        border: solid 2px $cachet-dark-green;
         color: white;
 
         a {
@@ -15,8 +15,8 @@
     }
 
     &.alert-info {
-        background: $cachet_blue;
-        border: solid 2px $cachet_dark-blue;
+        background: $cachet-blue;
+        border: solid 2px $cachet-dark-blue;
         color: white;
 
         a {
@@ -26,8 +26,8 @@
     }
 
     &.alert-danger {
-        background: $cachet_red;
-        border: solid 2px $cachet_dark-red;
+        background: $cachet-red;
+        border: solid 2px $cachet-dark-red;
         color: white;
 
         a {

resources/assets/sass/modules/_panels.scss

@@ -1,15 +1,15 @@
 .panel-danger {
-  @include panel-variant($cachet_dark-red, white, $cachet-red, $cachet_dark-red);
+  @include panel-variant($cachet-dark-red, white, $cachet-red, $cachet-dark-red);
 }
 
 .panel-success {
-  @include panel-variant($cachet_dark-green, white, $cachet-green, $cachet_dark-green);
+  @include panel-variant($cachet-dark-green, white, $cachet-green, $cachet-dark-green);
 }
 
 .panel-info {
-  @include panel-variant($cachet_dark-blue, white, $cachet-blue, $cachet_dark-blue);
+  @include panel-variant($cachet-dark-blue, white, $cachet-blue, $cachet-dark-blue);
 }
 
 .panel-warning {
-  @include panel-variant($cachet_dark-yellow, $panel-warning-text, $cachet-yellow, $cachet_dark-yellow);
+  @include panel-variant($cachet-dark-yellow, $panel-warning-text, $cachet-yellow, $cachet-dark-yellow);
 }

resources/assets/sass/status-page/_status-page.scss

@@ -49,19 +49,19 @@ body.status-page {
     }
 
     .text-success, .text-component-1 {
-        color: $cachet_green;
+        color: $cachet-green;
     }
 
     .text-info, .text-component-2 {
-        color: $cachet_blue;
+        color: $cachet-blue;
     }
 
     .text-alert, .text-component-3 {
-        color: $cachet_yellow;
+        color: $cachet-yellow;
     }
 
     .text-danger, .text-component-4 {
-        color: $cachet_red;
+        color: $cachet-red;
     }
 
     .container {
@@ -173,19 +173,19 @@ body.status-page {
                     }
                 }
                 &.status-0 {
-                    color: $cachet_pink;
+                    color: $cachet-pink;
                 }
                 &.status-1 {
-                    color: $cachet_orange;
+                    color: $cachet-orange;
                 }
                 &.status-2 {
-                    color: $cachet_yellow;
+                    color: $cachet-yellow;
                 }
                 &.status-3 {
-                    color: $cachet_blue;
+                    color: $cachet-blue;
                 }
                 &.status-4 {
-                    color: $cachet_green;
+                    color: $cachet-green;
                 }
             }
             &.last:before {
@@ -260,7 +260,7 @@ body.status-page {
         .list-group-item {
             border-radius: 0;
             background-color: #ffffff;
-            border: 1px solid $cachet_gray_light;
+            border: 1px solid $cachet-gray_light;
             font-size: 1.1em;
             padding: 15px 15px;
 
@@ -293,7 +293,7 @@ body.status-page {
             }
 
             &.group-name {
-                background-color: $cachet_gray_light;
+                background-color: $cachet-gray_light;
                 padding: {
                     top: 0.6em;
                     bottom: 0.6em;
@@ -315,7 +315,7 @@ body.status-page {
 
         &.components {
             @extend .panel;
-            border-color: $cachet_gray_light;
+            border-color: $cachet-gray_light;
 
             &:last-child {
                 margin-bottom: 30px;
@@ -345,7 +345,7 @@ body.status-page {
         bottom: 0;
         height: 60px;
         padding: 30px 0 60px 0;
-        border-top: 1px solid $cachet_gray_light;
+        border-top: 1px solid $cachet-gray_light;
         color: $cachet-gray-darker;
         font-size: 13px;
         line-height: 30px;
@@ -364,7 +364,7 @@ body.status-page {
                 border-radius: 3px;
                 background-color: $cachet-gray-darker;
                 text-align: center;
-                color: $cachet_gray_light;
+                color: $cachet-gray_light;
                 transition: all 0.15s;
                 padding: 0 10px 0 10px;
 

resources/views/auth/login.blade.php

@@ -7,7 +7,7 @@
     <div class="row">
         <div class="form-bg">
             <div class="logo">
-                <img src="{{ asset('/img/cachet-logo@2x.png') }}" class="img-responsive">
+                <img src="{{ asset('/img/cachet-logo.svg') }}" class="img-responsive">
             </div>
 
             <form method="POST" action="{{ cachet_route('auth.login', [], 'post') }}" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">

resources/views/auth/two-factor-auth.blade.php

@@ -7,7 +7,7 @@
         <div class="row">
             <div class="form-bg">
                 <div class="logo">
-                    <img src="{{ asset('/img/cachet-logo@2x.png') }}" class="img-responsive">
+                    <img src="{{ asset('/img/cachet-logo.svg') }}" class="img-responsive">
                 </div>
 
                 <br>

resources/views/dashboard/partials/sidebar.blade.php

@@ -7,7 +7,7 @@
         </div>
         <div class="clearfix"></div>
         <div class="quick-add-incident">
-            <a class="btn btn-block btn-info" href="{{ cachet_route('dashboard.incidents.create') }}">
+            <a class="btn btn-block btn-success" href="{{ cachet_route('dashboard.incidents.create') }}">
                 <i class="ion ion-android-checkmark-circle visible-sm"></i>
                 <span class="hidden-sm">{{ trans('dashboard.incidents.add.title') }}</span>
             </a>

resources/views/layout/clean.blade.php

@@ -10,7 +10,7 @@
     <meta name="token" content="{{ csrf_token() }}">
 
     <link rel="icon" type="image/png" href="{{ asset('/img/favicon.ico') }}">
-    <link rel="shortcut icon" href="{{ asset('/img/favicon.png') }}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ asset('/img/apple-touch-icon.png') }}" type="image/x-icon">
 
     <link rel="apple-touch-icon" href="{{ asset('/img/apple-touch-icon.png') }}">
     <link rel="apple-touch-icon" sizes="57x57" href="{{ asset('/img/apple-touch-icon-57x57.png') }}">

resources/views/layout/dashboard.blade.php

@@ -10,7 +10,7 @@
     <meta name="token" content="{{ csrf_token() }}">
 
     <link rel="icon" type="image/png" href="{{ asset('/img/favicon.ico') }}">
-    <link rel="shortcut icon" href="{{ asset('/img/favicon.png') }}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ asset('/img/apple-touch-icon.png') }}" type="image/x-icon">
 
     <link rel="apple-touch-icon" href="{{ asset('/img/apple-touch-icon.png') }}">
     <link rel="apple-touch-icon" sizes="57x57" href="{{ asset('/img/apple-touch-icon-57x57.png') }}">

resources/views/layout/master.blade.php

@@ -16,14 +16,14 @@
 
     <meta property="og:type" content="website">
     <meta property="og:title" content="@yield('title', $siteTitle)">
-    <meta property="og:image" content=" {{ asset('/img/favicon.png') }}">
+    <meta property="og:image" content=" {{ asset('/img/apple-touch-icon.png') }}">
     <meta property="og:description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $appName]))">
 
     <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
     <meta http-equiv="cleartype" content="on">
 
     <meta name="msapplication-TileColor" content="{{ $themeGreens }}" />
-    <meta name="msapplication-TileImage" content="{{ asset('/img/favicon.png') }}" />
+    <meta name="msapplication-TileImage" content="{{ asset('/img/apple-touch-icon.png') }}" />
 
     <link href="{{ Request::fullUrl() }}" rel="canonical">
 
@@ -32,7 +32,7 @@
     <link rel="shortcut icon" href="{{ asset("/img/{$favicon}.png") }}" type="image/png">
     @else
     <link rel="icon" href="{{ asset('/img/favicon.ico') }}" type="image/x-icon">
-    <link rel="shortcut icon" href="{{ asset('/img/favicon.png') }}" type="image/png">
+    <link rel="shortcut icon" href="{{ asset('/img/apple-touch-icon.png') }}" type="image/png">
     @endif
 
     <link rel="apple-touch-icon" href="{{ asset('/img/apple-touch-icon.png') }}">