Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dio-el-claire committed Jun 22, 2011
1 parent 0776d6b commit 3ca3b5d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/ellib/css/elcolorpicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
border:1px solid #ccc;
background:#fff;
padding:3px 2px 3px 3px;
z-index:10000; /* fight with ui.dialog 0_o */
z-index:99000; /* fight with ui.dialog 0_o */
position:absolute;
top:16px;
left:0;
Expand Down
2 changes: 1 addition & 1 deletion src/elrte.src.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
<!-- BEGIN DO_NOT_WOW -->
here is my fancy code
<!-- END DO_NOT_WOW -->
<span id="42" style="background:red url(http://localhost/git/elfinder/files/venusversusvirus_2_1024.jpg)" class="axd">test here</span>

<p>Полотенце, <a name="42"></a>возможно, <span> необходимый предмет ! </span>для межзвездного путешественника.</p> &nbsp; <br /> &nbsp;
<br>&nbsp;&nbsp;<p>Полотенце, возможно, самый необходимый предмет ! для межзвездного путешественника.</p>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
Expand Down
2 changes: 2 additions & 0 deletions src/elrte/css/elrte.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
padding:0; /* Joomla 1.6 compat */
background:url('../images/elrte-toolbar.png') no-repeat;
border:1px solid #ccc;
z-index:100;

}
/* активная и подсвеченная и неактивная кнопка */
.el-rte .toolbar ul li.hover { border:1px solid #54b9bf; }
Expand Down
4 changes: 2 additions & 2 deletions src/elrte/js/i18n/elrte.da.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*8
* Danish translation
* @author Steen Rabol <steen.rabol@gmail.com>
* @version 2011-01-05
Expand Down Expand Up @@ -205,6 +205,6 @@ elRTE.prototype.i18Messages.da = {
'Italian localization' : 'Italiensk oversættelse',
'Traditional Chinese localization' : 'Traditoinel kinesisk oversættelse',
'For more information about this software visit the' : 'For mere information, besøg ',
'elRTE website' : 'elRTE\'s hjemmeside',
'elRTE website' : 'elRTE\'s hjemmeside'
}
})(jQuery);
2 changes: 1 addition & 1 deletion src/elrte/js/ui/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ elRTE.prototype.ui.prototype.buttons.image = function(rte, name) {
$.each(this.src, function() {
$.each(this, function() {
if (this === self.src.main.src) {
this.bind('change', function() { self.rte.log('before'); self.updatePreview(); self.rte.log('after'); });
this.bind('change', function() { self.updatePreview(); });
} else if (this == self.src.main.width || this == self.src.main.height) {
this.bind('change', function(e) {self.updateDimesions(e);});
} else {
Expand Down

0 comments on commit 3ca3b5d

Please sign in to comment.