OSDN Git Service

merge dashboard into electron
authorZhiting Lin <zlin035@uottawa.ca>
Wed, 17 Apr 2019 06:01:03 +0000 (14:01 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Wed, 17 Apr 2019 06:01:03 +0000 (14:01 +0800)
1  2 
src/features/configuration/components/Index/Index.jsx
src/features/core/reducers.js
static/styles/resources.scss

Simple merge
@@@ -24,15 -24,14 +24,15 @@@ $text-inverse-color: #ffffff
  $text-strong-color: #20252d;
  $text-table-value-color: #747c89;
  $text-table-label-color: #9ea8b6;
- $text-danger: #d44c4c;
+ $text-danger: #DD2C2C;
  
- $highlight-default: #00bfaa;
- $highlight-secondary: #00D9C2;
- $highlight-danger: #be4343;
+ $highlight-default: #1977d6;
+ $highlight-secondary: #3295de;
+ $highlight-danger: #d02828;
  $highlight-danger-background: #f8cece;
  $highlight-danger-border: #f3aaaa;
- $highlight-tutorial: #69A7E4;
+ $highlight-tutorial: #6EA9FC;
 +$highlight-label: #fcffab;
  
  $success-background: #dff0d3;
  $success-border: #cbe6b7;