You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/08/07 16:41:19 UTC
[1/2] allura git commit: [#7950] set a max height to the markdown
editor
Repository: allura
Updated Branches:
refs/heads/master dc857c58f -> 8a226bd59
[#7950] set a max height to the markdown editor
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d884945e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d884945e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d884945e
Branch: refs/heads/master
Commit: d884945e3d68596f0e28c1a0502273461e956046
Parents: dc857c5
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu Aug 6 17:14:34 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 6 17:14:34 2015 +0000
----------------------------------------------------------------------
Allura/allura/lib/widgets/resources/css/markitup_sf.css | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d884945e/Allura/allura/lib/widgets/resources/css/markitup_sf.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/markitup_sf.css b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
index 9712461..03822f4 100644
--- a/Allura/allura/lib/widgets/resources/css/markitup_sf.css
+++ b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
@@ -24,12 +24,14 @@
}
.markdown_edit .CodeMirror {
min-height: 60px;
+ height: auto;
border-bottom: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.markdown_edit .CodeMirror-scroll {
min-height: 60px;
+ max-height: 500px;
}
.markdown_edit .editor-statusbar {
border: 1px solid #ddd;
[2/2] allura git commit: [#7950] avoid conflicting height
declarations for wiki editor
Posted by je...@apache.org.
[#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/master
Commit: 8a226bd59b0a8c03c8af9848403285b67cc4b886
Parents: d884945
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Aug 7 14:10:49 2015 +0000
Committer: Dave Brondsema <db...@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 %}