Merge branch 'master' into 143202269-suspend-user-email

This commit is contained in:
Kim Gardner
2017-04-11 17:46:58 -04:00
committed by GitHub
3 changed files with 24 additions and 4 deletions
+20 -2
View File
@@ -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 #2a2a2a;
padding-left: 10px;
}
.coral-plugin-infobox-info a{
color: #2a2a2a;
}
.commentStream .material-icons {
vertical-align: middle;
width: 1em;
+3 -1
View File
@@ -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
@@ -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}`);