Merge branch 'development-project-configurator' of github.com:EyeSeeT…

…ea/dataset-configuration into feature/setup-screen

package.json

@@ -18,7 +18,6 @@
         "@dhis2/ui": "6.12.0",
         "@eyeseetea/d2-api": "1.16.0-beta.9",
         "@eyeseetea/d2-ui-components": "2.9.0-beta.3",
-        "@eyeseetea/feedback-component": "0.1.3-beta.1",
         "@material-ui/core": "4.12.4",
         "@material-ui/icons": "4.11.3",
         "@material-ui/lab": "4.0.0-alpha.60",

src/app-config.ts

@@ -1,30 +1,9 @@
-import { FeedbackOptions } from "@eyeseetea/feedback-component";
-
 export const appConfig: AppConfig = {
     id: "d2-dataset-configuration",
-    appearance: {
-        showShareButton: true,
-    },
-    feedback: {
-        repositories: {
-            clickUp: {
-                // https://app.clickup.com/${workspace}/v/b/N-${listId}-M
-                // Web development -> Common resources -> app-skeleton
-                listId: "42597084",
-                title: "[User feedback] {title}",
-                body: "## dhis2\n\nUsername: {username}\n\n{body}",
-            },
-        },
-        layoutOptions: {
-            buttonPosition: "bottom-start",
-        },
-    },
+    appearance: { showShareButton: true },
 };
 
 export interface AppConfig {
     id: string;
-    appearance: {
-        showShareButton: boolean;
-    };
-    feedback?: FeedbackOptions;
+    appearance: { showShareButton: boolean };
 }

src/webapp/pages/app/themes/dhis2.theme.ts

@@ -4,8 +4,8 @@ import { createTheme } from "@material-ui/core/styles";
 const colors = {
     accentPrimary: "#fd5a00",
     accentPrimaryDark: "#d14b00",
-    accentPrimaryLight: "#63A4FF",
-    accentPrimaryLightest: "#EAF4FF",
+    accentPrimaryLight: "#ff9b63",
+    accentPrimaryLightest: "#fff2ea",
 
     accentSecondary: "#fb8c00",
     accentSecondaryLight: "#f57c00",
@@ -21,7 +21,7 @@ const colors = {
     white: "#FFFFFF", // Not included in palette!
 
     negative: "#E53935",
-    warning: "#F19C02",
+    warning: "#f1c902",
     positive: "#3D9305",
     info: "#EAF4FF",
 };