Skip to content

Commit 9a0dcc2

Browse files
committed
Update for release 1.3.14
1 parent 7513d32 commit 9a0dcc2

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77

88
# Change Log
99

10+
## [1.3.14](https://github.com/layoutBox/FlexLayout/releases/tag/1.3.14)
11+
Released on 2019-05-17
12+
13+
Add method:
14+
* `basis(_ : FPercent)`: This method is similar to `basis(_ : CGFloat?)` but takes a percentage parameter.
15+
1016
## [1.3.11](https://github.com/layoutBox/FlexLayout/releases/tag/1.3.10)
1117
Released on 2018-08-09
1218

FlexLayout.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |spec|
33
spec.name = "FlexLayout"
4-
spec.version = "1.3.12"
4+
spec.version = "1.3.14"
55
spec.summary = "FlexLayout"
66
spec.homepage = "https://github.com/lucdion/FlexLayout.git"
77
spec.license = "MIT license"

Podfile.lock

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- FlexLayout (1.3.10)
3-
- Nimble (7.1.1)
4-
- PinLayout (1.7.3)
5-
- Quick (1.3.0)
2+
- FlexLayout (1.3.14)
3+
- Nimble (8.0.1)
4+
- PinLayout (1.8.7)
5+
- Quick (2.1.0)
66
- Reveal-SDK (10)
7-
- SwiftLint (0.25.1)
7+
- SwiftLint (0.32.0)
88

99
DEPENDENCIES:
1010
- FlexLayout (from `./`)
@@ -15,7 +15,7 @@ DEPENDENCIES:
1515
- SwiftLint
1616

1717
SPEC REPOS:
18-
https://github.com/CocoaPods/Specs.git:
18+
https://github.com/cocoapods/specs.git:
1919
- Nimble
2020
- PinLayout
2121
- Quick
@@ -27,13 +27,13 @@ EXTERNAL SOURCES:
2727
:path: "./"
2828

2929
SPEC CHECKSUMS:
30-
FlexLayout: 1f4e23de3e6b32cc75a9692ead73f7913a17a4a5
31-
Nimble: 391f07782af4b37914f9bd7b2ffbb952731b8202
32-
PinLayout: 0c2e68dba036a291ca9278aa8b799f58506f2a6d
33-
Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f
30+
FlexLayout: 267413996e8ccc216711bcc961aa793b491ccf1e
31+
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
32+
PinLayout: a0722a5c8f0e0168a9c091ffe4930dabf0c8582c
33+
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
3434
Reveal-SDK: 7869ddf1f902cabbb07a1f0dd06bd25861a126f7
35-
SwiftLint: ce933681be10c3266e82576dad676fa815a602e9
35+
SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
3636

3737
PODFILE CHECKSUM: b49d5685f476a6600d008e69e030f9d4045be518
3838

39-
COCOAPODS: 1.5.0
39+
COCOAPODS: 1.5.3

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,10 @@ This property takes the same values as the width and height properties, and spec
677677

678678
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
679679

680+
* **`basis(_ : FPercent)`**
681+
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.
682+
683+
680684
<br>
681685

682686
### isIncludedInLayout()

Sources/FlexLayout.swift

-2
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@ public final class Flex {
336336

337337
Specifying `nil` set the basis as `auto`, which means the length is equal to the length of the item. If the
338338
item has no length specified, the length will be according to its content.
339-
340-
- Parameter value: Default value is 0
341339
*/
342340
@discardableResult
343341
public func basis(_ percent: FPercent) -> Flex {

0 commit comments

Comments
 (0)