Skip to content

Commit

Permalink
Fix for editor in AAQ in IE7. [bug 636019]
Browse files Browse the repository at this point in the history
  • Loading branch information
rlr committed Feb 28, 2011
1 parent 10ce771 commit a41f000
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions media/css/ie.css
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,10 @@ form div.attachments-upload img {
height: expression(this.scrollHeight > this.scrollWidth ? "120px" : "auto");
width: expression(this.scrollHeight < this.scrollWidth ? "120px" : "auto");
}

/* marky buttons */
div.editor-tools span.separator,
button.markup-toolbar-button {
display: block;
float: left;
}
2 changes: 1 addition & 1 deletion media/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ button.markup-toolbar-button {
height: 34px;
margin: 0 2px;
text-indent: -9999px;
width: 34px;
width: 36px;
}

div.editor-tools button:first-child {
Expand Down
2 changes: 1 addition & 1 deletion templates/includes/common_macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{% macro content_editor(field) %}
<div class="editor{% if field.errors %} invalid{% endif %}" data-media-search-url="{{ url('gallery.async') }}" data-media-gallery-url="{{ url('gallery.home') }}">
<div class="editor-tools"></div>
{{ field|safe }}
<div>{{ field|safe }}</div>
</div>
{% endmacro %}

Expand Down

0 comments on commit a41f000

Please sign in to comment.