Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Update branding (logos + colours) #4374

Open
wants to merge 1 commit into
base: 2.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/Composers/ThemeComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ public function compose(View $view)
$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'));
}
}
2 changes: 1 addition & 1 deletion public/dist/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/dist/css/dashboard/dashboard.css

Large diffs are not rendered by default.

63 changes: 63 additions & 0 deletions public/dist/js/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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
*/
12 changes: 12 additions & 0 deletions public/dist/js/vendor.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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.
*/
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/img/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-114x114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/apple-touch-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/button-email--dark-grey.png
Binary file not shown.
Binary file removed public/img/cachet-icon.png
Binary file not shown.
Binary file removed public/img/cachet-logo.png
Binary file not shown.
10 changes: 9 additions & 1 deletion public/img/cachet-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/[email protected]
Binary file not shown.
Binary file added public/img/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/favicon.ico
Binary file not shown.
Binary file removed public/img/favicon.png
Binary file not shown.
4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
16 changes: 8 additions & 8 deletions resources/assets/sass/_palette.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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%);
16 changes: 8 additions & 8 deletions resources/assets/sass/modules/_alerts.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions resources/assets/sass/modules/_panels.scss
Original file line number Diff line number Diff line change
@@ -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);
}
Loading