Fix rebase of develop into branch

- include fix of filterin colors in dark mode
Amsterdam · Dec 11, 2024 · fe77cd8 · fe77cd8
1 parent e46427d
commit fe77cd8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 47 deletions.
diff --git a/src/components/HomepageFeatures/index.tsx b/src/components/HomepageFeatures/index.tsx
@@ -33,57 +33,39 @@ const featureList: FeatureItem[] = [
     description:
       'Include documentation in your project that facilitates understanding, usage, and maintenance of your code.',
   },
-  {
-    title: 'Code Reviews (Not yet formatted to meet the required standard.)',
-    to: '/docs/general/code-review',
-    description: 'Code reviews are required before merging to main',
-  },
   {
     image: SourceControlIcon,
     title: 'Storing source code',
     to: '/docs/general/storing-source-code',
     description: 'We use Git to store our source code. ',
   },
-<<<<<<< HEAD
-  // {
-  //   title: 'Testing (Not yet formatted to meet the required standard.)',
-  //   to: '/docs/general/testing',
-  //   description: 'A summation of libraries used by the developers of the city of Amsterdam',
-  // },
-=======
   {
-    title: 'Testing (Not yet formatted to meet the required standard.)',
+    image: TestingIcon,
+    title: 'Testing',
     to: '/docs/general/testing',
     description: 'A summation of libraries used by the developers of the city of Amsterdam',
   },
-  {
-    title: 'Third party dependencies (Not yet formatted to meet the required standard.)',
-    to: '/docs/general/third-party-dependencies',
-    description: 'A guideline on how to choose',
-  },
->>>>>>> a05c0ea (WIP can not get the image right)
   {
     image: GitHubIcon,
     title: 'Using Git',
     to: '/docs/general/using-git',
     description: 'Our policy how to use Git',
   },
   {
-<<<<<<< HEAD
+    image: ThirdPartyIcon,
     title: 'Third party dependencies in general',
     to: '/docs/general/third-party-dependencies',
     description: 'A guideline on how to choose',
   },
   {
+    image: ThirdPartyIcon,
     title: 'Frontend - Third party dependencies',
     to: '/docs/frontend/third-party-dependencies',
     description:
       ' A list of recommended packages and set guidelines for choosing a package which is not on the list.',
   },
   {
-=======
     image: ReactIcon,
->>>>>>> 2e6a3c0 (invert githubicon in dark mode and change colors of other icons)
     title: 'Frontend - Languages and Frameworks (Not yet formatted to meet the required standard.)',
     to: '/docs/frontend/languages-and-frameworks',
     description:
@@ -96,22 +78,6 @@ const featureList: FeatureItem[] = [
     description:
       'A list of components that our being used by the developers of the city of Amsterdam',
   },
-  {
-<<<<<<< HEAD
-=======
-    image: ThirdPartyIcon,
-    title: 'Frontend - Third party dependencies (Not yet formatted to meet the required standard.)',
-    to: '/docs/frontend/third-party-dependencies',
-    description:
-      ' A list of recommended packages and set guidelines for choosing a package which is not on the list.',
-  },
-  {
-    image: TestingIcon,
->>>>>>> 2e6a3c0 (invert githubicon in dark mode and change colors of other icons)
-    title: 'Frontend - Testing (Not yet formatted to meet the required standard.)',
-    to: '/docs/frontend/testing',
-    description: 'A guideline to testing for frontenders.',
-  },
 ];
 
 export default function HomepageFeatures(): JSX.Element {
@@ -125,7 +91,8 @@ export default function HomepageFeatures(): JSX.Element {
                 width: 62,
                 height: 62,
                 preserveAspectRatio: 'xMinYMin',
-                className: listItem.title === 'Using Git' ? 'dark-mode-github-icon' : '',
+                className:
+                  listItem.title === 'Using Git' ? 'dark-mode-github-icon' : 'ams-card__image',
               })}
             <Heading size="level-4">
               {listItem.title}

diff --git a/src/css/ams-overrides.css b/src/css/ams-overrides.css
@@ -53,22 +53,22 @@
 
 [data-theme='dark'] .ams-page-menu__link,
 
-[data-theme='dark'] .ams-image {
+[data-theme='dark'] .ams-card__image {
   filter: invert(1) hue-rotate(180deg) brightness(1.2);
 }
 
-[data-theme='dark'] .dark-mode-github-icon {
-  filter: invert(1) brightness(1.2);
-}
-
 [data-theme='dark'] .ams-page-menu__link:hover {
   color: var(--ifm-link-color);
 }
 
-<<<<<<< HEAD
 [data-theme='dark'] .ams-breadcrumb__item:not(:last-child):after {
   filter: invert(1);
-=======
+}
+
+[data-theme='dark'] .dark-mode-github-icon {
+  filter: invert(1) brightness(1.2);
+}
+
 [data-theme='dark'] .intro-link {
   background-color: #FFFFFF;
   text-decoration: none !important;
@@ -78,5 +78,4 @@
 
 [data-theme='dark'] .intro-link:hover {
   background-color: #E8E8E8;
->>>>>>> 15b786f (Fix link and distance to footer)
 }