Merge branch 'main' into separateNonFeaturedArticlesOnQuadrantView

# Conflicts:
#	.lintstagedrc
#	dist_scripts/src/model.js
#	src/animation.ts
#	src/components/Item/Item.tsx
#	src/components/ItemList/ItemList.tsx
#	src/components/PageItem/PageItem.tsx
#	src/index.scss
#	src/model.js
#	src/model.ts
This commit is contained in:
dennis.ludwig
2021-06-17 14:37:01 +02:00
58 changed files with 4758 additions and 480 deletions

View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useMemo } from "react";
import React from "react";
import Badge from "../Badge/Badge";
import ItemList from "../ItemList/ItemList";
import Link from "../Link/Link";

View File

@@ -61,6 +61,6 @@
min-height: 300px;
&__aside {
padding: 20px 0
padding: 20px 0;
}
}
}

View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useMemo } from "react";
import { useEffect, useState, useMemo } from "react";
import {
Animation,
AnimationConfig as AbstractAnimationConfig,