Skip to content

Commit

Permalink
Merge branch 'release/1.0.0-beta.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioEstevao committed Jul 21, 2017
2 parents 80355a3 + 3c4830d commit 1f86596
Show file tree
Hide file tree
Showing 153 changed files with 11,363 additions and 10,115 deletions.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### Expected behavior


### Actual behavior


### Steps to reproduce the behavior


##### Tested on [device], iOS [version], Aztec [version]
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fixes #

To test:

506 changes: 377 additions & 129 deletions Aztec.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
6 changes: 6 additions & 0 deletions Aztec/Assets/Media.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
12 changes: 12 additions & 0 deletions Aztec/Assets/Media.xcassets/image.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "gridicons-image.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file not shown.
12 changes: 12 additions & 0 deletions Aztec/Assets/Media.xcassets/play.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "gridicons-play.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file not shown.
3 changes: 3 additions & 0 deletions Aztec/Classes/Constants/Metrics.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ enum Metrics {

static let defaultIndentation = CGFloat(12)
static let maxIndentation = CGFloat(200)
static let listBulletIndentation = CGFloat(20)
static let listTextIndentation = CGFloat(24)
static let tabStepInterval = 8
static let tabStepCount = 12
static let paragraphSpacing = CGFloat(6)
}
Loading

0 comments on commit 1f86596

Please sign in to comment.