Skip to content

Commit

Permalink
Update for release 1.3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
lucdion committed May 17, 2019
1 parent 7513d32 commit 9a0dcc2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@

# Change Log

## [1.3.14](https://github.com/layoutBox/FlexLayout/releases/tag/1.3.14)
Released on 2019-05-17

Add method:
* `basis(_ : FPercent)`: This method is similar to `basis(_ : CGFloat?)` but takes a percentage parameter.

## [1.3.11](https://github.com/layoutBox/FlexLayout/releases/tag/1.3.10)
Released on 2018-08-09

Expand Down
2 changes: 1 addition & 1 deletion FlexLayout.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |spec|
spec.name = "FlexLayout"
spec.version = "1.3.12"
spec.version = "1.3.14"
spec.summary = "FlexLayout"
spec.homepage = "https://github.com/lucdion/FlexLayout.git"
spec.license = "MIT license"
Expand Down
24 changes: 12 additions & 12 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PODS:
- FlexLayout (1.3.10)
- Nimble (7.1.1)
- PinLayout (1.7.3)
- Quick (1.3.0)
- FlexLayout (1.3.14)
- Nimble (8.0.1)
- PinLayout (1.8.7)
- Quick (2.1.0)
- Reveal-SDK (10)
- SwiftLint (0.25.1)
- SwiftLint (0.32.0)

DEPENDENCIES:
- FlexLayout (from `./`)
Expand All @@ -15,7 +15,7 @@ DEPENDENCIES:
- SwiftLint

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
https://github.com/cocoapods/specs.git:
- Nimble
- PinLayout
- Quick
Expand All @@ -27,13 +27,13 @@ EXTERNAL SOURCES:
:path: "./"

SPEC CHECKSUMS:
FlexLayout: 1f4e23de3e6b32cc75a9692ead73f7913a17a4a5
Nimble: 391f07782af4b37914f9bd7b2ffbb952731b8202
PinLayout: 0c2e68dba036a291ca9278aa8b799f58506f2a6d
Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f
FlexLayout: 267413996e8ccc216711bcc961aa793b491ccf1e
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
PinLayout: a0722a5c8f0e0168a9c091ffe4930dabf0c8582c
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
Reveal-SDK: 7869ddf1f902cabbb07a1f0dd06bd25861a126f7
SwiftLint: ce933681be10c3266e82576dad676fa815a602e9
SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d

PODFILE CHECKSUM: b49d5685f476a6600d008e69e030f9d4045be518

COCOAPODS: 1.5.0
COCOAPODS: 1.5.3
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,10 @@ This property takes the same values as the width and height properties, and spec

Specifying `nil` set the basis as `auto`, which means the length is equal to the length of the item. If the item has no length specified, the length will be according to its content

* **`basis(_ : FPercent)`**
This property takes the same values as the width and height properties, and specifies the initial size of the flex item, before free space is distributed according to the grow and shrink factors.


<br>

### isIncludedInLayout()
Expand Down
2 changes: 0 additions & 2 deletions Sources/FlexLayout.swift
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,6 @@ public final class Flex {
Specifying `nil` set the basis as `auto`, which means the length is equal to the length of the item. If the
item has no length specified, the length will be according to its content.
- Parameter value: Default value is 0
*/
@discardableResult
public func basis(_ percent: FPercent) -> Flex {
Expand Down

0 comments on commit 9a0dcc2

Please sign in to comment.