knowledge
/
front-end-frameworks
mirror of https://github.com/Llewellynvdm/front-end-frameworks.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'patch-1' of https://github.com/laxcrosi/front-end-frameworks into laxcrosi-patch-1 

Conflicts:
	README.md
This commit is contained in:
Hosein Emrani 2014-07-17 23:26:33 +04:30
parent d8356f6abf f137df9e14
commit b1e8358fbd
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -457,6 +457,7 @@ The web is a responsive place, from your lithe & lively development process to y
**Github:** https://github.com/ericam/susy/
<<<<<<< HEAD
## inuit.css
> A powerful, scalable, Sass-based, [BEM](http://bem.info/), OOCSS framework.
@ -468,3 +469,16 @@ inuit.css is a Sass based, Object Oriented framework that is full of objects and
**Website:** http://inuitcss.com/
**Github:** https://github.com/csswizardry/inuit.css/
=======
## Bijou
> A beautiful CSS framework under 2kb
A small, yet beautiful CSS framework that weighs in under 2kb.
**Responsive:** Yes
**Website:** http://andhart.github.io/bijou
**Github:** https://github.com/andhart/bijou
>>>>>>> f137df9e14d0b4b8ffd09f8cfddfc0b487d5e823