Skip to content

Commit

Permalink
[FEATURE] First test of alternative colors
Browse files Browse the repository at this point in the history
  • Loading branch information
einpraegsam committed Aug 9, 2023
1 parent 83c9f44 commit 02b9525
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
28 changes: 14 additions & 14 deletions Resources/Private/Build/JavaScript/Backend/Diagram.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ define(['jquery', 'TYPO3/CMS/Lux/Vendor/Chart.min'], function($) {
datasets: [{
data: element.getAttribute('data-chart-data').split(','),
backgroundColor: [
'rgba(77, 231, 255, 1)',
'rgba(0, 124, 143, 1)',
'rgba(221, 221, 221, 1)',
'rgba(255, 233, 51, 1)',
'rgba(77, 231, 255, 0.6)',
'rgba(255, 233, 51, 0.6)',
'rgba(77, 231, 255, 0.4)',
'rgba(255, 233, 51, 0.4)',
'rgba(77, 231, 255, 0.2)',
'rgba(255, 233, 51, 0.2)',
'rgba(77, 231, 255, 0.1)'
'rgba(231, 156, 60, 1)',
'rgba(0, 124, 143, 0.6)',
'rgba(231, 156, 60, 0.6)',
'rgba(0, 124, 143, 0.4)',
'rgba(231, 156, 60, 0.4)',
'rgba(0, 124, 143, 0.2)',
'rgba(231, 156, 60, 0.2)',
'rgba(0, 124, 143, 0.1)'
]
}],
labels: element.getAttribute('data-chart-labels').split(',')
Expand Down Expand Up @@ -82,7 +82,7 @@ define(['jquery', 'TYPO3/CMS/Lux/Vendor/Chart.min'], function($) {
label: element.getAttribute('data-chart-label') || 'Leads',
data: element.getAttribute('data-chart-data').split(','),
backgroundColor: [
'rgba(77, 231, 255, 1)',
'rgba(0, 124, 143, 1)',
'rgba(221, 221, 221, 1)'
]
}],
Expand Down Expand Up @@ -119,8 +119,8 @@ define(['jquery', 'TYPO3/CMS/Lux/Vendor/Chart.min'], function($) {
label: element.getAttribute('data-chart-labelbottom'),
data: element.getAttribute('data-chart-databottom').split(','),
backgroundColor: [
'rgba(77, 231, 255, 1)',
'rgba(77, 231, 255, 1)'
'rgba(0, 124, 143, 1)',
'rgba(0, 124, 143, 1)'
]
},
{
Expand Down Expand Up @@ -167,15 +167,15 @@ define(['jquery', 'TYPO3/CMS/Lux/Vendor/Chart.min'], function($) {
var datasets = [{
label: element.getAttribute('data-chart-label'),
data: element.getAttribute('data-chart-data').split(','),
borderColor: 'rgb(77, 231, 255)',
borderColor: 'rgba(0, 124, 143, 1)',
"lineTension": 0.5
}];
for (var i = 2; i < 7; i++) {
if (element.hasAttribute('data-chart-data' + i) && element.hasAttribute('data-chart-label' + i)) {
datasets.push({
label: element.getAttribute('data-chart-label' + i),
data: element.getAttribute('data-chart-data' + i).split(','),
borderColor: '#FFE933'
borderColor: '#e79c3c'
});
}
}
Expand Down
6 changes: 3 additions & 3 deletions Resources/Private/Sass/_Settings.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$colorMain: #4DE7FF;
$colorMain: #007C8F;
$colorSoft: #A5E7FF;
$colorAlternative: #08E7FF;
$colorAlternative: #004B57;

$colorSecondary: #FFE933;
$colorSecondary: #e79c3c;

$white: #ffffff;
$colorGrey: #DDDDDD;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Css/Modules.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Public/Css/PageOverview.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Resources/Public/Icons/Extension.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Public/Icons/lux_module_analysis.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Resources/Public/Icons/lux_module_lead.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Public/Icons/lux_module_workflow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Public/JavaScript/Lux/Diagram.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 02b9525

Please sign in to comment.