Permalink
Browse files

Design updates

  • Loading branch information...
1 parent 4480bf3 commit 3449b6641606a161fa1516e397ccb2cdd9efeea5 @gintsmurans gintsmurans committed May 12, 2012
Showing with 48 additions and 48 deletions.
  1. BIN jquery.wysiwyg.bg.png
  2. +47 −47 jquery.wysiwyg.css
  3. BIN jquery.wysiwyg.gif
  4. +1 −1 jquery.wysiwyg.js
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,77 +1,77 @@
-div.wysiwyg { border: 1px solid #999; padding: 5px; background: #fff url("jquery.wysiwyg.bg.png") repeat-x top; }
+div.wysiwyg { border: 1px solid #999; padding: 0; background: #fff url('jquery.wysiwyg.bg.png') repeat-x top; }
div.wysiwyg * { margin: 0; padding: 0; }
div.wysiwyg ul.toolbar li.jwysiwyg-custom-command { overflow: hidden; }
div.wysiwyg ul.toolbar { border-bottom: 1px solid #ccc; float: left; width: 100%; padding: 0; }
div.wysiwyg ul.toolbar li { list-style: none; float: left; margin: 1px 2px 3px 0; background: rgb(240, 240, 240); -moz-user-select: none; -webkit-user-select: none; user-select: none; clear: none; padding: 0 }
-div.wysiwyg ul.toolbar li.separator { width: 1px; height: 16px; margin: 0 4px; border-left: 1px solid #ccc; }
-div.wysiwyg ul.toolbar li { text-indent: -5000px; opacity: 0.85; filter: alpha(opacity=85); display: block; width: 16px; height: 16px; background: url('jquery.wysiwyg.gif') no-repeat -64px -80px; border: 1px dotted rgb(240, 240, 240); cursor: pointer; margin: 0px; }
-div.wysiwyg ul.toolbar li.wysiwyg-button-hover, div.wysiwyg ul.toolbar li.active { opacity: 1.00; filter:alpha(opacity=100); border: 1px outset rgb(224, 224, 224); }
-div.wysiwyg ul.toolbar li.active { background-color: rgb(255, 255, 64); border: 1px solid rgb(208, 208, 208); border-left-color: #aaa; border-top-color: #aaa; margin: 0; }
+div.wysiwyg ul.toolbar li.separator { background: none; width: 1px; height: 20px; margin: 0 4px 0px 5px; border: none; border-left: 1px solid #ccc; }
+div.wysiwyg ul.toolbar li { text-indent: -5000px; display: block; width: 18px; height: 18px; background: url('jquery.wysiwyg.gif') no-repeat -640px -800px; border: 1px solid transparent; cursor: pointer; margin: 0px; }
+div.wysiwyg ul.toolbar li.wysiwyg-button-hover, div.wysiwyg ul.toolbar li.active { background-color: #DDD; border: 1px solid transparent; }
+div.wysiwyg ul.toolbar li.active { background-color: rgb(255, 255, 64); border: 1px solid rgb(208, 208, 208); border-left-color: #aaa; border-top-color: #aaa; height: 18px; width: 18px; padding: -1px 0 0 -1px; margin: 0; }
div.wysiwyg ul.toolbar li.disabled, div.wysiwyg ul.toolbar li.wysiwyg-button-hover.disabled, div.wysiwyg ul.toolbar li.active.disabled { opacity: 0.5; filter:alpha(opacity=50); border: 0px none transparent; padding: 1px; cursor: auto; }
-div.wysiwyg ul.toolbar li.bold { background-position: 0 -16px; }
-div.wysiwyg ul.toolbar li.italic { background-position: -16px -16px; }
-div.wysiwyg ul.toolbar li.strikeThrough { background-position: -32px -16px; }
-div.wysiwyg ul.toolbar li.underline { background-position: -48px -16px; }
+div.wysiwyg ul.toolbar li.bold { background-position: -1px -15px; }
+div.wysiwyg ul.toolbar li.italic { background-position: -18px -15px; }
+div.wysiwyg ul.toolbar li.strikeThrough { background-position: -36px -15px; }
+div.wysiwyg ul.toolbar li.underline { background-position: -55px -15px; }
div.wysiwyg ul.toolbar li.highlight { background-position: -48px -96px; }
-div.wysiwyg ul.toolbar li.justifyLeft { background-position: 0 0; }
-div.wysiwyg ul.toolbar li.justifyCenter { background-position: -16px 0; }
-div.wysiwyg ul.toolbar li.justifyRight { background-position: -32px 0; }
-div.wysiwyg ul.toolbar li.justifyFull { background-position: -48px 0; }
+div.wysiwyg ul.toolbar li.justifyLeft { background-position: 0 2px; }
+div.wysiwyg ul.toolbar li.justifyCenter { background-position: -18px 2px; }
+div.wysiwyg ul.toolbar li.justifyRight { background-position: -36px 2px; }
+div.wysiwyg ul.toolbar li.justifyFull { background-position: -55px 2px; }
-div.wysiwyg ul.toolbar li.indent { background-position: -64px 0; }
-div.wysiwyg ul.toolbar li.outdent { background-position: -80px 0; }
+div.wysiwyg ul.toolbar li.indent { background-position: -74px 1px; }
+div.wysiwyg ul.toolbar li.outdent { background-position: -92px 1px; }
-div.wysiwyg ul.toolbar li.subscript { background-position: -64px -16px; }
-div.wysiwyg ul.toolbar li.superscript { background-position: -80px -16px; }
+div.wysiwyg ul.toolbar li.subscript { background-position: -74px -15px; }
+div.wysiwyg ul.toolbar li.superscript { background-position: -92px -15px; }
-div.wysiwyg ul.toolbar li.undo { background-position: 0 -64px; }
-div.wysiwyg ul.toolbar li.redo { background-position: -16px -64px; }
+div.wysiwyg ul.toolbar li.undo { background-position: 0px -68px; }
+div.wysiwyg ul.toolbar li.redo { background-position: -18px -69px; }
-div.wysiwyg ul.toolbar li.insertOrderedList { background-position: -32px -48px; }
-div.wysiwyg ul.toolbar li.insertUnorderedList { background-position: -16px -48px; }
-div.wysiwyg ul.toolbar li.insertHorizontalRule { background-position: 0 -48px; }
+div.wysiwyg ul.toolbar li.insertOrderedList { background-position: -36px -49px; }
+div.wysiwyg ul.toolbar li.insertUnorderedList { background-position: -19px -49px; }
+div.wysiwyg ul.toolbar li.insertHorizontalRule { background-position: 0 -49px; }
-div.wysiwyg ul.toolbar li.h1 { background-position: 0 -32px; }
-div.wysiwyg ul.toolbar li.h2 { background-position: -16px -32px; }
-div.wysiwyg ul.toolbar li.h3 { background-position: -32px -32px; }
-div.wysiwyg ul.toolbar li.h4 { background-position: -48px -32px; }
-div.wysiwyg ul.toolbar li.h5 { background-position: -64px -32px; }
-div.wysiwyg ul.toolbar li.h6 { background-position: -80px -32px; }
+div.wysiwyg ul.toolbar li.h1 { background-position: 0px -31px; }
+div.wysiwyg ul.toolbar li.h2 { background-position: -18px -31px; }
+div.wysiwyg ul.toolbar li.h3 { background-position: -36px -31px; }
+div.wysiwyg ul.toolbar li.h4 { background-position: -55px -31px; }
+div.wysiwyg ul.toolbar li.h5 { background-position: -74px -31px; }
+div.wysiwyg ul.toolbar li.h6 { background-position: -92px -31px; }
-div.wysiwyg ul.toolbar li.paragraph { background-position: 0px -96px; }
-div.wysiwyg ul.toolbar li.colorpicker { background-position: -16px -96px; }
-div.wysiwyg ul.toolbar li.fullscreen { background-position: -32px -96px; }
+div.wysiwyg ul.toolbar li.paragraph { background-position: 0px -106px; }
+div.wysiwyg ul.toolbar li.colorpicker { background-position: -18px -106px; }
+div.wysiwyg ul.toolbar li.fullscreen { background-position: -36px -106px; }
-div.wysiwyg ul.toolbar li.cut { background-position: -32px -64px; }
-div.wysiwyg ul.toolbar li.copy { background-position: -48px -64px; }
-div.wysiwyg ul.toolbar li.paste { background-position: -64px -64px; }
-div.wysiwyg ul.toolbar li.insertTable { background-position: -64px -48px; }
+div.wysiwyg ul.toolbar li.cut { background-position: -36px -68px; }
+div.wysiwyg ul.toolbar li.copy { background-position: -55px -68px; }
+div.wysiwyg ul.toolbar li.paste { background-position: -74px -68px; }
+div.wysiwyg ul.toolbar li.insertTable { background-position: -74px -49px; }
-div.wysiwyg ul.toolbar li.increaseFontSize { background-position: -16px -80px; }
-div.wysiwyg ul.toolbar li.decreaseFontSize { background-position: -32px -80px; }
+div.wysiwyg ul.toolbar li.increaseFontSize { background-position: -18px -87px; }
+div.wysiwyg ul.toolbar li.decreaseFontSize { background-position: -36px -87px; }
-div.wysiwyg ul.toolbar li.createLink { background-position: -80px -48px; }
-div.wysiwyg ul.toolbar li.unLink { background-position: -64px -80px; }
-div.wysiwyg ul.toolbar li.insertImage { background-position: -80px -80px; }
+div.wysiwyg ul.toolbar li.createLink { background-position: -92px -48px; }
+div.wysiwyg ul.toolbar li.unLink { background-position: -74px -87px; }
+div.wysiwyg ul.toolbar li.insertImage { background-position: -92px -87px; }
-div.wysiwyg ul.toolbar li.html { background-position: -48px -48px; }
-div.wysiwyg ul.toolbar li.removeFormat { background-position: -80px -64px; }
+div.wysiwyg ul.toolbar li.html { background-position: -55px -49px; }
+div.wysiwyg ul.toolbar li.removeFormat { background-position: -92px -68px; }
-div.wysiwyg ul.toolbar li.empty { background-position: -64px -80px; }
+div.wysiwyg ul.toolbar li.empty { background-position: -73px -86px; }
-div.wysiwyg ul.toolbar li.code { background-position: -64px -96px; }
-div.wysiwyg ul.toolbar li.cssWrap { background-position: -80px -96px; }
+div.wysiwyg ul.toolbar li.code { background-position: -74px -106px; }
+div.wysiwyg ul.toolbar li.cssWrap { background-position: -92px -106px; }
div.wysiwyg-dialogRow { float:left; width:100%; font-size: 16px; }
-div.wysiwyg iframe { border: 1px solid #999; clear: left;
+div.wysiwyg iframe { clear: left;
-moz-box-shadow :inset 0 0 10px rgba(0, 0, 0, 0.4);
-webkit-box-shadow :inset 0 0 10px rgba(0, 0, 0, 0.4);
box-shadow :inset 0 0 10px rgba(0, 0, 0, 0.4);
@@ -93,4 +93,4 @@ background-color:white; padding:0px; margin:0; display:block; width: 100%; }
.wysiwyg-dialog-content form.wysiwyg .form-row input.width-auto { width:auto; }
.wysiwyg-dialog-content form.wysiwyg input.width-small { width:50px; min-width:50px; max-width:50px; }
.wysiwyg-dialog-content form.wysiwyg input, .wysiwyg-dialog form.wysiwyg select { padding:2px; width:100%; margin:2px; }
-.wysiwyg-dialog-content form.wysiwyg input[type=submit], .wysiwyg-dialog form.wysiwyg input[type=reset] { padding:2px 7px; width:auto; }
+.wysiwyg-dialog-content form.wysiwyg input[type=submit], .wysiwyg-dialog form.wysiwyg input[type=reset] { padding:2px 7px; width:auto; }
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1285,7 +1285,7 @@ html: '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.o
this.editor.css({
minHeight: (newY - 6).toString() + "px",
// fix for issue 12 ( http://github.com/akzhan/jwysiwyg/issues/issue/12 )
- width: (newX > 50) ? (newX - 8).toString() + "px" : ""
+ width: (newX > 50) ? newX.toString() + "px" : ""
});
if ($.browser.msie && parseInt($.browser.version, 10) < 7) {
this.editor.css("height", newY.toString() + "px");

0 comments on commit 3449b66

Please sign in to comment.