Merge branch 'master' into button2532035

brianjmiller · Mar 31, 2012 · 38b7340 · 38b7340
2 parents 6ac2e49 + 65883e1
commit 38b7340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/button/css/cssbutton.css b/src/button/css/cssbutton.css
@@ -122,6 +122,7 @@ a.yui3-button {
 
 /* Night */
 .yui3-skin-night .yui3-button {
+    border: 0px;
     background-color: #343536;
     color: #DCDCDC;
     -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.25) inset, 0 2px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.15);

diff --git a/src/button/docs/partials/cssbutton-source-css.mustache b/src/button/docs/partials/cssbutton-source-css.mustache
@@ -31,13 +31,13 @@
 }
 
 .yui3-button-icon-bold {
-    background-position: 1px -1px;
+    background-position: 1px 1px;
 }
 
 .yui3-button-icon-italic {
-    background-position: 1px -37px;
+    background-position: 1px -35px;
 }
 
 .yui3-button-icon-underline {
-    background-position: 1px -73px;
+    background-position: 1px -71px;
 }
diff --git a/src/button/docs/partials/cssbutton-source.mustache b/src/button/docs/partials/cssbutton-source.mustache
@@ -20,17 +20,14 @@
 <h4>Icon Buttons</h4>
 <button class='yui3-button'>
     <span class='yui3-button-icon yui3-button-icon-bold'></span>
-    <span class='yui3-button-label'>old</span>
 </button>
 
 <button class='yui3-button'>
     <span class='yui3-button-icon yui3-button-icon-italic'></span>
-    <span class='yui3-button-label'>talic</span>
 </button>
 
 <button class='yui3-button'>
     <span class='yui3-button-icon yui3-button-icon-underline'></span>
-    <span class='yui3-button-label'>nderline</span>
 </button>
 
 <h4>Image Button</h4>