Skip to content

Commit 2e75718

Browse files
committed
Merge branch 'master' of github.com:isair/ManualLayout
2 parents 485a3d5 + 71c9d44 commit 2e75718

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language: objective-c
2-
osx_image: xcode61
2+
osx_image: beta-xcode6.3
33
script:
44
- xctool -project ManualLayout.xcodeproj -scheme ManualLayout build

ManualLayout.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
66

77
s.homepage = 'https://github.com/isair/ManualLayout'
88
s.author = { 'Baris Sencan' => 'barissncn@gmail.com' }
9-
s.social_media_url = 'https://twitter.com/bsencan91'
9+
s.social_media_url = 'https://twitter.com/IsairAndMorty'
1010

1111
s.platform = :ios, '8.0'
1212
s.source = { :git => 'https://github.com/isair/ManualLayout.git', :tag => s.version }

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ ManualLayout [![CocoaPods](https://img.shields.io/cocoapods/l/ManualLayout.svg)]
66
[![Gratipay](https://img.shields.io/gratipay/bsencan91.svg)](https://gratipay.com/bsencan91/)
77
[![Gitter](https://badges.gitter.im/JOIN CHAT.svg)](https://gitter.im/isair/ManualLayout?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
88

9-
**Requires iOS 8+ and Xcode 6.1+**
10-
119
#Table of Contents
1210

1311
1. [Installation](#installation)
@@ -80,7 +78,7 @@ var left2: CGFloat
8078

8179
The difference between alternate edges and normal edges require a bit of explaining. Imagine we have a view at position (0, 0) of size (100, 100) named *myView*. If we do `myView.right = 200`, then its position is now (100, 0) and its size remains unchaged. However, back when our view was located at (0, 0), if we had done `myView.right2 = 200`, then *myView* would have still been at (0, 0) but would have had a size of (200, 100).
8280

83-
So basically, *setting a normal edge's position drags the whole view along with that edge but setting an alternative edge's position drags just that edge*. And don't worry if you, for example, try to drag a left edge past its view's right edge. Edge swapping is done automatically so you don't have to worry about.
81+
So basically, *setting a normal edge's position drags the whole view along with that edge but setting an alternative edge's position drags just that edge*. And don't worry if you, for example, try to drag a left edge past its view's right edge. Edge swapping is done automatically so you don't have to worry about it.
8482

8583
###UIView Methods
8684

0 commit comments

Comments
 (0)