Merge branch 'master' into es6-integration

This commit is contained in:
Yukai Huang 2017-01-21 12:55:45 +08:00
commit 74b04d08b5
7 changed files with 12 additions and 3 deletions

View file

@ -6,6 +6,6 @@ module.exports = {
}, },
down: function (queryInterface, Sequelize) { down: function (queryInterface, Sequelize) {
queryInterface.removeColumn('Notes', 'deletedAt', Sequelize.DATE); queryInterface.removeColumn('Notes', 'deletedAt');
} }
}; };

View file

@ -7,7 +7,7 @@ module.exports = {
}, },
down: function (queryInterface, Sequelize) { down: function (queryInterface, Sequelize) {
queryInterface.removeColumn('Users', 'email', Sequelize.TEXT); queryInterface.removeColumn('Users', 'email');
queryInterface.removeColumn('Users', 'password', Sequelize.TEXT); queryInterface.removeColumn('Users', 'password');
} }
}; };

View file

@ -354,6 +354,12 @@ input {
color: white; color: white;
} }
.screenshot {
margin: 30px auto;
width: 100%;
border-radius: 3px;
}
select { select {
color: black; color: black;
} }

View file

@ -3452,6 +3452,7 @@ function updateViewInner() {
var value = editor.getValue(); var value = editor.getValue();
var lastMeta = md.meta; var lastMeta = md.meta;
md.meta = {}; md.meta = {};
delete md.metaError;
var rendered = md.render(value); var rendered = md.render(value);
if (md.meta.type && md.meta.type === 'slide') { if (md.meta.type && md.meta.type === 'slide') {
var slideOptions = { var slideOptions = {

View file

@ -24,6 +24,7 @@ const markdown = $("#doc.markdown-body");
const text = markdown.text(); const text = markdown.text();
const lastMeta = md.meta; const lastMeta = md.meta;
md.meta = {}; md.meta = {};
delete md.metaError;
let rendered = md.render(text); let rendered = md.render(text);
if (md.meta.type && md.meta.type === 'slide') { if (md.meta.type && md.meta.type === 'slide') {
const slideOptions = { const slideOptions = {

BIN
public/screenshot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 KiB

View file

@ -87,6 +87,7 @@
<a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a> <a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
<br> <br>
<br> <br>
<img src="<%- url %>/screenshot.png" class="screenshot ui-signin">
</span> </span>
<div class="lead row" style="width: 90%; margin: 0 auto;"> <div class="lead row" style="width: 90%; margin: 0 auto;">
<div class="col-md-4 inner"> <div class="col-md-4 inner">