merge leanote/leanote-ios@1fa04c6

FlyingRadish · Feb 9, 2017 · 7076aaf · 7076aaf
1 parent 8898a5c
commit 7076aaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/assets/markdownEditor/all.css b/app/src/main/assets/markdownEditor/all.css
@@ -912,7 +912,7 @@ div.jGrowl div.jGrowl-closer {
 }
 .preview-container, 
 #preview-contents, 
-.wmd-preview-section {
+.md-table {
 	overflow-x: auto; /*解决长表格无法滚动问题*/ 
 }
 .wmd-prompt-background {

diff --git a/app/src/main/assets/markdownEditor/all.js b/app/src/main/assets/markdownEditor/all.js
@@ -14267,7 +14267,7 @@ define("libs/Markdown.Converter", function(){});
 
       // build html
       var cls = self.tableClass ? ' class="' + self.tableClass + '"' : '';
-      var html = ['<table', cls, '>\n', '<thead>\n', '<tr>\n'].join('');
+      var html = ['<div class="md-table"><table', cls, '>\n', '<thead>\n', '<tr>\n'].join('');
 
       // build column headers.
       for (i = 0; i < colCount; i++) {
@@ -14296,7 +14296,7 @@ define("libs/Markdown.Converter", function(){});
         html += "</tr>\n";
       }
 
-      html += "</table>\n";
+      html += "</table></div>\n";
 
       // replace html with placeholder until postConversion step
       return self.hashExtraBlock(html);