-
Notifications
You must be signed in to change notification settings - Fork 34
Changes made as you requested. #16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
thihaaung6245
commented
May 8, 2017
- Updated Readme for configuring upsideArrowIndicator
- Update variable name from 'upsideArrowDirection' to 'isUpsideArrowIndicator'
- .gitignore updated for '.DS_Store'
- Set arrow default width and height to library owner default value
…on name changed. gitignore updated. Updated readme
| @@ -0,0 +1,243 @@ | |||
| ACTabScrollView | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you copy a README file here?
| // Contributed by Thiha Aung on 2017/5/8 | ||
| // 1. Added implementations for upside arrow direction | ||
| // 2. Added some inspectable to configure arrowView | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't need to add these comments in the source code. We have git log
|
|
||
| // ADDED: | ||
| // 1. Set arrow item to up position | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as above
| @IBInspectable open var arrowBackgroundColor: UIColor = UIColor.white | ||
| @IBInspectable open var arrowWidth : CGFloat = 12 | ||
| @IBInspectable open var arrowHeight : CGFloat = 7 | ||
| >>>>>>> 4bcac438ac34da53f3e7bd74ab50f7d6bca4f663 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your code update! But please check the conflicts before you send a PR. And the following more are the same.
| @@ -1,3 +1,6 @@ | |||
| # OSX | |||
| .DS_Store | |||
|
|
|||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.DS_Store should be a default ignored item. You don't need to add this line in .gitignore file.
If you still cannot ignore that. You may check this
http://stackoverflow.com/questions/18393498/gitignore-all-the-ds-store-files-in-every-folder-and-subfolder