From 92a6e1f10f34fccf911b4e0af736781e3cec1ebf Mon Sep 17 00:00:00 2001 From: Pawel Kowalski Date: Thu, 16 Aug 2018 17:49:11 +0200 Subject: [PATCH] Revert "Add favicon" This reverts commit f30fbaa43fec7a1949652539c4b9f2d2e6f65442. --- client/build/webpack.dev.conf.js | 2 +- client/build/webpack.prod.conf.js | 4 ++-- client/config/index.js | 4 ++-- client/index.html | 2 -- client/{vstatic => static}/.gitkeep | 0 client/vstatic/favicon-16x16.png | Bin 600 -> 0 bytes client/vstatic/favicon-32x32.png | Bin 1311 -> 0 bytes client/vstatic/favicon.ico | Bin 5430 -> 0 bytes 8 files changed, 5 insertions(+), 7 deletions(-) rename client/{vstatic => static}/.gitkeep (100%) delete mode 100644 client/vstatic/favicon-16x16.png delete mode 100644 client/vstatic/favicon-32x32.png delete mode 100644 client/vstatic/favicon.ico diff --git a/client/build/webpack.dev.conf.js b/client/build/webpack.dev.conf.js index 1ae81ce3..070ae221 100755 --- a/client/build/webpack.dev.conf.js +++ b/client/build/webpack.dev.conf.js @@ -60,7 +60,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { // copy custom static assets new CopyWebpackPlugin([ { - from: path.resolve(__dirname, '../vstatic'), + from: path.resolve(__dirname, '../static'), to: config.dev.assetsSubDirectory, ignore: ['.*'] } diff --git a/client/build/webpack.prod.conf.js b/client/build/webpack.prod.conf.js index e06ff012..d9f99f65 100644 --- a/client/build/webpack.prod.conf.js +++ b/client/build/webpack.prod.conf.js @@ -46,7 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, { filename: utils.assetsPath('css/[name].[contenthash].css'), // Setting the following option to `false` will not extract CSS from codesplit chunks. // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, + // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 allChunks: true, }), @@ -111,7 +111,7 @@ const webpackConfig = merge(baseWebpackConfig, { // copy custom static assets new CopyWebpackPlugin([ { - from: path.resolve(__dirname, '../vstatic'), + from: path.resolve(__dirname, '../static'), to: config.build.assetsSubDirectory, ignore: ['.*'] } diff --git a/client/config/index.js b/client/config/index.js index 8ffab587..31e11b72 100644 --- a/client/config/index.js +++ b/client/config/index.js @@ -8,7 +8,7 @@ module.exports = { dev: { // Paths - assetsSubDirectory: 'vstatic', + assetsSubDirectory: 'static', assetsPublicPath: '/', proxyTable: {}, @@ -48,7 +48,7 @@ module.exports = { index: path.resolve(__dirname, '../dist/index.html'), assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'vstatic', + assetsSubDirectory: 'static', assetsPublicPath: '/', /** diff --git a/client/index.html b/client/index.html index 75a7f649..f0f2f8fa 100644 --- a/client/index.html +++ b/client/index.html @@ -8,8 +8,6 @@ - -
diff --git a/client/vstatic/.gitkeep b/client/static/.gitkeep similarity index 100% rename from client/vstatic/.gitkeep rename to client/static/.gitkeep diff --git a/client/vstatic/favicon-16x16.png b/client/vstatic/favicon-16x16.png deleted file mode 100644 index 87e5a7e856e01284673426e84f665aed68a67de2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmV-e0;m0nP)LlR;>bVI0PP@ArLUh>Ffq*_sovQG+44Q5#|Gl0?uB z9RfWFgWZBIT{=Y2WtR@oA?O+yqcnB!~u1og1dDIo-@K{p_&(=0~xJ zp3}?oKF{<2^Zx&@P*t@}7gFUS(R7kTDM!9m0l;On5OBDOc>VbLoZWInC!pSHa&2jz z2bmNHA?)!nHx|SoEBgWUR+G@n81FVW4m5Xg^6(L2Qy~npvKMe=@#$}sN3BlA4h_&N z%WTxDy!n!6t5Mf=a_hu7#PZid`|SKZ?LrcQI}_7f7#h(9w%RIpKP@tsTF|&>!5Nfj zI;j($A3Ua+pRBL2Qr%?I?qbsJ;$x+x(?-)tltd|~Bi$yecK%%7A(~$1=7%_5vyIiA zvQC>Q<&Zj~>R_Re;fJaMFgrZX()1;s2WL3t7y@(?Cts@|n=hWZ(M^}W*LYRT;xL$S z8Lh}d;53*B4jiRdR)`n(JC=k%av3eURC7-+0Fn4ZMjqYf^4rI>+U;NOb6lr&87(LQ zhnwu~wnoklk8^eOG|8<3uS;tPA&`UsV6C>T3kW#eC=sup`>XFYvZ<=nnhpH6e*Ct6 zjbHy(<$CgkE+FFd|9O!Nat{;sK|H2DWFe8+EfX(hX{aqtqb<_^uClaOQ6V-JBJA<~ m)g1QtG&6Ml#t#1VJO2bwMc;_XgFa{g0000pLLP)R9JZUj( z{zDU%B_q>}EE+T85?_rEdr^7#6B}0VSYQS!6D*}bm z0{wS=C@qX~+d9Yh8KahV+856{yx=E3C~Wzg@#8=Ph)vH*Zl zorgVt9n~faPD?5EHU}n+HW#-Dasmi~z-rb#Gr_5$t8{sX3CCkOIn{^~jrK~8SM6r& zy5d#+rmRv1LeU7V1HGK_^b?bFN>UmmLEwm^miHdphhC-5Jp=BU30hnocmk6TM7$CX zgPC?`6Aptpdj_sg-l6%@IsD=IheDo&Nu%ZL-h^$kYCw75FfgnW4rEv^ni(FjRiRk9YX1HC!byvA(hmCaSun5|fK1~igH zFcRT*Xof+*50`J0pYDw)?if#ClGcGJ8oCOAIJGcGmv=bhAH7}qB-@O|0IAx^vP>i%Cm0E*JqMUr2=VD3zbN|b z@($w<&!g%Y^JG2YUba`J?ceU(ZjSYJF&B%nUYpPE^>!NVl{9RuKqZKr9_nK@8dmff zj>qU3^PqD1Ml+HNz$U#h?GMN10?fst0F2KE>GBTKW<| zYx9+FwM83_$N0?M&&h$_oNiAsmq>4gW_ao17xayL)3mVCYD9^*w(aC|XA{z5xiUer z9eVM^LJpBmM;7>cWPskgBShsmR=t6Il}7PAC^MKD3k4XMx~J&VsLn&E>u!?={l2UL ztb_nmn=CYJtf0AkJ2ssmZB6%WH!YVt6@65jEQr-6OIEU7#hdu@sRKN^Y^@CZ=J)Z@ z;AQH%+fsY}z7sJ^TUKqdAUZ9jSp#^tdJoT9w{Y>f7QT7<5QodRQ&v!jN=Qhk%utA0 zloEk0)5NVTJIrY*MOANepb;fS#nu+t*jMsMO6AUyQubIjBM1WFSd6F~LnoTv+V_g&(jq6Y)Dymc{Q_<7Ull(B*lH}M&RR~5 z*-BYKA?7?Ck{~i04Kp%3#kFxSouj`qHW$d~=V-;_d{DDL5kRsl4n-q0^qhHUov;!d z1~cdDkC3m{Aj|SnPpDU^X?Hf|JkdM|Od2ii&L;FKbxJGub;S;YnX`Kju1OHdw!Fev zl;Q(cpNu?#$u%2HRzh($eAuH|vgSF@hDrS2;WU|YC1jnBllH%k=Y@H?%v15A{TH;) Vz`-C2DfIvV002ovPDHLkV1fnIan1k$ diff --git a/client/vstatic/favicon.ico b/client/vstatic/favicon.ico deleted file mode 100644 index d77796631e98b1518d6c02849ce009787834455a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5430 zcmcgw>u*#=6u%n(0KTyg?m`x)KF2(;uWy|W@ctce$nCMRNnLj zZQcJYWfk0|Ka7FHnxvKEsp$zSYy6B>0PTvrsp;14xsUeMe?rORwC2Ay*5l#lJ(Bzw zga6FMN=hW+nvY{$*OBYt=lzxZJ1SmH;foHp(ShbK6>nw=KWvcv)onkyI-9$;Q(noF zdVO2j^OR-qb6!dQy+=QC`A_$k(vg$vsPFPog-cRN{YsB6&PmCiRd6Sr>J7Ux*!P5r zVZGr$=d+nVkhh~^1ywYEMUmF;C|vsiZ76!gqnq;w@{x=GCx2On%?{}s#-Ne8&;Bvw zoaEfV9&?=8U#11LUJ469;+_eq?VkDvu%8Jq)VSQ^PVu{FXy1e`2?>`ro^!wCX7$rpvsnS^gSzOFJz28 zh78CuGqs83(old$gD_XPqX54w(<^Kk~$+HRsz^o%{QrAE=|RSk=ciRr>~LY+_LFE$Yfa zRU`9Co=PhRx>zs#$2mc+n)+tvnN)P-LmIrpx?=v1PxqmqN>*KY2)5U17mLLMh-}vZ9FkK@Bb{208Hb?x;r7+O`nmqV-r)K>dsgwz>ArBl>MQ%q zFc!bA-nX08zC3Q#k6O?5m+hZV|AAQStbCmsPj99ED-CpgypP6WQ5qgSOXs6C`rO;z z^m5NJhA!62HZOJm#d_Hez@_XzSufkc@K*QVtcM}nAtBoZSQZB-*4{szra%A F{{y)Gt!n@P