mirror of
https://github.com/Llewellynvdm/front-end-frameworks.git
synced 2025-01-04 21:15:20 +00:00
Merge branch 'patch-1' of https://github.com/laxcrosi/front-end-frameworks into laxcrosi-patch-1
Conflicts: README.md
This commit is contained in:
commit
b1e8358fbd
14
README.md
14
README.md
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user