public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some cosmetic updates

Browse source 
Fix - GrapesJS 0.14.50 does not work with grapesjs-mjml. GrapesJS version downgraded to 0.14.49
This commit is contained in:
Tomas Bures 2019-01-12 11:49:22 +01:00
parent 0d7f962c86
commit 6f6258e53b
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/package-lock.json generated
View file

@ -2214,7 +2214,7 @@
}, },
"underscore": { "underscore": {
"version": "1.8.3", "version": "1.8.3",
"resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
} }
} }
@ -4507,13 +4507,11 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -4530,8 +4528,7 @@
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
@ -4660,7 +4657,6 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -5130,9 +5126,9 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
}, },
"grapesjs": { "grapesjs": {
"version": "0.14.50", "version": "0.14.49",
"resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.14.50.tgz", "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.14.49.tgz",
"integrity": "sha512-LWlKUSdWVqYIUOwm/60yQAhrn5O6c6j5IW42mVZzyi0VJUWvl+eyu1ASugM7keINyTX29KBA67lHpO+hWXRtrg==", "integrity": "sha512-r6qY/F2hnHC6vgdrsBqxXISz+RHrLtAaD61PO5gPCfWIoCk38bYnR9YkGlSTE2Dg6yomKd/rb0PGINEs5Cr9gw==",
"requires": { "requires": {
"backbone": "^1.3.3", "backbone": "^1.3.3",
"backbone-undo": "^0.2.5", "backbone-undo": "^0.2.5",
@ -6757,7 +6753,7 @@
}, },
"keymaster": { "keymaster": {
"version": "1.6.2", "version": "1.6.2",
"resolved": "http://registry.npmjs.org/keymaster/-/keymaster-1.6.2.tgz", "resolved": "https://registry.npmjs.org/keymaster/-/keymaster-1.6.2.tgz",
"integrity": "sha1-4a5U0OqUiPn2C2a2aPAumhlGxus=" "integrity": "sha1-4a5U0OqUiPn2C2a2aPAumhlGxus="
}, },
"kind-of": { "kind-of": {

2
client/package.json
View file

@ -26,7 +26,7 @@
"bootstrap": "^4.2.1", "bootstrap": "^4.2.1",
"datatables.net": "^1.10.19", "datatables.net": "^1.10.19",
"datatables.net-bs4": "^1.10.19", "datatables.net-bs4": "^1.10.19",
"grapesjs": "^0.14.50", "grapesjs": "0.14.49",
"grapesjs-mjml": "0.0.27", "grapesjs-mjml": "0.0.27",
"grapesjs-preset-newsletter": "^0.2.20", "grapesjs-preset-newsletter": "^0.2.20",
"i18next": "^13.1.0", "i18next": "^13.1.0",

3
client/src/scss/mailtrain.scss
View file

@ -50,7 +50,8 @@ body.mailtrain {
padding: 0 15px; padding: 0 15px;
.navbar-brand { .navbar-brand {
width: $sidebar-width - 30px; // width: $sidebar-width - 30px;
width: 130px; // We don't use sidebar yet, so no need to align with it.
justify-content: left; justify-content: left;