You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/07/13 19:30:14 UTC
[17/18] allura git commit: [#8088] Fixed design changes on editor
[#8088] Fixed design changes on editor
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3a52e475
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3a52e475
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3a52e475
Branch: refs/heads/master
Commit: 3a52e475b9e818a2ac2933c2ea7aaf301ed0d2c6
Parents: 8fd25cf
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jul 1 13:10:22 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:30 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 24 ++++++++++++++++++--
Allura/allura/templates/widgets/edit_post.html | 8 +++----
.../allura/templates/widgets/post_widget.html | 2 +-
.../allura/templates/widgets/thread_widget.html | 9 +++++---
4 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index c838786..2335f0d 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3507,8 +3507,6 @@ fieldset.preferences legend {
}
.discussion-post .row .emboss{
- //un-emboss image for discussions
-
box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
@@ -3548,6 +3546,28 @@ fieldset.preferences legend {
font-size: 0.7em;
}
+.reply .bubble::before{
+ display:none;
+}
+
+.reply .gravatar{
+ padding-top: 33px;
+}
+
+.reply .markdown_edit .bubble{
+ padding-left: 5px;
+}
+
+div .bubble .CodeMirror {
+ border-top: 1px #bbb solid !important;
+ border-bottom: 1px #bbb solid !important;
+ width: 100%;
+}
+
+.bubble .edit_markdown_form{
+ padding-left: 5px;
+}
+
@media print{
body{
background-color: #FFFFFF;
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/templates/widgets/edit_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/edit_post.html b/Allura/allura/templates/widgets/edit_post.html
index b3d814c..f47fcf8 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -17,7 +17,7 @@
under the License.
-#}
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
-<div>
+<div class="edit_markdown_form">
<form id="edit_{{ action[-4:] }}" method="post" action="{{action}}"
enctype="multipart/form-data">
{% if show_subject %}
@@ -26,10 +26,10 @@
{% endif %}
{{widget.display_field(widget.fields.text)}}
<input type="hidden" class="original_value" value="{{value.text}}">
- <span class="arw"><span></span></span><br/>
+ <span class="arw"><span></span></span>
<div style="clear:both"></div>
- <input type="submit" value="{{submit_text}}"/>
- <a href="#" class="btn link cancel_edit_post">Cancel</a>
+ <input type="submit" value="{{submit_text}}" />
+ <a href="#" class="ui-button btn link cancel_edit_post">Cancel</a>
<a href="#" class="btn link attachment_form_add_button">Add attachments</a>
<input type="file" class="text attachment_form_fields" style="display:none" multiple="True" name="{{att_name}}" {% if att_id %}id="{{att_id}}"{% endif %}/>
{% if widget.antispam %}{% for fld in g.antispam.extra_fields() %}
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 3418d98..93079a0 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -146,7 +146,7 @@
</small>
</p>
</div>
- <div class="grid-14" style="width: {{indent <= 40 and 625-indent*10 or 225}}px">
+ <div class="grid-14 bubble" style="width: {{indent <= 40 and 625-indent*10 or 225}}px">
{{widgets.edit_post.display(
submit_text='Post Reply',
action=value.url()+'reply',
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index 256ad00..fa26fd7 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -52,8 +52,9 @@
{% if h.has_access(value, 'post')() %}
<div id="new_post_holder">
<span id="add_comment"></span>
- <div class="row reply">
- <div class="grid-2 tcenter">
+ <div class="row" style="padding-top:10px;">
+ <div class="reply">
+ <div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
<small>
@@ -62,8 +63,10 @@
</p>
</div>
<div class="grid-17">
- {{widgets.edit_post.display(submit_text='Post', action=value.url() + 'post')}}
+ {{widgets.edit_post.display(submit_text='Post', action=value.url() + 'post')}}
+ </div>
</div>
</div>
</div>
+
{% endif %}