Merge pull request #356 from stianlik/master

Some style improvements and jshint verification
collibra · Jan 19, 2013 · 3cb6883 · 3cb6883
2 parents 0398c2e + ace7205
commit 3cb6883
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 94 deletions.
diff --git a/jquery.wysiwyg.css b/jquery.wysiwyg.css
@@ -3,15 +3,12 @@ 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 { 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 div.toolbar-wrap { width: 100%; border-bottom: 1px solid #ccc; }
+div.wysiwyg ul.toolbar { list-style: none;  float: left; padding: 0 3px 0 3px; margin: 0; }
+div.wysiwyg ul.toolbar li { display: block; float: left; width: 18px; height: 18px; padding: 0; border: 1px solid transparent; margin: 3px 0 3px 0; text-indent: -5000px; background: url('jquery.wysiwyg.gif') no-repeat -640px -800px; cursor: pointer; -moz-user-select: none; -webkit-user-select: none; user-select: none; }
+div.wysiwyg ul.toolbar li.separator { background: none; width: 1px; height: 20px; margin: 3px 4px 3px 5px; border: none; border-left: 1px solid #ccc; }
+div.wysiwyg ul.toolbar li.wysiwyg-button-hover,div.wysiwyg ul.toolbar li.active { background-color: transparent; width: 18px; height: 18px; border: 1px solid rgb(208, 208, 208); border-left-color: #aaa; border-top-color: #aaa; }
+div.wysiwyg ul.toolbar li.disabled { background-color: transparent; opacity: 0.5; filter:alpha(opacity=50); cursor: auto; }
 
 div.wysiwyg ul.toolbar li.bold { background-position: -1px -15px; }
 div.wysiwyg ul.toolbar li.italic { background-position: -18px -15px; }
@@ -71,6 +68,7 @@ div.wysiwyg ul.toolbar li.cssWrap { background-position: -92px -106px; }
 div.wysiwyg-dialogRow { float:left; width:100%; font-size: 16px; }
 
 div.wysiwyg iframe { clear: left; background-color:white; padding:0px; margin:0; display:block; width: 100%; }
+div.wysiwyg > textarea { border: 0; outline: none; box-shadow: none; }
 
 /* dialog */
 .wysiwyg-dialog { position:fixed; top:50px; left:50px; width:450px; height:300px; background:transparent; font:14px "Helvetic Neue", Helvetica,Arial,sans-serif; }