mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-25 12:56:41 +07:00
Merge branch 'master' into 15-use-cra-or-nextjs
# Conflicts: # src/components/node/CommentForm/index.tsx # src/utils/node.ts
This commit is contained in:
commit
332d09e3bd
46 changed files with 936 additions and 487 deletions
|
@ -25,6 +25,7 @@ const Component: FC<IProps> = ({ modal: { is_shown } }) => {
|
|||
<div>
|
||||
<BlurWrapper is_blurred={is_shown}>
|
||||
<PageCover />
|
||||
|
||||
<MainLayout>
|
||||
<Modal />
|
||||
<Sprites />
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
import React, { FC, useEffect, useState } from 'react';
|
||||
import { useRouteMatch, withRouter, RouteComponentProps } from 'react-router';
|
||||
import { RouteComponentProps, useRouteMatch, withRouter } from 'react-router';
|
||||
import styles from './styles.module.scss';
|
||||
import { NodeNoComments } from '~/components/node/NodeNoComments';
|
||||
import { Grid } from '~/components/containers/Grid';
|
||||
import { CommentForm } from '~/components/node/CommentForm';
|
||||
import { ProfileInfo } from '../ProfileInfo';
|
||||
import { CommentForm } from '~/components/comment/CommentForm';
|
||||
import * as NODE_ACTIONS from '~/redux/node/actions';
|
||||
import { connect } from 'react-redux';
|
||||
import { IUser } from '~/redux/auth/types';
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(255, 0, 0, 0.3);
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
z-index: 26;
|
||||
|
@ -23,11 +22,7 @@
|
|||
overflow: hidden;
|
||||
animation: appear 0.25s forwards;
|
||||
|
||||
@include can_backdrop {
|
||||
background: transparentize($content_bg, 0.15);
|
||||
-webkit-backdrop-filter: blur(15px);
|
||||
backdrop-filter: blur(15px);
|
||||
}
|
||||
@include sidebar
|
||||
}
|
||||
|
||||
.content {
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
@import "src/styles/variables";
|
||||
|
||||
.wrap {
|
||||
@include outer_shadow;
|
||||
|
||||
height: 100%;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
flex: 0 1 400px;
|
||||
max-width: 100vw;
|
||||
position: relative;
|
||||
|
||||
@include sidebar_content;
|
||||
}
|
||||
|
||||
.content {
|
||||
background: $content_bg;
|
||||
border-radius: $radius;
|
||||
height: 100%;
|
||||
box-sizing: border-box;
|
||||
overflow: auto;
|
||||
|
@ -28,7 +28,7 @@
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: $gap;
|
||||
background: lighten($content_bg, 2%);
|
||||
box-shadow: transparentize(white, 0.95) 0 1px;
|
||||
}
|
||||
|
||||
.tag {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue