Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:HelloElephant/Parade into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonTheDev committed Apr 24, 2018
2 parents f397320 + 0296c10 commit 2160cb2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Documentation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Manual Install

1. Clone [Parade](https://github.com/HelloElephant/Parade.git) repositories
1. Clone the [Parade](https://github.com/HelloElephant/Parade.git) repository
2. Add the contents of ***/Parade/Sources/***


Expand All @@ -12,7 +12,7 @@
1. Edit the project's podfile, and save

```
pod 'Parade', :git => 'https://github.com/HelloElephant/Parade.git', :tag => '0.2.0'
pod 'Parade', :git => 'https://github.com/HelloElephant/Parade.git', :tag => '1.0.0'
```
2. Install Parade by running

Expand All @@ -31,7 +31,7 @@ The installation instruction below for iOS and AppleTV
```
#Parade
git "https://github.com/HelloElephant/Parade.git" >= 0.2.0
git "https://github.com/HelloElephant/Parade.git" >= 1.0.0
```
2. Run `carthage update`. This will fetch dependencies into a [Carthage/Checkouts][] folder, then build each one.
3. In the application targets’ “General” settings tab, in the “Embedded Binaries” section, drag and drop each framework for use from the Carthage/Build folder on disk.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ There is a demo app included as part of the project that contains the following

| | Included Examples |
| ------------- | ------------- |
|![alt tag](/Documentation/assets/08_animated_demo.gif?raw=true)<br/>|The demo contains a single ``ParallaxImageViewController`` as the root, and displays these cells as examples in the following order:<br/><br/>- ``ParallaxIntroCollectionViewCell`` : Scale / Transform / Alpha<br/><br/>- ``ParallaxScaleCollectionViewCell`` : Scale / Center<br/><br/>- ``ParallaxDoubleImageCollectionViewCell`` : Center / Transform<br/><br/>- ``ParallaxImageAppearCollectionViewCell`` : Animation Chain Parallax<br/><br/>- ``ParallaxImageCollectionViewCell`` : Scale / Alpha / Transform <br/><br/>- ``ParallaxTheEndCollectionViewCell`` : Transform 3D<br/><br/><br/>Note: The examples also contain custom ranges discussed later in the documentation.<br/><br/><br/><br/><br/><br/><br/><br/>|
|![alt tag](/Documentation/assets/08_animated_demo.gif?raw=true)|The demo contains a single ``ParallaxImageViewController`` as the root, and displays these cells as examples in the following order:<br/><br/>- [``ParallaxIntroCollectionViewCell``](https://github.com/HelloElephant/Parade/blob/master/Parade-Demo/Parade-Demo/ParallaxCells/ParallaxIntroCollectionViewCell.swift) : Scale / Transform / Alpha<br/><br/>- [``ParallaxScaleCollectionViewCell``](https://github.com/HelloElephant/Parade/blob/master/Parade-Demo/Parade-Demo/ParallaxCells/ParallaxScaleCollectionViewCell.swift) : Scale / Center<br/><br/>- [``ParallaxDoubleImageCollectionViewCell``](https://github.com/HelloElephant/Parade/blob/master/Parade-Demo/Parade-Demo/ParallaxCells/ParallaxDoubleImageCollectionViewCell.swift) : Center / Transform<br/><br/>- [``ParallaxImageAppearCollectionViewCell``](https://github.com/HelloElephant/Parade/blob/master/Parade-Demo/Parade-Demo/ParallaxCells/ParallaxImageAppearCollectionViewCell.swift) : Animation Chain Parallax<br/><br/>- [``ParallaxImageCollectionViewCell``](https://github.com/HelloElephant/Parade/blob/master/Parade-Demo/Parade-Demo/ParallaxCells/ParallaxImageCollectionViewCell.swift) : Scale / Alpha / Transform <br/><br/>- [``ParallaxTheEndCollectionViewCell``](https://github.com/HelloElephant/Parade/blob/master/Parade-Demo/Parade-Demo/ParallaxCells/ParallaxTheEndCollectionViewCell.swift) : Transform 3D<br/><br/>Note: The examples also contain custom ranges discussed later in the documentation.<br/>|


# Installation
Expand All @@ -41,6 +41,7 @@ There is a demo app included as part of the project that contains the following

- If you **found a bug**, or **have a feature request**, open an issue.
- If you **want to contribute**, review the [Contribution Guidelines](/Documentation/CONTRIBUTING.md), and submit a pull request.
- All contributions must retrain **100%** Code Coverage

# Basic Use

Expand Down

0 comments on commit 2160cb2

Please sign in to comment.