From d54a5b740ad52eb5f87fb5265efda423aecd1456 Mon Sep 17 00:00:00 2001 From: gohabereg Date: Wed, 20 Feb 2019 01:02:57 +0300 Subject: [PATCH] View for image block --- package.json | 2 +- public/dist/code-styling.bundle.js | 6 +-- public/dist/code-styling.css | 2 +- public/dist/editor.bundle.js | 34 +++-------------- public/dist/main.bundle.js | 6 +-- public/dist/main.css | 2 +- src/frontend/styles/components/page.pcss | 47 ++++++++++++++++++++++++ src/views/pages/blocks/image.twig | 24 ++++++++++++ src/views/pages/page.twig | 2 +- 9 files changed, 82 insertions(+), 43 deletions(-) create mode 100644 src/views/pages/blocks/image.twig diff --git a/package.json b/package.json index 32458d8..274bf59 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start:dev": "cross-env NODE_ENV=development nodemon ./bin/www", "test": "cross-env NODE_ENV=testing mocha --recursive ./test", "lint": "eslint --fix --cache ./src/**/*.js", - "build": "webpack ./src/frontend/js/app.js --o='./public/dist/[name].bundle.js' --output-library=Docs --output-public-path=/dist/ -p --watch", + "build": "webpack ./src/frontend/js/app.js -o ./public/dist/[name].bundle.js --output-library=Docs --output-public-path=/dist/ -p --watch", "precommit": "yarn lint && yarn test --exit" }, "dependencies": { diff --git a/public/dist/code-styling.bundle.js b/public/dist/code-styling.bundle.js index 2911abf..f000270 100644 --- a/public/dist/code-styling.bundle.js +++ b/public/dist/code-styling.bundle.js @@ -1,5 +1 @@ -<<<<<<< HEAD -(window.webpackJsonp=window.webpackJsonp||[]).push([[0],Array(59).concat([function(e,n,t){var r=t(64),a=t(19);e.exports=function(e){return r(a(e))}},function(e,n,t){var r=t(32)("keys"),a=t(21);e.exports=function(e){return r[e]||(r[e]=a(e))}},function(e,n,t){var r=t(19);e.exports=function(e){return Object(r(e))}},function(e,n,t){"use strict";var r=t(22),a=t(10),i=t(12),o=t(9),s=t(16),c=t(74),u=t(31),l=t(80),f=t(1)("iterator"),g=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,n,t,p,v,E,h){c(t,n,p);var b,m,y,_=function(e){if(!g&&e in O)return O[e];switch(e){case"keys":case"values":return function(){return new t(this,e)}}return function(){return new t(this,e)}},R=n+" Iterator",w="values"==v,N=!1,O=e.prototype,M=O[f]||O["@@iterator"]||v&&O[v],S=M||_(v),x=v?w?_("entries"):S:void 0,A="Array"==n&&O.entries||M;if(A&&(y=l(A.call(new e)))!==Object.prototype&&y.next&&(u(y,R,!0),r||"function"==typeof y[f]||o(y,f,d)),w&&M&&"values"!==M.name&&(N=!0,S=function(){return M.call(this)}),r&&!h||!g&&!N&&O[f]||o(O,f,S),s[n]=S,s[R]=d,v)if(b={values:w?S:_("values"),keys:E?S:_("keys"),entries:x},h)for(m in b)m in O||i(O,m,b[m]);else a(a.P+a.F*(g||N),n,b);return b}},function(e,n,t){var r=t(77),a=t(65);e.exports=Object.keys||function(e){return r(e,a)}},function(e,n,t){var r=t(13);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,n){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},,,,,,,,function(e,n,t){"use strict";var r=t(38)(!0);t(62)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,n=this._t,t=this._i;return t>=n.length?{value:void 0,done:!0}:(e=r(n,t),this._i+=e.length,{value:e,done:!1})})},function(e,n,t){"use strict";var r=t(75),a=t(30),i=t(31),o={};t(9)(o,t(1)("iterator"),function(){return this}),e.exports=function(e,n,t){e.prototype=r(o,{next:a(1,t)}),i(e,n+" Iterator")}},function(e,n,t){var r=t(2),a=t(76),i=t(65),o=t(60)("IE_PROTO"),s=function(){},c=function(){var e,n=t(20)("iframe"),r=i.length;for(n.style.display="none",t(36).appendChild(n),n.src="javascript:",(e=n.contentWindow.document).open(),e.write("