From 85ee879c2f0545fbdfca91ec05cc175cdcaf43c3 Mon Sep 17 00:00:00 2001 From: muerwre Date: Thu, 1 Aug 2019 18:44:11 +0700 Subject: [PATCH] fixed some styles --- .../examples/EditorExample/index.tsx | 22 +-- .../examples/EditorExample/styles.scss | 19 ++- .../examples/ImageExample/index.tsx | 125 ++++++++---------- src/sprites/Sprites.tsx | 26 +++- tsconfig.json | 11 +- 5 files changed, 113 insertions(+), 90 deletions(-) diff --git a/src/containers/examples/EditorExample/index.tsx b/src/containers/examples/EditorExample/index.tsx index d34ccd4b..5fb25f70 100644 --- a/src/containers/examples/EditorExample/index.tsx +++ b/src/containers/examples/EditorExample/index.tsx @@ -2,18 +2,15 @@ import React, { FC } from 'react'; import { Card } from "~/components/containers/Card"; import * as styles from './styles.scss'; import { Group } from "~/components/containers/Group"; -import { Padder } from "~/components/containers/Padder"; import { CellGrid } from "~/components/containers/CellGrid"; import { Panel } from "~/components/containers/Panel"; -import { TextInput } from "~/components/input/TextInput"; -import classNames = require("classnames"); +import classNames from "classnames"; import { Scroll } from "~/components/containers/Scroll"; import { Tags } from "~/components/node/Tags"; import { Button } from "~/components/input/Button"; import { Filler } from "~/components/containers/Filler"; import { InputText } from "~/components/input/InputText"; -import {Grid} from "~/components/containers/Grid"; -import {Icon} from "~/components/input/Icon"; +import { Icon } from "~/components/input/Icon"; interface IProps {} @@ -52,12 +49,21 @@ const EditorExample: FC = () => ( - ОБОИ ПОСТА + +
+ - МУЗЫКА + + + - + + + + + + diff --git a/src/containers/examples/EditorExample/styles.scss b/src/containers/examples/EditorExample/styles.scss index 0caafabb..08b56227 100644 --- a/src/containers/examples/EditorExample/styles.scss +++ b/src/containers/examples/EditorExample/styles.scss @@ -29,9 +29,6 @@ flex-direction: column; } -.editor_panel { -} - .editor_image_panel { flex: 1; } @@ -47,7 +44,7 @@ } .feature_card { - height: 120px; + // height: 120px; background: darken($main_bg_color, 6%); color: transparentize(white, 0.5); display: flex; @@ -56,6 +53,16 @@ text-transform: uppercase; font: $font_18_semibold; box-shadow: none; + padding: 0; +} + +.cover { + border-radius: $radius; + background: url('http://37.192.131.144/full/attached/2017/11/f01fdaaea789915284757634baf7cd11.jpg'); + flex: 1; + height: 120px; + background-size: cover; + opacity: 0.3; } .panel_main { @@ -70,3 +77,7 @@ flex: 0 0 24px; border-radius: $radius; } + +.views { + +} \ No newline at end of file diff --git a/src/containers/examples/ImageExample/index.tsx b/src/containers/examples/ImageExample/index.tsx index 36327bf9..bbc60ccc 100644 --- a/src/containers/examples/ImageExample/index.tsx +++ b/src/containers/examples/ImageExample/index.tsx @@ -1,88 +1,77 @@ -import React, { FC } from 'react'; +import React, { FC } from "react"; import { Card } from "~/components/containers/Card"; -import * as styles from './styles.scss'; +import * as styles from "./styles.scss"; import { Group } from "~/components/containers/Group"; import { Padder } from "~/components/containers/Padder"; -import range from 'ramda/es/range'; +import range from "ramda/es/range"; import { Comment } from "~/components/node/Comment"; import { NodePanel } from "~/components/node/NodePanel"; import { NodeRelated } from "~/components/node/NodeRelated"; import { Tags } from "~/components/node/Tags"; import { MenuButton } from "~/components/node/MenuButton"; import { NodeNoComments } from "~/components/node/NodeNoComments"; +import { InputText } from "~/components/input/InputText"; interface IProps {} const ImageExample: FC = () => ( - -
- -
+ + +
+ +
- + - - - - - + + + + + - { - range(1,6).map(el => ( - - )) - } - - -
- - - - - - - - - - - - - - - - - -
+ {range(1, 6).map(el => ( + + ))}
-
-
-
+ +
+ + + + + + + + + + + + + + + + + +
+ + + +
); export { ImageExample }; diff --git a/src/sprites/Sprites.tsx b/src/sprites/Sprites.tsx index 60fb5ee3..2b0cf428 100644 --- a/src/sprites/Sprites.tsx +++ b/src/sprites/Sprites.tsx @@ -2,10 +2,32 @@ import React, {FC} from 'react'; const Sprites: FC<{}> = () => ( - - + + + + + + + + + + + + + + + + + + + + + + ); export { Sprites }; + +// \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 5af29fb9..351b0b61 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,17 +12,12 @@ "target": "es2018", "isolatedModules": true, "jsx": "react", - "lib": [ "es2015", "DOM", "es6" ], + "lib": ["es2015", "dom", "es6"], "baseUrl": ".", "paths": { "~/*": ["src/*"] } }, - "include": [ - "./src/**/*", - "./custom.d.ts" - ], - "exclude": [ - "./__tests__/**/*" - ] + "include": ["./src/**/*", "./custom.d.ts"], + "exclude": ["./__tests__/**/*"] }