mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-25 04:46:40 +07:00
some header fixes
This commit is contained in:
parent
7ae8205e27
commit
72c096daca
9 changed files with 53 additions and 38 deletions
|
@ -3,7 +3,9 @@ import { Logo } from "~/components/main/Logo";
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { IUserProfile, IUserState } from "~/redux/user/reducer";
|
import { IUserProfile, IUserState } from "~/redux/user/reducer";
|
||||||
|
|
||||||
const style = require('./style.scss');
|
import * as style from './style.scss';
|
||||||
|
import {Filler} from "~/components/containers/Filler";
|
||||||
|
import {Group} from "~/components/containers/Group";
|
||||||
|
|
||||||
interface IHeaderProps {
|
interface IHeaderProps {
|
||||||
username?: IUserProfile['username'],
|
username?: IUserProfile['username'],
|
||||||
|
@ -14,20 +16,21 @@ export const Component: React.FunctionComponent<IHeaderProps> = ({ username, is_
|
||||||
<div className="default_container head_container">
|
<div className="default_container head_container">
|
||||||
<div className={style.container}>
|
<div className={style.container}>
|
||||||
<Logo />
|
<Logo />
|
||||||
<div className={style.spacer} />
|
|
||||||
{
|
<Filler />
|
||||||
is_user && username &&
|
|
||||||
<div className={style.user_button}>
|
|
||||||
<div className={style.user_avatar} />
|
|
||||||
{username}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
<div className={style.plugs}>
|
<div className={style.plugs}>
|
||||||
<div>depth</div>
|
<div>depth</div>
|
||||||
<div>boris</div>
|
<div>boris</div>
|
||||||
<div>flow</div>
|
<div>flow</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<Filler />
|
||||||
|
|
||||||
|
<Group horizontal className={style.user_button}>
|
||||||
|
<div>username</div>
|
||||||
|
<div className={style.user_avatar} />
|
||||||
|
</Group>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
//padding: $gap 0;
|
height: 96px;
|
||||||
height: 100px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,21 +14,30 @@
|
||||||
.plugs {
|
.plugs {
|
||||||
display: flex;
|
display: flex;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
font: $font_16_medium;
|
||||||
|
text-transform: uppercase;
|
||||||
|
|
||||||
> div {
|
> div {
|
||||||
//margin: 8px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: $gap;
|
padding: $gap;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.25s;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: $red;
|
||||||
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
content: ' ';
|
content: ' ';
|
||||||
margin-left: $spc;
|
margin-left: $spc;
|
||||||
background: white;
|
background: white;
|
||||||
width: 2px;
|
width: 4px;
|
||||||
height: $gap;
|
height: $gap;
|
||||||
display: block;
|
display: block;
|
||||||
|
opacity: 0.2;
|
||||||
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:first-child {
|
&:first-child {
|
||||||
|
@ -52,19 +60,16 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.user_button {
|
.user_button {
|
||||||
padding: 0 $gap;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
background: white;
|
|
||||||
color: $main_bg_color;
|
|
||||||
height: 20px;
|
|
||||||
border-radius: $input_radius;
|
border-radius: $input_radius;
|
||||||
font-size: $text_small;
|
font: $font_16_medium;
|
||||||
|
text-transform: uppercase;
|
||||||
|
flex: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.user_avatar {
|
.user_avatar {
|
||||||
//width: 16px;
|
width: 20px;
|
||||||
//height: 16px;
|
height: 20px;
|
||||||
//background: transparentize(white, 0.5);
|
background: white;
|
||||||
//margin-right: $gap;
|
border-radius: $radius;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
const style = require('./style.scss');
|
import * as styles from './style.scss';
|
||||||
|
|
||||||
export const Logo = () => (
|
export const Logo = () => (
|
||||||
<div className={style.logo}>
|
<div className={styles.logo}>
|
||||||
VAULT
|
VAULT
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
.logo {
|
.logo {
|
||||||
font-size: $text_sign;
|
// font-family: Raleway;
|
||||||
font-weight: 800;
|
//font-size: $text_sign;
|
||||||
|
//font-weight: 800;
|
||||||
|
font: $font_24_bold;
|
||||||
|
//font-family: Raleway;
|
||||||
display: flex;
|
display: flex;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ const Comment: FC<IProps> = ({
|
||||||
}) => (
|
}) => (
|
||||||
<Card
|
<Card
|
||||||
className={classNames(styles.wrap, className, { is_empty, is_loading })}
|
className={classNames(styles.wrap, className, { is_empty, is_loading })}
|
||||||
|
seamless
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
<div className={styles.thumb}>
|
<div className={styles.thumb}>
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { SidePane } from "~/components/main/SidePane";
|
import { SidePane } from "~/components/main/SidePane";
|
||||||
import * as styles from './styles.scss';
|
import * as styles from './styles.scss';
|
||||||
|
import { Header } from "~/components/main/Header";
|
||||||
|
|
||||||
export const MainLayout = ({ children }) => {
|
export const MainLayout = ({ children }) => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.wrapper}>
|
<div className={styles.wrapper}>
|
||||||
|
<Header />
|
||||||
|
|
||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<SidePane />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,14 +1,19 @@
|
||||||
.wrapper {
|
.wrapper {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: $gap $gap $gap 74px;
|
// padding: $gap $gap $gap 74px;
|
||||||
|
padding: 0 $gap;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-start;
|
//align-items: flex-start;
|
||||||
justify-content: center;
|
//justify-content: center;
|
||||||
flex-direction: row;
|
flex-direction: column;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
flex: 0 1 $content_width;
|
// flex: 0 1 $content_width;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
max-width: $content_width;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,11 +12,7 @@ $blue_gradient: linear-gradient(170deg, $green, $dark_blue);
|
||||||
$green_gradient: linear-gradient(170deg, $olive -20%, $grass 120%);
|
$green_gradient: linear-gradient(170deg, $olive -20%, $grass 120%);
|
||||||
$purple_gradient: linear-gradient(170deg, $red, $dark_blue);
|
$purple_gradient: linear-gradient(170deg, $red, $dark_blue);
|
||||||
$cyan_gradient: linear-gradient(260deg, #3c75ff -50%, #7b2653 150%);
|
$cyan_gradient: linear-gradient(260deg, #3c75ff -50%, #7b2653 150%);
|
||||||
//$color_yellow: complement($color_red);
|
|
||||||
//$color_yellow: yellow;
|
|
||||||
|
|
||||||
//$main_bg_color: #161616;
|
|
||||||
//main_bg_color: #111214;
|
|
||||||
$main_bg_color: #2b2c34;
|
$main_bg_color: #2b2c34;
|
||||||
$main_text_color: white;
|
$main_text_color: white;
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
:global(.default_container) {
|
:global(.default_container) {
|
||||||
|
width: 100%;
|
||||||
max-width: $content_width;
|
max-width: $content_width;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue