Skip to content
Browse files

Merge branch 'master' of https://github.com/btelintelo/campjoy

  • Loading branch information...
2 parents cd373d0 + 5585d7d commit 2b5d56e7a2b0e5d0862a9250b6fe0c4176ef4a9f @samus samus committed Oct 20, 2013
View
3 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTap.java
@@ -8,6 +8,7 @@
import org.campjoy.identitree.starter.model.Term;
import android.content.Context;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.text.Spannable;
import android.text.TextPaint;
@@ -38,6 +39,8 @@ public HotTap(Context activityContext, View v) {
glossary = GlossaryModel.getInstance();
v.setOnTouchListener(this);
createSpans(v);
+ TextView tv = (TextView)v;
+ tv.setHighlightColor(Color.TRANSPARENT);
}
private void createSpans(View v) {
View
2 ios/Camp Joy Outdoors/CJOTreeInfoViewController.m
@@ -56,7 +56,7 @@ - (IBAction)done:(id)sender {
}
- (void) configureCarousel {
-
+ self.carousel.decelerationRate = 0.5;
}
#pragma mark - UITableViewDataSource;

0 comments on commit 2b5d56e

Please sign in to comment.
Something went wrong with that request. Please try again.