Merge pull request #58 from weseek/master

release v1.1.2

CHANGES.md

@@ -1,6 +1,11 @@
 CHANGES
 ========
 
+## 1.1.2
+
+* Imprv: Brushup fonts and styles
+* Fix: Ensure to specity revision id when saving with Ctrl+S
+
 ## 1.1.1
 
 * Feature: Save with Ctrl+S

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "1.1.1-RC",
+  "version": "1.1.2-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",

resource/css/_page_list.scss

@@ -25,9 +25,11 @@
 
 .page-list, .content-main {
   .page-list-ul {
+    margin: 0;
     padding-left: 0;
 
     > li {
+      margin: 0;
       list-style: none;
       color: #666;
 

resource/css/_wiki.scss

@@ -53,7 +53,7 @@ div.body {
 
 .wiki {
   line-height: 1.8em;
-  font-size: 14px;
+  font-size: 15px;
 
   h1, h2, h3, h4, h5, h6 {
     margin-top: 1.6em;
@@ -65,6 +65,7 @@ div.body {
   }
 
   h1 {
+    margin-top: 2em;
     padding-bottom: 0.3em;
     font-size: 1.8em;
     border-bottom: solid 1px #ccc;
@@ -91,7 +92,7 @@ div.body {
 
   p {
     font-weight: normal;
-    margin: 20px 0;
+    margin: 15px 0;
   }
   blockquote {
     font-size: .9em;
@@ -146,7 +147,7 @@ div.body {
     margin: 20px 0;
 
     li {
-      margin: 10px 0;
+      margin: 5px 0;
       line-height: 1.8em;
     }
 

resource/js/legacy/crowi-form.js

@@ -374,8 +374,12 @@ $(function() {
 
     event.preventDefault();
 
+    const revisionInput = $('#page-form [name="pageForm[currentRevision]"]');
+
+    // generate data to post
     let data = {
       page_id: pageId,
+      revision_id: revisionInput.val(),
       body: $('#form-body').val(),
     }
 
@@ -393,7 +397,7 @@ $(function() {
         });
 
         // update currentRevision input
-        $('#page-form [name="pageForm[currentRevision]"]').val(page.revision._id);
+        revisionInput.val(page.revision._id);
 
         // TODO update $('#revision-body-content')
       })