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

Commit

Permalink
Replace Font Awesome with cf-icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Cranfill committed May 21, 2014
1 parent aeb2712 commit 2c05a5c
Show file tree
Hide file tree
Showing 32 changed files with 3,086 additions and 4,549 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ module.exports = function(grunt) {
* Create custom task aliases for our component build workflow.
*/
grunt.registerTask('vendor', ['bower', 'copy:docs_assets', 'concat:main', 'concat:lt-ie8']);
grunt.registerTask('default', ['concat:main', 'concat:lt-ie8', 'less', 'string-replace', 'autoprefixer', 'copy:docs', 'topdoc']);
grunt.registerTask('default', ['concat:main', 'concat:lt-ie8', 'less', 'autoprefixer', 'copy:docs', 'topdoc']);

};
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ This component can be used by itself, but it was made for Capital Framework,
a new front end framework developed at the
[Consumer Financial Protection Bureau](https://cfpb.github.io/).

(Includes [Font Awesome](http://fontawesome.io/) for icons until the CFPB icon
font is released.)

If you would like to take advantage of more components or if you're new to
Capital Framework, we encourage you to [start here](https://cfpb.github.io/capital-framework/).

Expand Down
6 changes: 2 additions & 4 deletions TERMS.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ author or the affirmer.
- [Rainbow](https://github.com/ccampbell/rainbow) by Craig Campbell is licensed
under Apache 2.0.
- The Brackets Theme by Garth Braithwaite is licensed under Apache 2.0.
- [Font Awesome](http://fontawesome.io) by Dave Gandy:
- Font licensed under the SIL OFL 1.1.
- CSS licensed under the MIT License.
- [Normalize](http://necolas.github.io/normalize.css/) by Nicolas Gallagher,
co-created with Jonathan Neal is licensed under MIT.
co-created with Jonathan Neal, is licensed under MIT.

8 changes: 2 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cf-buttons",
"version": "0.7.2",
"version": "0.8.0",
"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 All @@ -23,8 +23,8 @@
"main": "src/cf-buttons.less",
"dependencies": {
"cf-colors": "git://github.com/cfpb/cf-colors.git",
"cf-icons": "git://github.com/cfpb/cf-icons.git",
"cf-typography": "git://github.com/cfpb/cf-typography.git",
"font-awesome": "~3.2.1",
"normalize-css": "~3.0.0",
"normalize-legacy-addon": "git://github.com/cfpb/normalize-legacy-addon.git#0.1.0"
},
Expand All @@ -34,10 +34,6 @@
"less": "src/**/*.less",
"fonts": "src/fonts/*.*",
"js": "src/**/*.js"
},
"font-awesome": {
"css": "css/*.css",
"fonts": "font/*.*"
}
}
}
24 changes: 12 additions & 12 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@
<div>
<div>
<a href="#" class="btn">
<i class="btn-icon-left icon-chevron-left"><span class="jekyll-bug"></span></i>
<span class="btn-icon-left cf-icon cf-icon-left"></span>
Anchor Tag
</a>
<button class="btn">
<i class="btn-icon-left icon-chevron-left"><span class="jekyll-bug"></span></i>
<span class="btn-icon-left cf-icon cf-icon-left"></span>
Button Tag
</button>
</div><br>
Expand All @@ -139,21 +139,21 @@
<div>
<a href="#" class="btn">
Anchor Tag
<i class="btn-icon-right icon-chevron-right"><span class="jekyll-bug"></span></i>
<span class="btn-icon-right cf-icon cf-icon-right"></span>
</a>
<button class="btn">
Button Tag
<i class="btn-icon-right icon-chevron-right"><span class="jekyll-bug"></span></i>
<span class="btn-icon-right cf-icon cf-icon-right"></span>
</button>
</div><br>
</div>
<div>
<div>
<a href="#" class="btn">
<i class="icon-search"><span class="jekyll-bug"></span></i>
<span class="cf-icon cf-icon-search"></span>
</a>
<button class="btn">
<i class="icon-search"><span class="jekyll-bug"></span></i>
<span class="cf-icon cf-icon-search"></span>
</button>
</div><br>
</div>
Expand Down Expand Up @@ -203,35 +203,35 @@
<div>
<div class="btn-group">
<a href="#" class="btn">Anchor</a>
<a href="#" class="btn btn-compound-action"><i class="icon-caret-down"><span class="jekyll-bug"></span></i></a>
<a href="#" class="btn btn-compound-action"><span class="cf-icon cf-icon-down"></span></a>
</div><br>
<div class="btn-group">
<button class="btn">Button</button>
<button class="btn btn-compound-action"><i class="icon-caret-down"><span class="jekyll-bug"></span></i></button>
<button class="btn btn-compound-action"><span class="cf-icon cf-icon-down"></span></button>
</div><br>
</div><br>
</div>
<div>
<div>
<div class="btn-group">
<a href="#" class="btn btn-secondary">Anchor</a>
<a href="#" class="btn btn-secondary btn-compound-action"><i class="icon-caret-down"><span class="jekyll-bug"></span></i></a>
<a href="#" class="btn btn-secondary btn-compound-action"><span class="cf-icon cf-icon-down"></span></a>
</div><br>
<div class="btn-group">
<button class="btn btn-secondary">Button</button>
<button class="btn btn-secondary btn-compound-action"><i class="icon-caret-down"><span class="jekyll-bug"></span></i></button>
<button class="btn btn-secondary btn-compound-action"><span class="cf-icon cf-icon-down"></span></button>
</div>
</div><br>
</div>
<div>
<div>
<div class="btn-group">
<a href="#" class="btn btn-super">Anchor</a>
<a href="#" class="btn btn-super btn-compound-action"><i class="icon-caret-down"><span class="jekyll-bug"></span></i></a>
<a href="#" class="btn btn-super btn-compound-action"><span class="cf-icon cf-icon-down"></span></a>
</div><br>
<div class="btn-group">
<button class="btn btn-super">Button</button>
<button class="btn btn-super btn-compound-action"><i class="icon-caret-down"><span class="jekyll-bug"></span></i></button>
<button class="btn btn-super btn-compound-action"><span class="cf-icon cf-icon-down"></span></button>
</div>
</div><br>
</div>
Expand Down
Loading

0 comments on commit 2c05a5c

Please sign in to comment.