Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
csswizardry committed Feb 26, 2013
2 parents 7eed7db + c749b14 commit e957a09
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -4,3 +4,4 @@
* **v0.2** Add basic, initial support for `input` and `button` elements
* **v0.2.1** Add some simple hover and focus styles
* **v0.2.2** Normalise natural buttons’ vertical alignment
* **v0.2.3** Add warning about using beautons on inputs in Firefox
30 changes: 18 additions & 12 deletions beautons.css
Expand Up @@ -39,17 +39,19 @@
/**
* Base button styles.
*
* 1. Allow us to better style box model properties.
* 2. Line different sized buttons up a little nicer.
* 3. Stop buttons wrapping and looking broken.
* 4. Make buttons inherit font styles.
* 5. Force all elements using beautons to appear clickable.
* 6. Normalise box model styles.
* 7. If the button’s text is 1em, and the button is (3 * font-size) tall, then
* there is 1em of space above and below that text. We therefore apply 1em
* of space to the left and right, as padding, to keep consistent spacing.
* 8. Basic cosmetics for default buttons. Change or override at will.
* 9. Don’t allow buttons to have underlines; it kinda ruins the illusion.
* 1. Allow us to better style box model properties.
* 2. Line different sized buttons up a little nicer.
* 3. Stop buttons wrapping and looking broken.
* 4. Make buttons inherit font styles.
* 5. Force all elements using beautons to appear clickable.
* 6. Normalise box model styles.
* 7. If the button’s text is 1em, and the button is (3 * font-size) tall, then
* there is 1em of space above and below that text. We therefore apply 1em
* of space to the left and right, as padding, to keep consistent spacing.
* 8. Basic cosmetics for default buttons. Change or override at will.
* 9. Unfortunately, `line-height` won’t work on `input`s in Firefox, use a
* `button` element instead.
* 10. Don’t allow buttons to have underlines; it kinda ruins the illusion.
*/
.btn{
display:inline-block; /* [1] */
Expand All @@ -70,9 +72,13 @@
border-radius:4px; /* [8] */
}

input.btn{
outline:10px solid red; /* [9] */
}

.btn,
.btn:hover{
text-decoration:none; /* [9] */
text-decoration:none; /* [10] */
}

.btn:hover{
Expand Down
2 changes: 1 addition & 1 deletion beautons.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e957a09

Please sign in to comment.