Skip to content
This repository has been archived by the owner on Jan 31, 2018. It is now read-only.

Commit

Permalink
Merge pull request #44 from himedlooff/disabled
Browse files Browse the repository at this point in the history
You can now use the disabled attribute in place of .btn__disabled if you want to.
  • Loading branch information
Scotchester committed May 19, 2015
2 parents 93c461b + 043a4de commit 9a24df3
Show file tree
Hide file tree
Showing 7 changed files with 652 additions and 33 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
All notable changes to this project will be documented in this file.
We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.

## 1.5.1 - 2015-05-18

### Added
- You can now use the `disabled` attribute in place of `btn__disabled` if you want to.

## 1.5.0 - 2015-05-18

### Added
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cf-buttons",
"version": "1.5.0",
"version": "1.5.1",
"description": "Button styles including default, secondary, destructive, disabled, super, and compound buttons, button links, buttons with icons, and button groups for Capital Framework.",
"keywords": [
"capital-framework",
Expand Down
16 changes: 16 additions & 0 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,15 @@
<a href="#" class="btn btn__disabled">Anchor Tag</a>
<button class="btn btn__disabled">Button Tag</button>
<input type="submit" value="Input Tag" class="btn btn__disabled">
<button class="btn" disabled>Button Tag w/ disabled attr</button>
</div><br>
</div>
<div>
<div>
<a href="#" class="btn btn__disabled focus">Anchor Tag</a>
<button class="btn btn__disabled focus">Button Tag</button>
<input type="submit" value="Input Tag" class="btn btn__disabled focus">
<button class="btn focus" disabled>Button Tag w/ disabled attr</button>
</div><br>
</div>
</div>
Expand Down Expand Up @@ -201,6 +203,10 @@
<span class="btn_icon__left cf-icon cf-icon-left"></span>
Button Tag
</button>
<button class="btn" disabled>
<span class="btn_icon__left cf-icon cf-icon-left"></span>
Button Tag w/ disabled attr
</button>
</div><br>
</div>
<div>
Expand Down Expand Up @@ -243,6 +249,10 @@
Button Tag
<span class="btn_icon__right cf-icon cf-icon-right"></span>
</button>
<button class="btn" disabled>
Button Tag w/ disabled attr
<span class="btn_icon__right cf-icon cf-icon-right"></span>
</button>
</div><br>
</div>
<div>
Expand Down Expand Up @@ -345,6 +355,12 @@
</button>
<br>
<br>
<button class="btn btn__grouped-first" disabled>Button w/ disabled attr</button>
<button class="btn btn__grouped-last btn__compound-action" disabled>
<span class="cf-icon cf-icon-down btn__grouped-last"></span>
</button>
<br>
<br>
<a href="#" class="btn btn__grouped-first btn__super">Anchor</a>
<a href="#" class="btn btn__grouped-last btn__super btn__compound-action">
<span class="cf-icon cf-icon-down btn__grouped-last"></span>
Expand Down
Loading

0 comments on commit 9a24df3

Please sign in to comment.