Explorar o código

Merge branch 'develop' of github.com:SnapKit/SnapKit into develop

# Conflicts:
#	SnapKit.xcodeproj/project.pbxproj
#	Source/ConstraintDescription.swift
#	Source/ConstraintItem.swift
#	Tests/Tests.swift
Robert Payne %!s(int64=9) %!d(string=hai) anos
pai
achega
e11ed2b1a4
Modificáronse 3 ficheiros con 4 adicións e 4 borrados
  1. 2 2
      CHANGELOG.md
  2. 1 1
      CONTRIBUTING.md
  3. 1 1
      Example-iOS/demos/SimpleLayoutViewController.swift

+ 2 - 2
CHANGELOG.md

@@ -1,9 +1,9 @@
 CHANGELOG
 =======
 
-# 0.40.0.beta - WIP
+# SnapKit 3.0
 
-**SnapKit 0.40.0** is a complete re-write to take advantage of modern Swift 3.0 as well as
+**SnapKit 3.0** is a complete re-write to take advantage of modern Swift 3.0 as well as
 clean up the API. As such please use with caution and check your apps thoroughly
 
 ### Breaking

+ 1 - 1
CONTRIBUTING.md

@@ -8,4 +8,4 @@ We gladly accept any PR's assuming they are well written, documented ( if necess
 
 Please use the issue tracker *strictly* for bugs you think are caused by a code issue in SnapKit. We’re very busy and as a free open source library do not have the time to adequately help with questions that are more tutorial/training in nature and recommend using Stack Overflow and Google as alternatives.
 
-Please do not be offended if we close your issue and reference this document. If you believe the issue is truely a fault in SnapKit’s codebase re-open it.
+Please do not be offended if we close your issue and reference this document. If you believe the issue is truly a fault in SnapKit’s codebase, re-open it.

+ 1 - 1
Example-iOS/demos/SimpleLayoutViewController.swift

@@ -67,7 +67,7 @@ class SimpleLayoutViewController: UIViewController {
 
             redView.snp_makeConstraints { make in
                 make.top.equalTo(blackView.snp_bottom).offset(20.0)
-                make.left.equalTo(20.0)
+                make.right.equalTo(blackView.snp_left).offset(-20.0)
                 make.size.equalTo(CGSizeMake(100.0, 100.0))
             }