muerwre/vault-frontend
1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-24 20:36:40 +07:00
Code Packages Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	src/layouts/LabLayout/index.tsx
This commit is contained in:
Fedor Katurov 2021-03-26 12:40:13 +07:00
commit 4b542e0291
4 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/lab/LabText/styles.module.scss
View file

@ -2,6 +2,7 @@
.wrap {
padding: 0 $gap;
line-height: 1.3em;
@include tablet {
position: relative;

3
src/containers/main/Container/styles.module.scss
View file

@ -3,8 +3,7 @@
.container {
width: 100%;
max-width: $content_width;
margin: auto;
padding: 0 $gap;
box-sizing: border-box;
@include tablet {
padding: 0;

1
src/containers/main/MainLayout/styles.module.scss
View file

@ -17,4 +17,5 @@
display: flex;
padding-bottom: 29px;
flex-direction: column;
align-items: center;
}

8
src/layouts/LabLayout/index.tsx
View file

@ -1,21 +1,15 @@
import React, { FC, useEffect } from 'react';
import styles from './styles.module.scss';
import { Card } from '~/components/containers/Card';
import { Sticky } from '~/components/containers/Sticky';
import { Container } from '~/containers/main/Container';
import { LabGrid } from '~/containers/lab/LabGrid';
import { useDispatch } from 'react-redux';
import { labGetList, labGetStats } from '~/redux/lab/actions';
import { Placeholder } from '~/components/placeholders/Placeholder';
import { Grid } from '~/components/containers/Grid';
import { Group } from '~/components/containers/Group';
import { LabHero } from '~/components/lab/LabHero';
import { LabBanner } from '~/components/lab/LabBanner';
import { LabHead } from '~/components/lab/LabHead';
import { Filler } from '~/components/containers/Filler';
import { LabStats } from '~/containers/lab/LabStats';
import { useShallowSelect } from '~/utils/hooks/useShallowSelect';
import { selectLabList, selectLabListNodes, selectLabStatsLoading } from '~/redux/lab/selectors';
import { selectLabList } from '~/redux/lab/selectors';
import { SidebarRouter } from '~/containers/main/SidebarRouter';
interface IProps {}