Merge branch 'master' of github.com:paulirish/css3please

paulirish · Sep 21, 2011 · 9b171f7 · 9b171f7
2 parents 11a0b74 + 1dac435
commit 9b171f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/index.html b/index.html
@@ -90,7 +90,7 @@ <h1>
 .box_gradient {
   background-color: <b g="0" i="s2Hex">#444444</b>;
   background-image: -webkit-gradient(linear, left top, left bottom, from(<b g="0" i="s2Hex">#444444</b>), to(<b g="1" i="s2Hex">#999999</b>)); <span class="comment">/* Saf4+, Chrome <span class="endcomment">*/</span></span>
-  background-image: -webkit-linear-gradient(top, <b g="0" i="s2Hex">#444444</b>, <b g="1" i="s2Hex">#999999</b>); <span class="comment">/* Chrome 10+, Saf5.1+ <span class="endcomment">*/</span></span>
+  background-image: -webkit-linear-gradient(top, <b g="0" i="s2Hex">#444444</b>, <b g="1" i="s2Hex">#999999</b>); <span class="comment">/* Chrome 10+, Saf5.1+, iOS 5+ <span class="endcomment">*/</span></span>
   background-image:    -moz-linear-gradient(top, <b g="0" i="s2Hex">#444444</b>, <b g="1" i="s2Hex">#999999</b>); <span class="comment">/* FF3.6 <span class="endcomment">*/</span></span>
   background-image:     -ms-linear-gradient(top, <b g="0" i="s2Hex">#444444</b>, <b g="1" i="s2Hex">#999999</b>); <span class="comment">/* IE10 <span class="endcomment">*/</span></span>
   background-image:      -o-linear-gradient(top, <b g="0" i="s2Hex">#444444</b>, <b g="1" i="s2Hex">#999999</b>); <span class="comment">/* Opera 11.10+ <span class="endcomment">*/</span></span>

diff --git a/javascript/javascript.js b/javascript/javascript.js
@@ -586,7 +586,7 @@ $('.rule_wrapper .comment a.off').live('click',function(){
  * http://www.faqts.com/knowledge_base/view.phtml/aid/1678/fid/1 and
  * http://blog.stevenlevithan.com/archives/faster-trim-javascript
  */
-String.prototype.trim = function() { 
+String.prototype.trim = String.prototype.trim || function() { 
 	var str = this;
 
 	// used by the String.prototype.trim()