diff --git a/src/App.module.css b/src/App.module.css deleted file mode 100644 index a824cffd..00000000 --- a/src/App.module.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: 1rem; -} diff --git a/src/app/layout/Layout.module.css b/src/app/layout/Layout.module.css index ab1bf25a..cef2ebba 100644 --- a/src/app/layout/Layout.module.css +++ b/src/app/layout/Layout.module.css @@ -1,8 +1,13 @@ @value m-medium: (min-width: 768px); +:global a { + color: initial; + text-decoration: none; +} + .wrapper { display: grid; - grid-template-areas: 'sidebar' 'main'; + grid-template-areas: "sidebar" "main"; line-height: 20px; font-size: 14px; height: 100%; @@ -33,15 +38,13 @@ display: grid; grid-template-columns: auto 1fr; grid-template-rows: none; - grid-template-areas: - 'sidebar main'; + grid-template-areas: "sidebar main"; } .sidebar { width: 240px; overflow: auto; } .main { - overflow-y:auto + overflow-y: auto; } } - diff --git a/src/pages/overview/card/SummaryCard.module.css b/src/pages/overview/card/SummaryCard.module.css index 34373643..0ed40122 100644 --- a/src/pages/overview/card/SummaryCard.module.css +++ b/src/pages/overview/card/SummaryCard.module.css @@ -1,4 +1,3 @@ - .cardGroup { display: grid; grid-template-columns: repeat(auto-fill, 320px); @@ -24,6 +23,9 @@ width: 32px; height: 32px; } +.cardIcon.active { + color: "blue"; +} .cardHeader { padding: 12px 0px; @@ -49,4 +51,4 @@ .cardActions a { text-decoration: none; -} \ No newline at end of file +} diff --git a/src/pages/overview/card/SummaryCard.tsx b/src/pages/overview/card/SummaryCard.tsx index b3c46815..7d13f454 100644 --- a/src/pages/overview/card/SummaryCard.tsx +++ b/src/pages/overview/card/SummaryCard.tsx @@ -2,7 +2,7 @@ import i18n from "@dhis2/d2-i18n"; import { Card, Button } from "@dhis2/ui"; import { IconEdit24 } from "@dhis2/ui-icons"; import React from "react"; -import { Link, resolvePath } from "react-router-dom"; +import { Link } from "react-router-dom"; import { getSectionNewPath, getSectionPath, @@ -45,12 +45,14 @@ export const SummaryCard = ({ const title = section.title; return ( -
-
{icon}
- {title} - {children} - -
+ +
+
{icon}
+ {title} + {children} + +
+
); }; @@ -64,21 +66,17 @@ interface SummaryCardActionsProps { } export const SummaryCardActions = ({ section }: SummaryCardActionsProps) => { - // paths are relative by default, use resolvePath to resolve from root - const managePath = resolvePath(getSectionPath(section)); - const newModelPath = resolvePath(getSectionNewPath(section)); - // categoryOptionCombo is the only section that should not be creatable // TODO: implement auth and move this there const canCreate = section.name !== SECTIONS_MAP.categoryOptionCombo.name; return (
{canCreate && ( - + )} - +