From 42139b0dde5b7682c424a2f391bb85ac37cce02a Mon Sep 17 00:00:00 2001 From: Fedor Katurov <gotham48@gmail.com> Date: Mon, 21 Oct 2019 21:17:05 +0700 Subject: [PATCH] cells shadow --- src/components/flow/Cell/styles.scss | 2 + .../node/NodeImageSlideBlock/styles.scss | 1 + src/sprites/favicon.ico | Bin 0 -> 719 bytes src/styles/colors.scss | 2 +- webpack.config.js | 56 ++++++++---------- 5 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 src/sprites/favicon.ico diff --git a/src/components/flow/Cell/styles.scss b/src/components/flow/Cell/styles.scss index b57eef2b..d225b1b5 100644 --- a/src/components/flow/Cell/styles.scss +++ b/src/components/flow/Cell/styles.scss @@ -111,6 +111,8 @@ } .face { + @include outer_shadow(); + box-sizing: border-box; position: absolute; top: 0; diff --git a/src/components/node/NodeImageSlideBlock/styles.scss b/src/components/node/NodeImageSlideBlock/styles.scss index 2feef7be..4824443b 100644 --- a/src/components/node/NodeImageSlideBlock/styles.scss +++ b/src/components/node/NodeImageSlideBlock/styles.scss @@ -4,6 +4,7 @@ min-width: 0; width: 100%; transition: height 0.25s; + border-radius: $radius $radius 0 0; } .image_container { diff --git a/src/sprites/favicon.ico b/src/sprites/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3059b281001a27cba9392e4a77037fcfe57bfd99 GIT binary patch literal 719 zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10!&FnK~y-6m6I`R+fWpRKZ^%O8ibw|NSwiA1}%bEWXxs{p|inR zGi9+`LJH{*D8>-l=0~J|pp?Xc5Q4$W^Pok94j!^N9-=%n*n^E<huX$zA<zRC?r`qm z-ov>$V+`vk6bd`QAy8fvKz~t}X`238=jWCJg+d_*G=a~SW!bLlBBf+J9y1z^mi!6u z3HX+#saXjuhJOGD#bS{tikQu27-M*Rd?ZN{_V@R(ZJX=sYk;4?yEILWwNP#X2Vocz zh9SLPkE^RIj4@c&AIj6y6Gul!oSvQn94ux)O1UGY90x&Q>h-$W*w`?&TFoe>%>Dhn z+1uMQQc5GGG~3(T=I-v!)M_;&r5sBscLZ=~S(Y6|5xriIYPHJo@iEP2lO#!A89bRx zI6FJTaU1{}s0*O%x-PTX46QYdMuU@+6P}-+saC51#Bsbb^5NlOT{E(Pvgdhdt=Zbz zVmh6YBne>{k|fEh2dGpk?C$Oo1Oc0yn*e2NT`r%`^LH-R(P%VqU6)d+v^)a~=xeR< zJdeR(fa5p>K|mbG1VQks7edhOcFE;(yu7>s^ev#DWf?*UeBY<tZqsVD@O__7r$eXH z!S{Vytriy-7kHkB5P~er0F(eO=kxhTrIZ~-5jQtC2q8E>KW93fVvNCY9NO(Rx3{-c zDixGc%;)n7@O_!Y_rRAh3@H|iD5X}W=JR<5g8{zp6Gaij;gC3v0Y0Q@`t{8yYpnrR zYb&J~4u`Lz{N^)xo(F)|nk>tfYybO9>-gVy{tef=Avq%?htvQ7002ovPDHLkV1lb- BID`NI literal 0 HcmV?d00001 diff --git a/src/styles/colors.scss b/src/styles/colors.scss index 9c79d31a..6fc6b561 100644 --- a/src/styles/colors.scss +++ b/src/styles/colors.scss @@ -46,7 +46,7 @@ $button_bg_color: $red_gradient; $comment_bg: lighten($content_bg, 2%); $panel_bg: transparent; $node_bg: darken($content_bg, 2%); -$node_image_bg: darken($main_bg_color, 7%); +$node_image_bg: darken($main_bg_color, 4%); $node_title_background: darken($main_bg_color, 8%); $editor_bg: $content_bg; diff --git a/webpack.config.js b/webpack.config.js index 5c184b40..2dc6a614 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,7 @@ const htmlPlugin = new HtmlWebPackPlugin({ filename: './index.html', title: 'VAULT', hash: false, - // favicon: 'src/sprites/favicon.png', + favicon: 'src/sprites/favicon.ico', }); const isDevelopment = process.env.NODE_ENV !== 'production'; @@ -22,7 +22,7 @@ const resolve = { 'react-dom': '@hot-loader/react-dom', '~': join(__dirname, 'src'), }, - extensions: ['*', '.ts', '.tsx', '.js', '.jsx', '.json', '.scss'] + extensions: ['*', '.ts', '.tsx', '.js', '.jsx', '.json', '.scss'], }; /* Configuration */ @@ -45,10 +45,7 @@ module.exports = () => { rules: [ { test: /\.css$/, - use: [ - { loader: 'style-loader' }, - { loader: 'css-loader' } - ], + use: [{ loader: 'style-loader' }, { loader: 'css-loader' }], }, { test: /\.less$/, @@ -62,11 +59,11 @@ module.exports = () => { modules: true, sourceMap: true, importLoaders: 2, - localIdentName: '[folder]__[local]__[hash:base64:5]' - } + localIdentName: '[folder]__[local]__[hash:base64:5]', + }, }, - { loader: 'less-loader' } - ] + { loader: 'less-loader' }, + ], }, { test: /\.scss$/, @@ -79,16 +76,16 @@ module.exports = () => { modules: true, sourceMap: true, importLoaders: 2, - localIdentName: '[folder]__[local]__[hash:base64:5]' - } + localIdentName: '[folder]__[local]__[hash:base64:5]', + }, }, { loader: 'resolve-url-loader' }, { loader: 'sass-loader', options: { sourceMap: true, - sourceMapContents: false - } + sourceMapContents: false, + }, }, { loader: 'sass-resources-loader', @@ -96,14 +93,14 @@ module.exports = () => { resources: ['src/styles/variables.scss'], }, }, - ] + ], }, { test: /\.(ts|tsx|js|jsx)$/, exclude: /node_modules/, use: { - loader: 'babel-loader' - } + loader: 'babel-loader', + }, }, { test: /\.(ts|tsx)?$/, loader: 'awesome-typescript-loader' }, { @@ -113,17 +110,17 @@ module.exports = () => { options: { name: '[name].[ext]', // outputPath: '/font' - } - } + }, + }, }, { test: /\.(png|svg)$/, use: { loader: 'file-loader', - options: {} - } - } - ] + options: {}, + }, + }, + ], }, devtool, resolve, @@ -151,18 +148,18 @@ module.exports = () => { minChunks: 2, minSize: 0, reuseExistingChunk: true, - } - } + }, + }, }, minimizer: [ new UglifyJsPlugin({ cache: true, parallel: true, - sourceMap: true // set to true if you want JS source maps + sourceMap: true, // set to true if you want JS source maps }), - new OptimizeCSSAssetsPlugin({}) + new OptimizeCSSAssetsPlugin({}), ], - occurrenceOrder: true // To keep filename consistent between different modes (for example building only) + occurrenceOrder: true, // To keep filename consistent between different modes (for example building only) }, devServer: { historyApiFallback: true, @@ -171,7 +168,6 @@ module.exports = () => { contentBase: 'dist', publicPath: '/', hot: true, - } + }, }; }; -