diff --git a/.gitignore b/.gitignore
index 56b1475..322ae7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,5 +38,6 @@ jspm_packages
client/public
db
+db/matterwiki.sqlite
config.js
diff --git a/client/app/static/app.jsx b/client/app/static/app.jsx
index f301ab4..d782cde 100644
--- a/client/app/static/app.jsx
+++ b/client/app/static/app.jsx
@@ -20,9 +20,12 @@ const App = React.createClass({
-
+ - New Article
-
+
+ -
+ Logout
+
diff --git a/client/app/static/new.jsx b/client/app/static/new.jsx
index 3b68f3f..6294423 100644
--- a/client/app/static/new.jsx
+++ b/client/app/static/new.jsx
@@ -7,11 +7,11 @@ class NewArticle extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
- this.state = {title: "", body: ""};
+ this.state = {body: ""};
}
handleChange() {
- this.setState({title: this.refs.title.value, body: this.refs.body.value});
+ this.setState({body: this.refs.body.value});
}
getRawMarkupBody() {
@@ -19,10 +19,6 @@ class NewArticle extends React.Component {
return { __html: md.render(this.state.body) };
}
- getRawMarkupTitle() {
- var md = new Remarkable();
- return { __html: md.render(this.state.title) };
- }
componentDidMount() {
autosize(document.querySelectorAll('textarea'));
@@ -32,13 +28,16 @@ class NewArticle extends React.Component {
return (
);
}
}
diff --git a/client/assets/bootstrap.css b/client/assets/bootstrap.css
index fe794cf..af6143b 100644
--- a/client/assets/bootstrap.css
+++ b/client/assets/bootstrap.css
@@ -3962,7 +3962,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav > li > a:hover,
.nav > li > a:focus {
text-decoration: none;
- background-color: #eee;
+ background-color: transparent;
+ border: 1px solid #ff0066;
}
.nav > li.disabled > a {
color: #777;
@@ -4291,8 +4292,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin: 7.5px -15px;
}
.navbar-nav > li > a {
- padding-top: 20px;
- padding-bottom: 20px;
line-height: 20px;
}
@media (max-width: 767px) {
@@ -4326,9 +4325,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-nav > li {
float: left;
}
- .navbar-nav > li > a {
- padding-top: 20px;
- padding-bottom: 20px;
+ .navbar-nav > li {
+ margin-top: 10px;
}
}
.navbar-form {
diff --git a/client/assets/style.css b/client/assets/style.css
index a980f11..3f4b60a 100644
--- a/client/assets/style.css
+++ b/client/assets/style.css
@@ -117,12 +117,12 @@ input:focus
.new-article .input-title {
font-weight: 700;
- font-size: 4em;
+ font-size: 3em;
}
.new-article .input-body {
- font-family: "Vollkorn", sans-serif;
- font-size: 1.5em;
+ font-family: "Courier", sans-serif;
+ font-size: 1.2em;
}
textarea {
diff --git a/db/matterwiki.sqlite b/db/matterwiki.sqlite
index e674bba..ae711a1 100644
Binary files a/db/matterwiki.sqlite and b/db/matterwiki.sqlite differ