Merge pull request #6500 from vector-im/matthew/fix_layering

move everything not explicitly riot (or status) branded into matrix-react-sdk
element-hq · Apr 18, 2018 · ddc20e2 · ddc20e2
2 parents c8a3471 + 104a415
commit ddc20e2
Show file tree

Hide file tree

Showing 726 changed files with 133 additions and 28,054 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -70,14 +70,19 @@ module.exports = function (config) {
             // This isn't required by any of the tests, but it stops karma
             // logging warnings when it serves a 404 for them.
             {
-                pattern: 'src/skins/vector/img/*',
+                pattern: 'node_modules/matrix-react-sdk/res/img/*',
+                watched: false, included: false, served: true, nocache: false,
+            },
+            {
+                pattern: 'res/themes/**',
                 watched: false, included: false, served: true, nocache: false,
             },
         ],
 
         proxies: {
             // redirect img links to the karma server. See above.
-            "/img/": "/base/src/skins/vector/img/",
+            "/img/": "/base/node_modules/matrix-react-sdk/res/img/",
+            "/themes/": "/base/res/themes/",
         },
 
         // preprocess matching files before serving them to the browser

diff --git a/package.json b/package.json
@@ -58,30 +58,17 @@
     "babel-runtime": "^6.11.6",
     "bluebird": "^3.5.0",
     "browser-request": "^0.3.3",
-    "classnames": "^2.1.2",
-    "draft-js": "^0.11.0-alpha",
     "extract-text-webpack-plugin": "^0.9.1",
     "favico.js": "^0.3.10",
-    "filesize": "3.5.6",
-    "flux": "2.1.1",
-    "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
-    "gfm.css": "^1.1.1",
-    "highlight.js": "^9.0.0",
-    "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.10.1",
     "matrix-react-sdk": "0.12.2",
     "modernizr": "^3.1.0",
-    "pako": "^1.0.5",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",
-    "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^15.6.0",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.11.1",
-    "text-encoding-utf-8": "^1.0.1",
     "ua-parser-js": "^0.7.10",
-    "url": "^0.11.0",
-    "velocity-vector": "vector-im/velocity#059e3b2"
+    "url": "^0.11.0"
   },
   "devDependencies": {
     "autoprefixer": "^6.6.0",

diff --git a/res/flags/AD.png b/res/flags/AD.png
diff --git a/res/flags/AE.png b/res/flags/AE.png
diff --git a/res/flags/AF.png b/res/flags/AF.png
diff --git a/res/flags/AG.png b/res/flags/AG.png
diff --git a/res/flags/AI.png b/res/flags/AI.png
diff --git a/res/flags/AL.png b/res/flags/AL.png
diff --git a/res/flags/AM.png b/res/flags/AM.png
diff --git a/res/flags/AO.png b/res/flags/AO.png
diff --git a/res/flags/AQ.png b/res/flags/AQ.png
diff --git a/res/flags/AR.png b/res/flags/AR.png
diff --git a/res/flags/AS.png b/res/flags/AS.png
diff --git a/res/flags/AT.png b/res/flags/AT.png
diff --git a/res/flags/AU.png b/res/flags/AU.png
diff --git a/res/flags/AW.png b/res/flags/AW.png
diff --git a/res/flags/AX.png b/res/flags/AX.png
diff --git a/res/flags/AZ.png b/res/flags/AZ.png
diff --git a/res/flags/BA.png b/res/flags/BA.png
diff --git a/res/flags/BB.png b/res/flags/BB.png
diff --git a/res/flags/BD.png b/res/flags/BD.png
diff --git a/res/flags/BE.png b/res/flags/BE.png
diff --git a/res/flags/BF.png b/res/flags/BF.png
diff --git a/res/flags/BG.png b/res/flags/BG.png
diff --git a/res/flags/BH.png b/res/flags/BH.png
diff --git a/res/flags/BI.png b/res/flags/BI.png
diff --git a/res/flags/BJ.png b/res/flags/BJ.png
diff --git a/res/flags/BL.png b/res/flags/BL.png
diff --git a/res/flags/BM.png b/res/flags/BM.png
diff --git a/res/flags/BN.png b/res/flags/BN.png
diff --git a/res/flags/BO.png b/res/flags/BO.png
diff --git a/res/flags/BQ.png b/res/flags/BQ.png
diff --git a/res/flags/BR.png b/res/flags/BR.png
diff --git a/res/flags/BS.png b/res/flags/BS.png
diff --git a/res/flags/BT.png b/res/flags/BT.png
diff --git a/res/flags/BV.png b/res/flags/BV.png
diff --git a/res/flags/BW.png b/res/flags/BW.png
diff --git a/res/flags/BY.png b/res/flags/BY.png
diff --git a/res/flags/BZ.png b/res/flags/BZ.png
diff --git a/res/flags/CA.png b/res/flags/CA.png
diff --git a/res/flags/CC.png b/res/flags/CC.png
diff --git a/res/flags/CD.png b/res/flags/CD.png
diff --git a/res/flags/CF.png b/res/flags/CF.png
diff --git a/res/flags/CG.png b/res/flags/CG.png
diff --git a/res/flags/CH.png b/res/flags/CH.png
diff --git a/res/flags/CI.png b/res/flags/CI.png
diff --git a/res/flags/CK.png b/res/flags/CK.png
diff --git a/res/flags/CL.png b/res/flags/CL.png
diff --git a/res/flags/CM.png b/res/flags/CM.png
diff --git a/res/flags/CN.png b/res/flags/CN.png
diff --git a/res/flags/CO.png b/res/flags/CO.png
diff --git a/res/flags/CR.png b/res/flags/CR.png
diff --git a/res/flags/CU.png b/res/flags/CU.png
diff --git a/res/flags/CV.png b/res/flags/CV.png
diff --git a/res/flags/CW.png b/res/flags/CW.png
diff --git a/res/flags/CX.png b/res/flags/CX.png
diff --git a/res/flags/CY.png b/res/flags/CY.png
diff --git a/res/flags/CZ.png b/res/flags/CZ.png
diff --git a/res/flags/DE.png b/res/flags/DE.png
diff --git a/res/flags/DJ.png b/res/flags/DJ.png
diff --git a/res/flags/DK.png b/res/flags/DK.png
diff --git a/res/flags/DM.png b/res/flags/DM.png
diff --git a/res/flags/DO.png b/res/flags/DO.png
diff --git a/res/flags/DZ.png b/res/flags/DZ.png
diff --git a/res/flags/EC.png b/res/flags/EC.png
diff --git a/res/flags/EE.png b/res/flags/EE.png
diff --git a/res/flags/EG.png b/res/flags/EG.png
diff --git a/res/flags/EH.png b/res/flags/EH.png
diff --git a/res/flags/ER.png b/res/flags/ER.png
diff --git a/res/flags/ES.png b/res/flags/ES.png
diff --git a/res/flags/ET.png b/res/flags/ET.png
diff --git a/res/flags/FI.png b/res/flags/FI.png
diff --git a/res/flags/FJ.png b/res/flags/FJ.png
diff --git a/res/flags/FK.png b/res/flags/FK.png
diff --git a/res/flags/FM.png b/res/flags/FM.png
diff --git a/res/flags/FO.png b/res/flags/FO.png
diff --git a/res/flags/FR.png b/res/flags/FR.png
diff --git a/res/flags/GA.png b/res/flags/GA.png
diff --git a/res/flags/GB.png b/res/flags/GB.png
diff --git a/res/flags/GD.png b/res/flags/GD.png
diff --git a/res/flags/GE.png b/res/flags/GE.png
diff --git a/res/flags/GF.png b/res/flags/GF.png
diff --git a/res/flags/GG.png b/res/flags/GG.png
diff --git a/res/flags/GH.png b/res/flags/GH.png
diff --git a/res/flags/GI.png b/res/flags/GI.png
diff --git a/res/flags/GL.png b/res/flags/GL.png
diff --git a/res/flags/GM.png b/res/flags/GM.png
diff --git a/res/flags/GN.png b/res/flags/GN.png
diff --git a/res/flags/GP.png b/res/flags/GP.png
diff --git a/res/flags/GQ.png b/res/flags/GQ.png
diff --git a/res/flags/GR.png b/res/flags/GR.png
diff --git a/res/flags/GS.png b/res/flags/GS.png
diff --git a/res/flags/GT.png b/res/flags/GT.png
diff --git a/res/flags/GU.png b/res/flags/GU.png
diff --git a/res/flags/GW.png b/res/flags/GW.png
diff --git a/res/flags/GY.png b/res/flags/GY.png
diff --git a/res/flags/HK.png b/res/flags/HK.png
diff --git a/res/flags/HM.png b/res/flags/HM.png
diff --git a/res/flags/HN.png b/res/flags/HN.png
diff --git a/res/flags/HR.png b/res/flags/HR.png
diff --git a/res/flags/HT.png b/res/flags/HT.png
diff --git a/res/flags/HU.png b/res/flags/HU.png
diff --git a/res/flags/ID.png b/res/flags/ID.png
diff --git a/res/flags/IE.png b/res/flags/IE.png
diff --git a/res/flags/IL.png b/res/flags/IL.png
diff --git a/res/flags/IM.png b/res/flags/IM.png
diff --git a/res/flags/IN.png b/res/flags/IN.png
diff --git a/res/flags/IO.png b/res/flags/IO.png
diff --git a/res/flags/IQ.png b/res/flags/IQ.png
diff --git a/res/flags/IR.png b/res/flags/IR.png
diff --git a/res/flags/IS.png b/res/flags/IS.png
diff --git a/res/flags/IT.png b/res/flags/IT.png
diff --git a/res/flags/JE.png b/res/flags/JE.png
diff --git a/res/flags/JM.png b/res/flags/JM.png
diff --git a/res/flags/JO.png b/res/flags/JO.png
diff --git a/res/flags/JP.png b/res/flags/JP.png
diff --git a/res/flags/KE.png b/res/flags/KE.png
diff --git a/res/flags/KG.png b/res/flags/KG.png
diff --git a/res/flags/KH.png b/res/flags/KH.png
diff --git a/res/flags/KI.png b/res/flags/KI.png
diff --git a/res/flags/KM.png b/res/flags/KM.png
diff --git a/res/flags/KN.png b/res/flags/KN.png
diff --git a/res/flags/KP.png b/res/flags/KP.png
diff --git a/res/flags/KR.png b/res/flags/KR.png
diff --git a/res/flags/KW.png b/res/flags/KW.png
diff --git a/res/flags/KY.png b/res/flags/KY.png
diff --git a/res/flags/KZ.png b/res/flags/KZ.png
diff --git a/res/flags/LA.png b/res/flags/LA.png
diff --git a/res/flags/LB.png b/res/flags/LB.png
diff --git a/res/flags/LC.png b/res/flags/LC.png
diff --git a/res/flags/LI.png b/res/flags/LI.png
diff --git a/res/flags/LK.png b/res/flags/LK.png
diff --git a/res/flags/LR.png b/res/flags/LR.png
diff --git a/res/flags/LS.png b/res/flags/LS.png
diff --git a/res/flags/LT.png b/res/flags/LT.png
diff --git a/res/flags/LU.png b/res/flags/LU.png
diff --git a/res/flags/LV.png b/res/flags/LV.png
diff --git a/res/flags/LY.png b/res/flags/LY.png
diff --git a/res/flags/MA.png b/res/flags/MA.png
diff --git a/res/flags/MC.png b/res/flags/MC.png
diff --git a/res/flags/MD.png b/res/flags/MD.png
diff --git a/res/flags/ME.png b/res/flags/ME.png
diff --git a/res/flags/MF.png b/res/flags/MF.png
diff --git a/res/flags/MG.png b/res/flags/MG.png
diff --git a/res/flags/MH.png b/res/flags/MH.png
diff --git a/res/flags/MK.png b/res/flags/MK.png
diff --git a/res/flags/ML.png b/res/flags/ML.png
diff --git a/res/flags/MM.png b/res/flags/MM.png
diff --git a/res/flags/MN.png b/res/flags/MN.png
diff --git a/res/flags/MO.png b/res/flags/MO.png
diff --git a/res/flags/MP.png b/res/flags/MP.png
diff --git a/res/flags/MQ.png b/res/flags/MQ.png
diff --git a/res/flags/MR.png b/res/flags/MR.png
diff --git a/res/flags/MS.png b/res/flags/MS.png
diff --git a/res/flags/MT.png b/res/flags/MT.png
diff --git a/res/flags/MU.png b/res/flags/MU.png
diff --git a/res/flags/MV.png b/res/flags/MV.png
diff --git a/res/flags/MW.png b/res/flags/MW.png
diff --git a/res/flags/MX.png b/res/flags/MX.png
diff --git a/res/flags/MY.png b/res/flags/MY.png
diff --git a/res/flags/MZ.png b/res/flags/MZ.png
diff --git a/res/flags/NA.png b/res/flags/NA.png
diff --git a/res/flags/NC.png b/res/flags/NC.png
diff --git a/res/flags/NE.png b/res/flags/NE.png
diff --git a/res/flags/NF.png b/res/flags/NF.png
diff --git a/res/flags/NG.png b/res/flags/NG.png
diff --git a/res/flags/NI.png b/res/flags/NI.png
diff --git a/res/flags/NL.png b/res/flags/NL.png
diff --git a/res/flags/NO.png b/res/flags/NO.png
diff --git a/res/flags/NP.png b/res/flags/NP.png
diff --git a/res/flags/NR.png b/res/flags/NR.png
diff --git a/res/flags/NU.png b/res/flags/NU.png
diff --git a/res/flags/NZ.png b/res/flags/NZ.png
diff --git a/res/flags/OM.png b/res/flags/OM.png
diff --git a/res/flags/PA.png b/res/flags/PA.png
diff --git a/res/flags/PE.png b/res/flags/PE.png
diff --git a/res/flags/PF.png b/res/flags/PF.png
diff --git a/res/flags/PG.png b/res/flags/PG.png
diff --git a/res/flags/PH.png b/res/flags/PH.png
diff --git a/res/flags/PK.png b/res/flags/PK.png
diff --git a/res/flags/PL.png b/res/flags/PL.png
diff --git a/res/flags/PM.png b/res/flags/PM.png
diff --git a/res/flags/PN.png b/res/flags/PN.png
diff --git a/res/flags/PR.png b/res/flags/PR.png
diff --git a/res/flags/PS.png b/res/flags/PS.png
diff --git a/res/flags/PT.png b/res/flags/PT.png
diff --git a/res/flags/PW.png b/res/flags/PW.png
diff --git a/res/flags/PY.png b/res/flags/PY.png
diff --git a/res/flags/QA.png b/res/flags/QA.png
diff --git a/res/flags/RE.png b/res/flags/RE.png
diff --git a/res/flags/RO.png b/res/flags/RO.png
diff --git a/res/flags/RS.png b/res/flags/RS.png
diff --git a/res/flags/RU.png b/res/flags/RU.png
diff --git a/res/flags/RW.png b/res/flags/RW.png
diff --git a/res/flags/SA.png b/res/flags/SA.png
diff --git a/res/flags/SB.png b/res/flags/SB.png
diff --git a/res/flags/SC.png b/res/flags/SC.png
diff --git a/res/flags/SD.png b/res/flags/SD.png
diff --git a/res/flags/SE.png b/res/flags/SE.png
diff --git a/res/flags/SG.png b/res/flags/SG.png
diff --git a/res/flags/SH.png b/res/flags/SH.png
diff --git a/res/flags/SI.png b/res/flags/SI.png
diff --git a/res/flags/SJ.png b/res/flags/SJ.png
diff --git a/res/flags/SK.png b/res/flags/SK.png
diff --git a/res/flags/SL.png b/res/flags/SL.png
diff --git a/res/flags/SM.png b/res/flags/SM.png
diff --git a/res/flags/SN.png b/res/flags/SN.png
diff --git a/res/flags/SO.png b/res/flags/SO.png
diff --git a/res/flags/SR.png b/res/flags/SR.png
diff --git a/res/flags/SS.png b/res/flags/SS.png
diff --git a/res/flags/ST.png b/res/flags/ST.png
diff --git a/res/flags/SV.png b/res/flags/SV.png
diff --git a/res/flags/SX.png b/res/flags/SX.png
diff --git a/res/flags/SY.png b/res/flags/SY.png
diff --git a/res/flags/SZ.png b/res/flags/SZ.png
diff --git a/res/flags/TC.png b/res/flags/TC.png
diff --git a/res/flags/TD.png b/res/flags/TD.png
diff --git a/res/flags/TF.png b/res/flags/TF.png
diff --git a/res/flags/TG.png b/res/flags/TG.png
diff --git a/res/flags/TH.png b/res/flags/TH.png
diff --git a/res/flags/TJ.png b/res/flags/TJ.png
diff --git a/res/flags/TK.png b/res/flags/TK.png
diff --git a/res/flags/TL.png b/res/flags/TL.png
diff --git a/res/flags/TM.png b/res/flags/TM.png
diff --git a/res/flags/TN.png b/res/flags/TN.png
diff --git a/res/flags/TO.png b/res/flags/TO.png
diff --git a/res/flags/TR.png b/res/flags/TR.png
diff --git a/res/flags/TT.png b/res/flags/TT.png
diff --git a/res/flags/TV.png b/res/flags/TV.png
diff --git a/res/flags/TW.png b/res/flags/TW.png
diff --git a/res/flags/TZ.png b/res/flags/TZ.png
diff --git a/res/flags/UA.png b/res/flags/UA.png
diff --git a/res/flags/UG.png b/res/flags/UG.png
diff --git a/res/flags/US.png b/res/flags/US.png
diff --git a/res/flags/UY.png b/res/flags/UY.png
diff --git a/res/flags/UZ.png b/res/flags/UZ.png
diff --git a/res/flags/VA.png b/res/flags/VA.png
diff --git a/res/flags/VC.png b/res/flags/VC.png
diff --git a/res/flags/VE.png b/res/flags/VE.png
diff --git a/res/flags/VG.png b/res/flags/VG.png
diff --git a/res/flags/VI.png b/res/flags/VI.png
diff --git a/res/flags/VN.png b/res/flags/VN.png
diff --git a/res/flags/VU.png b/res/flags/VU.png
diff --git a/res/flags/WF.png b/res/flags/WF.png
diff --git a/res/flags/WS.png b/res/flags/WS.png
diff --git a/res/flags/YE.png b/res/flags/YE.png
diff --git a/res/flags/YT.png b/res/flags/YT.png
diff --git a/res/flags/ZA.png b/res/flags/ZA.png
diff --git a/res/flags/ZM.png b/res/flags/ZM.png
diff --git a/res/flags/ZW.png b/res/flags/ZW.png
diff --git a/res/media/busy.mp3 b/res/media/busy.mp3
diff --git a/res/media/busy.ogg b/res/media/busy.ogg
diff --git a/res/media/callend.mp3 b/res/media/callend.mp3
diff --git a/res/media/callend.ogg b/res/media/callend.ogg
diff --git a/res/media/message.mp3 b/res/media/message.mp3
diff --git a/res/media/message.ogg b/res/media/message.ogg
diff --git a/res/media/ring.mp3 b/res/media/ring.mp3
diff --git a/res/media/ring.ogg b/res/media/ring.ogg
diff --git a/res/media/ringback.mp3 b/res/media/ringback.mp3
diff --git a/res/media/ringback.ogg b/res/media/ringback.ogg
diff --git a/...skins/vector/img/logos/riot-im-logo-1.png → res/themes/riot/img/logos/riot-im-logo-1.png b/...skins/vector/img/logos/riot-im-logo-1.png → res/themes/riot/img/logos/riot-im-logo-1.png
diff --git a/...skins/vector/img/logos/riot-im-logo-1.svg → res/themes/riot/img/logos/riot-im-logo-1.svg b/...skins/vector/img/logos/riot-im-logo-1.svg → res/themes/riot/img/logos/riot-im-logo-1.svg
diff --git a/...skins/vector/img/logos/riot-im-logo-2.svg → res/themes/riot/img/logos/riot-im-logo-2.svg b/...skins/vector/img/logos/riot-im-logo-2.svg → res/themes/riot/img/logos/riot-im-logo-2.svg
diff --git a/...skins/vector/img/logos/riot-im-logo-3.svg → res/themes/riot/img/logos/riot-im-logo-3.svg b/...skins/vector/img/logos/riot-im-logo-3.svg → res/themes/riot/img/logos/riot-im-logo-3.svg
diff --git a/...skins/vector/img/logos/riot-im-logo-4.svg → res/themes/riot/img/logos/riot-im-logo-4.svg b/...skins/vector/img/logos/riot-im-logo-4.svg → res/themes/riot/img/logos/riot-im-logo-4.svg
diff --git a/...skins/vector/img/logos/riot-im-logo-5.svg → res/themes/riot/img/logos/riot-im-logo-5.svg b/...skins/vector/img/logos/riot-im-logo-5.svg → res/themes/riot/img/logos/riot-im-logo-5.svg
diff --git a/src/skins/vector/img/logos/riot-logo-1.svg → res/themes/riot/img/logos/riot-logo-1.svg b/src/skins/vector/img/logos/riot-logo-1.svg → res/themes/riot/img/logos/riot-logo-1.svg
diff --git a/src/skins/vector/img/logos/riot-logo-2.svg → res/themes/riot/img/logos/riot-logo-2.svg b/src/skins/vector/img/logos/riot-logo-2.svg → res/themes/riot/img/logos/riot-logo-2.svg
diff --git a/src/skins/vector/img/logos/riot-logo-3.svg → res/themes/riot/img/logos/riot-logo-3.svg b/src/skins/vector/img/logos/riot-logo-3.svg → res/themes/riot/img/logos/riot-logo-3.svg
diff --git a/src/skins/vector/img/logos/riot-logo-4.svg → res/themes/riot/img/logos/riot-logo-4.svg b/src/skins/vector/img/logos/riot-logo-4.svg → res/themes/riot/img/logos/riot-logo-4.svg
diff --git a/src/skins/vector/img/logos/riot-logo-5.svg → res/themes/riot/img/logos/riot-logo-5.svg b/src/skins/vector/img/logos/riot-logo-5.svg → res/themes/riot/img/logos/riot-logo-5.svg
diff --git a/src/skins/vector/img/logos/riot-logo-bw.svg → res/themes/riot/img/logos/riot-logo-bw.svg b/src/skins/vector/img/logos/riot-logo-bw.svg → res/themes/riot/img/logos/riot-logo-bw.svg
diff --git a/src/skins/vector/img/logos/riot-logo.svg → res/themes/riot/img/logos/riot-logo.svg b/src/skins/vector/img/logos/riot-logo.svg → res/themes/riot/img/logos/riot-logo.svg
diff --git a/src/skins/vector/img/logos/riot.im logo.svg → res/themes/riot/img/logos/riot.im logo.svg b/src/skins/vector/img/logos/riot.im logo.svg → res/themes/riot/img/logos/riot.im logo.svg
diff --git a/...ector/themes/status/css/_StatusLogin.scss → res/themes/status/css/_StatusLogin.scss b/...ector/themes/status/css/_StatusLogin.scss → res/themes/status/css/_StatusLogin.scss
diff --git a/...ins/vector/themes/status/css/_status.scss → res/themes/status/css/_status.scss b/...ins/vector/themes/status/css/_status.scss → res/themes/status/css/_status.scss
diff --git a/res/themes/status/css/status.scss b/res/themes/status/css/status.scss
@@ -0,0 +1,4 @@
+@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
+@import "_status.scss";
+@import "../../../../node_modules/matrix-react-sdk/res/css/_components.scss";
+@import "_StatusLogin.scss";
diff --git a/src/skins/vector/themes/status/fonts/README → res/themes/status/fonts/README b/src/skins/vector/themes/status/fonts/README → res/themes/status/fonts/README
diff --git a/src/skins/vector/themes/status/img/a.png → res/themes/status/img/a.png b/src/skins/vector/themes/status/img/a.png → res/themes/status/img/a.png
diff --git a/src/skins/vector/themes/status/img/d.png → res/themes/status/img/d.png b/src/skins/vector/themes/status/img/d.png → res/themes/status/img/d.png
diff --git a/src/skins/vector/themes/status/img/dot.svg → res/themes/status/img/dot.svg b/src/skins/vector/themes/status/img/dot.svg → res/themes/status/img/dot.svg
diff --git a/src/skins/vector/themes/status/img/g.png → res/themes/status/img/g.png b/src/skins/vector/themes/status/img/g.png → res/themes/status/img/g.png
diff --git a/src/skins/vector/themes/status/img/i.png → res/themes/status/img/i.png b/src/skins/vector/themes/status/img/i.png → res/themes/status/img/i.png
diff --git a/src/skins/vector/themes/status/img/logo.svg → res/themes/status/img/logo.svg b/src/skins/vector/themes/status/img/logo.svg → res/themes/status/img/logo.svg
diff --git a/src/skins/vector/themes/status/img/n.png → res/themes/status/img/n.png b/src/skins/vector/themes/status/img/n.png → res/themes/status/img/n.png
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
@@ -50,9 +50,9 @@ const COPY_LIST = [
     ["res/home.html", "webapp"],
     ["res/home-status.html", "webapp"],
     ["res/home/**", "webapp/home"],
-    ["res/{media,vector-icons}/**", "webapp"],
-    ["res/flags/*", "webapp/flags/"],
-    ["src/skins/vector/{fonts,img,themes}/**", "webapp"],
+    ["res/vector-icons/**", "webapp"],
+    ["node_modules/matrix-react-sdk/res/{fonts,img,themes}/**", "webapp"],
+    ["res/themes/**", "webapp/themes"],
     ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
     ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
     ["./config.json", "webapp", { directwatch: 1 }],

diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js