allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [32/42] allura git commit: [#7897] ticket:814 Fix editor styles for wiki
Date Wed, 22 Jul 2015 12:31:28 GMT
[#7897] ticket:814 Fix editor styles for wiki


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/126d7c4f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/126d7c4f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/126d7c4f

Branch: refs/heads/ib/7897
Commit: 126d7c4f3c8c27effb3aa6975856010996b37c26
Parents: bc9431b
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Jul 7 17:16:58 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Wed Jul 22 10:59:52 2015 +0300

----------------------------------------------------------------------
 ForgeWiki/forgewiki/templates/wiki/page_edit.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/126d7c4f/ForgeWiki/forgewiki/templates/wiki/page_edit.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index bdd35c6..c9596b7 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -25,8 +25,13 @@
 
 {% block extra_css %}
 <style type="text/css">
-  textarea[name="text"]{
+  .markdown_edit {
     height: 600px;
+    min-height: 600px;
+  }
+  .markdown_edit .CodeMirror {
+    height: auto;
+    min-height: 520px;
   }
 </style>
 {% endblock %}
@@ -85,7 +90,6 @@
 {% block wiki_extra_js %}
 <script type="text/javascript">
   /*<![CDATA[*/
-  $('textarea.auto_resize').autosize();
   $('span.removable').click(function(e){
     var vals = $('#page_edit_form').serialize();
     var del_name = $('input', this)[0].name.replace('.id','.delete');


Mime
View raw message