playground
/
isotope
mirror of https://github.com/metafizzy/isotope
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge branch 'master' into gh-pages

v1
David DeSandro 12 years ago
parent
091ee2a5d9 e97d11299a
commit
3860d6473c
2 changed files with 9 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      CONTRIBUTING.mdown
  2. 24
      README.mdown

8
CONTRIBUTING.mdown
Unescape View File

@ -1,3 +1,11 @@
## Development freeze
I've got my hands full working on [Packery](metafizzy.co/blog/packery-preview) for the next couple months.
+ :cry: Development on Isotope is stopped for a while
+ :sleeping: I won't be snappily responding to new issues
+ :smile: When development starts back up on Isotope, the gains made building Packery will be ported over to Isotope.
## Submitting issues ## Submitting issues
### Read the Help page ### Read the Help page

24
README.mdown
Unescape View File

@ -9,7 +9,7 @@ View this project live at [http://isotope.metafizzy.co](http://isotope.metafizzy
## Licensing ## Licensing
**Commercial use requires purchase of one-time license fee per developer seat.** Commercial use includes any application that makes you money. This includes portfolio sites and premium templates. Commercial licenses may be purchased at [http://metafizzy.co#licenses](http://metafizzy.co#licenses). **Commercial use requires purchase of one-time license fee per developer.** Commercial use includes any application that makes you money. This includes portfolio sites and premium templates. Commercial licenses may be purchased at [http://metafizzy.co#licenses](http://metafizzy.co#licenses).
Use in non-commercial and personal applications is free. Use in non-commercial and personal applications is free.
@ -31,28 +31,6 @@ jekyll --server --auto
Then view the live site at [http://localhost:4000](http://localhost:4000). Then view the live site at [http://localhost:4000](http://localhost:4000).
## Including Isotope as a submodule
The _module_ branch has just `jquery.isotope.js` and `jquery.isotope.min.js`, perfect for adding to your repo as a [submodule](http://dropshado.ws/post/20058825150/git-submodules).
``` bash
git submodule add https://github.com/desandro/isotope.git
cd isotope/
git checkout module
git pull origin module
cd ../
git submodule update --init
```
Then you can reference `isotope/jquery.isotope.min.js` within your own project.
To pull in the lastest version of the isotope submodule:
``` bash
cd isotope/
git pull origin module
```
## Changelog ## Changelog
View the [commit history](https://github.com/desandro/isotope/commits/master/jquery.isotope.js) for a complete robust list of changes to the script. View the [commit history](https://github.com/desandro/isotope/commits/master/jquery.isotope.js) for a complete robust list of changes to the script.

Write Preview
Loading…
Cancel
Save