From a27044b69110c08418089eefeb438e4dee934f9d Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 15:49:10 -0300 Subject: [PATCH 1/5] =?UTF-8?q?=C3=81dding=20style=20for=20the=20infoBox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/coral-embed-stream/style/default.css | 22 +++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 2ef617593..d4e68e360 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -80,8 +80,8 @@ hr { .coral-plugin-infobox-info { top: 0; border: 0; - background: rgb(35,118,216); - color: white; + background: #DEEDFF; + color: #2a2a2a; width: 100%; text-align: left; padding: 10px; @@ -92,6 +92,24 @@ hr { } +.coral-plugin-infobox-info em{ + font-style: italic; +} + +.coral-plugin-infobox-info strong{ + font-weight: bold; +} + +.coral-plugin-infobox-info blockquote{ + border-left: solid 2px #536d8c; + padding-left: 10px; +} + + +.coral-plugin-infobox-info a{ + color: #012d67; +} + .commentStream .material-icons { vertical-align: middle; width: 1em; From 93358564747587020f454ef0a2e0ae874101f2e1 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 15:55:18 -0300 Subject: [PATCH 2/5] Links style --- client/coral-embed-stream/style/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index d4e68e360..89436e000 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -101,13 +101,13 @@ hr { } .coral-plugin-infobox-info blockquote{ - border-left: solid 2px #536d8c; + border-left: solid 2px #2a2a2a; padding-left: 10px; } .coral-plugin-infobox-info a{ - color: #012d67; + color: #2a2a2a; } .commentStream .material-icons { From 93ca0bf79dca4652dc4b25ed10ad9449d99fc8d9 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 16:14:02 -0300 Subject: [PATCH 3/5] fixed flash messages --- client/coral-embed/src/index.js | 4 +++- client/coral-framework/actions/notification.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js index 21c176500..722f4ca8e 100644 --- a/client/coral-embed/src/index.js +++ b/client/coral-embed/src/index.js @@ -2,6 +2,7 @@ import pym from 'pym.js'; import {stringify} from 'querystring'; +// TODO: Styles should live in a separate file const snackbarStyles = { position: 'fixed', cursor: 'default', @@ -20,7 +21,8 @@ const snackbarStyles = { opacity: 0, transform: 'translate(-50%, 20px)', bottom: 0, - boxSizing: 'border-box' + boxSizing: 'border-box', + fontFamily: 'Helvetica, \'Helvetica Neue\', Verdana, sans-serif' }; // This function should return value of window.Coral diff --git a/client/coral-framework/actions/notification.js b/client/coral-framework/actions/notification.js index cb1aee5dd..37679972d 100644 --- a/client/coral-framework/actions/notification.js +++ b/client/coral-framework/actions/notification.js @@ -1,4 +1,4 @@ -import {pym} from '../../coral-framework'; +import pym from '../services/PymConnection'; export const addNotification = (notifType, text) => { pym.sendMessage('coral-alert', `${notifType}|${text}`); From c5520e3fb66e67ac61aa9445d23a413b167ab280 Mon Sep 17 00:00:00 2001 From: gaba Date: Tue, 11 Apr 2017 12:22:05 -0700 Subject: [PATCH 4/5] Adds missing template. --- services/email/suspension.html.ejs | 1 + 1 file changed, 1 insertion(+) create mode 100644 services/email/suspension.html.ejs diff --git a/services/email/suspension.html.ejs b/services/email/suspension.html.ejs new file mode 100644 index 000000000..b36560ec5 --- /dev/null +++ b/services/email/suspension.html.ejs @@ -0,0 +1 @@ +<%= body %> From 3a3b89b03b24ba19f154c98f4da41b057540900f Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Tue, 11 Apr 2017 14:59:02 -0600 Subject: [PATCH 5/5] Fixed bugs with plugin install --- package.json | 2 +- plugins.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f4e2eb725..d974a78d4 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "e2e": "NODE_ENV=test nightwatch", "poste2e": "NODE_ENV=test scripts/poste2e.sh", "embed-start": "NODE_ENV=development yarn build && ./bin/cli serve --jobs", - "heroku-postbuild": "yarn build" + "heroku-postbuild": "./bin/cli plugins reconcile && yarn build" }, "config": { "pre-git": { diff --git a/plugins.js b/plugins.js index 02cdb58e1..65e80dee5 100644 --- a/plugins.js +++ b/plugins.js @@ -124,7 +124,12 @@ function itteratePlugins(plugins) { // Add each plugin folder to the allowed import path so that they can import our // internal dependancies. Object.keys(plugins).forEach((type) => itteratePlugins(plugins[type]).forEach((plugin) => { - amp.enableForDir(path.dirname(plugin.path)); + + // The plugin may be remote, and therefore not installed. We check here if the + // plugin path is available before trying to monkeypatch it's require path. + if (plugin.path) { + amp.enableForDir(path.dirname(plugin.path)); + } })); /**