Merge branch 'feature/58149_colorchange' into develop

Resources/Private/Build/JavaScript/Backend/Diagram.js

@@ -45,16 +45,17 @@ define(['jquery', 'TYPO3/CMS/Lux/Vendor/Chart.min'], function($) {
  datasets: [{
  data: element.getAttribute('data-chart-data').split(','),
  backgroundColor: [
- 'rgba(77, 231, 255, 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(2, 122, 202, 1)',
+ 'rgba(242, 182, 2, 1)',
+ 'rgba(209, 35, 53, 1)',
+ 'rgba(73, 159, 104, 1)',
+ 'rgba(18, 38, 58, 1)',
+ 'rgba(242, 182, 2, 0.6)',
+ 'rgba(209, 35, 53, 0.6)',
+ 'rgba(73, 159, 104, 0.6)',
+ 'rgba(242, 182, 2, 0.3)',
+ 'rgba(209, 35, 53, 0.3)',
+ 'rgba(73, 159, 104, 0.3)',
  ]
  }],
  labels: element.getAttribute('data-chart-labels').split(',')
@@ -82,7 +83,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(2, 122, 202, 1)',
  'rgba(221, 221, 221, 1)'
  ]
  }],
@@ -119,8 +120,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(2, 122, 202, 1)',
+ 'rgba(2, 122, 202, 1)'
  ]
  },
  {
@@ -167,15 +168,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(2, 122, 202, 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: '#F2B602'
  });
  }
  }

Resources/Private/Partials/Box/Leads/Map.html

@@ -3,7 +3,7 @@
  <f:for each="{lux:charts.getPercentageFromValue(countries:countries)}" key="countryCode" as="visitPercentage">
  #{countryCode} {
  <f:comment>Hey Fluid, listen to the following variable</f:comment>
- fill: rgba(77, 231, 255, 1);
+ fill: rgba(2, 122, 202, 1);
  filter: saturate({visitPercentage}%);
  }
  </f:for>

Resources/Private/Sass/Modules.scss

@@ -276,6 +276,10 @@ label {
  */
  .table {
  border: 1px solid $colorGreyBright;
+
+ .soft {
+ color: $colorGreySoft;
+ }
  }
 
  .table.min-height-50 {
@@ -290,6 +294,10 @@ label {
 
  > td {
  color: $white;
+
+ .soft {
+ color: $colorGreyBright;
+ }
  }
  }
 

Resources/Private/Sass/_Settings.scss

@@ -1,12 +1,13 @@
-$colorMain: #4DE7FF;
-$colorSoft: #A5E7FF;
-$colorAlternative: #08E7FF;
+$colorMain: #027ACA;
+$colorSoft: #7cc6fe;
+$colorAlternative: #027ACA;
 
-$colorSecondary: #FFE933;
+$colorSecondary: #F2B602;
 
 $white: #ffffff;
 $colorGrey: #DDDDDD;
 $colorGreyBright: #CCCCCC;
+$colorGreySoft: #737373;
 $colorGreyDark: #292929;
 $black: #000000;