Fix merge conflicts

Author: truckingsim

.jscsrc

@@ -0,0 +1,8 @@
+{
+  "preset": "jquery",
+  "esnext": true,
+  "maximumLineLength": null,
+  "requireCurlyBraces": null,
+  "requireCapitalizedComments": null,
+  "requireCamelCaseOrUpperCaseIdentifiers": null
+}

.travis.yml

@@ -1,9 +1,11 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
+  - "0.12"
 rvm:
   - 2.1.5
 before_install:
   - npm install -g grunt-cli
   - gem update --system && gem install scss-lint -v 0.34.0
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start

README.md

@@ -1,10 +1,10 @@
 # React Date Picker
 [![Bower version](https://badge.fury.io/bo/react-date-picker.svg)](http://badge.fury.io/bo/react-date-picker)
-[![Build Status](https://travis-ci.org/Hacker0x01/react-datepicker.svg)](https://travis-ci.org/Hacker0x01/react-datepicker)
+[![Build Status](https://travis-ci.org/Hacker0x01/react-datepicker.svg?branch=master)](https://travis-ci.org/Hacker0x01/react-datepicker)
 [![devDependency Status](https://david-dm.org/Hacker0x01/react-datepicker/dev-status.svg)](https://david-dm.org/Hacker0x01/react-datepicker#info=devDependencies)
 [![Downloads](http://img.shields.io/npm/dm/react-datepicker.svg)](https://npmjs.org/package/react-datepicker)
 
-A simple and reusable datepicker component for React ([Demo](http://cdn.rawgit.com/Hacker0x01/react-datepicker/master/example/index.html))
+A simple and reusable datepicker component for React ([Demo](https://hacker0x01.github.io/react-datepicker/))
 
 ![](https://cloud.githubusercontent.com/assets/1412392/5339491/c40de124-7ee1-11e4-9f07-9276e2545f27.png)
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "react-date-picker",
-  "version": "0.8.0",
+  "version": "0.11.3",
   "authors": [
     "Remon Oldenbeuving <[email protected]>",
     "Martijn Russchen <[email protected]>"
@@ -22,9 +22,9 @@
   ],
   "dependencies": {
     "react": "< 0.14",
-    "moment": "2.8.2",
-    "tether": "0.6.5",
-    "react-onclickoutside": "0.2.1"
+    "moment": "2.10.6",
+    "tether": "1.1.0",
+    "react-onclickoutside": "0.3.0"
   },
   "ignore": [
     "**/.*",

dist/react-datepicker.css

@@ -1,25 +1,48 @@
-.datepicker__triangle {
-  margin-top: -8px;
+.tether-element-attached-top .datepicker__triangle, .tether-element-attached-bottom .datepicker__triangle {
   margin-left: -8px;
+  position: absolute;
 }
-.datepicker__triangle, .datepicker__triangle:before {
+.tether-element-attached-top .datepicker__triangle, .tether-element-attached-bottom .datepicker__triangle, .tether-element-attached-top .datepicker__triangle:before, .tether-element-attached-bottom .datepicker__triangle:before {
   box-sizing: content-box;
   position: absolute;
   border: 8px solid transparent;
   height: 0;
   width: 1px;
-  border-top: none;
-  border-bottom-color: #f0f0f0;
 }
-.datepicker__triangle:before {
+.tether-element-attached-top .datepicker__triangle:before, .tether-element-attached-bottom .datepicker__triangle:before {
   content: "";
   z-index: -1;
   border-width: 8px;
-  top: -1px;
   left: -8px;
   border-bottom-color: #aeaeae;
 }
 
+.tether-element-attached-top .datepicker__triangle {
+  top: 0;
+  margin-top: -8px;
+}
+.tether-element-attached-top .datepicker__triangle, .tether-element-attached-top .datepicker__triangle:before {
+  border-top: none;
+  border-bottom-color: #f0f0f0;
+}
+.tether-element-attached-top .datepicker__triangle:before {
+  top: -1px;
+  border-bottom-color: #aeaeae;
+}
+
+.tether-element-attached-bottom .datepicker__triangle {
+  bottom: 0;
+  margin-bottom: -8px;
+}
+.tether-element-attached-bottom .datepicker__triangle, .tether-element-attached-bottom .datepicker__triangle:before {
+  border-bottom: none;
+  border-top-color: #fff;
+}
+.tether-element-attached-bottom .datepicker__triangle:before {
+  bottom: -1px;
+  border-top-color: #aeaeae;
+}
+
 .datepicker {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 11px;