github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-22 01:36:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into es6-integration

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/migrations/20161009040430-support-delete-note.js
View file

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

4
lib/migrations/20161201050312-support-email-signin.js
View file

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

6
public/css/cover.css
View file

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

1
public/js/index.js
View file

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

1
public/js/pretty.js
View file

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

BIN
public/screenshot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 233 KiB

1
public/views/index.ejs
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>
<br>
<br>
<img src="<%- url %>/screenshot.png" class="screenshot ui-signin">
</span>
<div class="lead row" style="width: 90%; margin: 0 auto;">
<div class="col-md-4 inner">