Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents 5554849 + 92722a5 commit 54bb56155f11a59acc89246afd18d95fe38681a6 @csswizardry committed Feb 28, 2013
Showing with 3 additions and 2 deletions.
  1. +1 −0 CHANGELOG.md
  2. +1 −1 beautons.css
  3. +1 −1 beautons.min.css
View
1 CHANGELOG.md
@@ -8,3 +8,4 @@
* **v0.2.4** Remove on-hover box shadow from inactive buttons
* **v0.2.5** Make soft button’s rounding method more robust
* **v0.3** Fix Firefox’ rendering of `input`s
+* **v0.4** Alter cursor style on disabled buttons
View
2 beautons.css
@@ -216,7 +216,7 @@
.btn--inactive:focus{
background-color:#ddd;
color:#777;
- cursor:text; /* [1] */
+ cursor:default; /* [1] */
box-shadow:none;
}
View
2 beautons.min.css
@@ -2,4 +2,4 @@
*
* @csswizardry -- csswizardry.com/beautons
*
- */.btn{display:inline-block;vertical-align:middle;white-space:nowrap;font-family:inherit;font-size:100%;cursor:pointer;border:0;margin:0;padding-top:0;padding-bottom:0;line-height:3;height:3em;padding-right:1em;padding-left:1em;background-color:#2c77ba;border-radius:4px;overflow:visible}.btn,.btn:hover,.btn:active,.btn:focus{text-decoration:none;color:#fff}.btn:hover{box-shadow:0 0 5px rgba(0,0,0,0.5)}.btn:active,.btn:focus{outline:0;box-shadow:0 0 5px rgba(0,0,0,0.5) inset}.btn::-moz-focus-inner{border:0;padding:0}.btn--small{padding-right:.5em;padding-left:.5em;line-height:2;height:2em}.btn--large{padding-right:1.5em;padding-left:1.5em;line-height:4;height:4em}.btn--huge{padding-right:2em;padding-left:2em;line-height:5;height:5em}.btn--full{width:100%;padding-right:0;padding-left:0;text-align:center}.btn--alpha{font-size:3rem}.btn--beta{font-size:2rem}.btn--gamma{font-size:1rem}.btn--natural{vertical-align:baseline;font-size:inherit;line-height:inherit;height:auto;padding-right:.5em;padding-left:.5em}.btn--positive{background-color:#4a993e;color:#fff}.btn--negative{background-color:#b33630;color:#fff}.btn--inactive,.btn--inactive:hover,.btn--inactive:active,.btn--inactive:focus{background-color:#ddd;color:#777;cursor:text;box-shadow:none}.btn--soft{border-radius:5em}.btn--hard{border-radius:0}
+ */.btn{display:inline-block;vertical-align:middle;white-space:nowrap;font-family:inherit;font-size:100%;cursor:pointer;border:0;margin:0;padding-top:0;padding-bottom:0;line-height:3;height:3em;padding-right:1em;padding-left:1em;background-color:#2c77ba;border-radius:4px;overflow:visible}.btn,.btn:hover,.btn:active,.btn:focus{text-decoration:none;color:#fff}.btn:hover{box-shadow:0 0 5px rgba(0,0,0,0.5)}.btn:active,.btn:focus{outline:0;box-shadow:0 0 5px rgba(0,0,0,0.5) inset}.btn::-moz-focus-inner{border:0;padding:0}.btn--small{padding-right:.5em;padding-left:.5em;line-height:2;height:2em}.btn--large{padding-right:1.5em;padding-left:1.5em;line-height:4;height:4em}.btn--huge{padding-right:2em;padding-left:2em;line-height:5;height:5em}.btn--full{width:100%;padding-right:0;padding-left:0;text-align:center}.btn--alpha{font-size:3rem}.btn--beta{font-size:2rem}.btn--gamma{font-size:1rem}.btn--natural{vertical-align:baseline;font-size:inherit;line-height:inherit;height:auto;padding-right:.5em;padding-left:.5em}.btn--positive{background-color:#4a993e;color:#fff}.btn--negative{background-color:#b33630;color:#fff}.btn--inactive,.btn--inactive:hover,.btn--inactive:active,.btn--inactive:focus{background-color:#ddd;color:#777;cursor:default;box-shadow:none}.btn--soft{border-radius:5em}.btn--hard{border-radius:0}

0 comments on commit 54bb561

Please sign in to comment.