allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject allura git commit: [#7950] avoid conflicting height declarations for wiki editor
Date Fri, 07 Aug 2015 14:11:04 GMT
Repository: allura
Updated Branches:
  refs/heads/db/7950 d884945e3 -> 8a226bd59


[#7950] avoid conflicting height declarations for wiki editor


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

Branch: refs/heads/db/7950
Commit: 8a226bd59b0a8c03c8af9848403285b67cc4b886
Parents: d884945
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Aug 7 14:10:49 2015 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Aug 7 14:10:49 2015 +0000

----------------------------------------------------------------------
 ForgeWiki/forgewiki/templates/wiki/page_edit.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/8a226bd5/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 fa0e95e..4e9584b 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -26,8 +26,7 @@
 {% block extra_css %}
 <style type="text/css">
   .markdown_edit .CodeMirror {
-    height: auto;
-    min-height: 600px;
+    height: 500px;  /* match max-height in markitup_sf.css */
   }
 </style>
 {% endblock %}


Mime
View raw message