relatively-sticky

commit

4944f266cd26f312f0e3b95faf00ff44e8b5a845

parent

6d52aa79d63249fcf1456ce9c6d8290c46da8acb

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2015-02-28 09:07

rebranding

Diffstat

8 files changed, 17 insertions, 21 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md

@@ -1,12 +1,12 @@
    1    -1 # Contributing to Sticky-Kit
   -1     1 # Contributing to Relatively-Sticky
    2     2 
    3     3 
    4    -1 Thanks for reporting an issue. Sticky-kit is actually pretty complicated and
   -1     4 Thanks for reporting an issue. Relatively-Sticky is actually not that simple and
    5     5 handles a lot of sticky scenarios. If the issue isn't immediately obvious when
    6     6 written in text then you must include a minimal case example of the problem on
    7     7 <http://jsfiddle.net/> or something similar to help save us some time.
    8     8 
    9    -1 If you're opening a pull request, remember Sticky-kit is written in
   -1     9 If you're opening a pull request, remember Relatively-Sticky is written in
   10    10 [CoffeeScript](http://coffeescript.org/), so you should be applying your patch
   11    11 to the CoffeeScript file and not the JavaScript files. Don't worry about
   12    12 building/minifying the JS files, I'm glad to do it for you. In any case, you

diff --git a/Makefile b/Makefile

@@ -1,6 +1,6 @@
    1     1 
    2    -1 jquery.sticky-kit.min.js: jquery.sticky-kit.js
   -1     2 jquery.relatively-sticky.min.js: jquery.relatively-sticky.js
    3     3 	uglifyjs --comments @license $< -o $@
    4     4 
    5    -1 jquery.sticky-kit.js: jquery.sticky-kit.coffee
   -1     5 jquery.relatively-sticky.js: jquery.relatively-sticky.coffee
    6     6 	coffee -c $<

diff --git a/bower.json b/bower.json

@@ -1,12 +1,12 @@
    1     1 {
    2    -1   "name": "sticky-kit",
   -1     2   "name": "relatively-sticky",
    3     3   "version": "1.1.1",
    4     4   "homepage": "http://leafo.net/sticky-kit/",
    5     5   "authors": [
    6    -1     "leaf corcoran <leafot@gmail.com>"
   -1     6     "tobias bengfort <tobias.bengfort@poste.de>"
    7     7   ],
    8    -1   "description": "A jQuery plugin for making smart sticky elements",
    9    -1   "main": "jquery.sticky-kit.js",
   -1     8   "description": "A jQuery plugin for making smart sticky elements (forked from sticky-kit)",
   -1     9   "main": "jquery.relatively-sticky.js",
   10    10   "keywords": [
   11    11     "sticky"
   12    12   ],

diff --git a/jquery.sticky-kit.coffee b/jquery.relatively-sticky.coffee

@@ -1,5 +1,5 @@
    1     1 ###*
    2    -1 @license Sticky-kit v1.1.1 | WTFPL | Leaf Corcoran 2014 | http://leafo.net
   -1     2 @license Relatively-Sticky v1.1.1 | WTFPL | Tobias Bengfort 2015
    3     3 ###
    4     4 
    5     5 $ = @jQuery or window.jQuery

diff --git a/jquery.sticky-kit.js b/jquery.relatively-sticky.js

diff --git a/jquery.sticky-kit.min.js b/jquery.relatively-sticky.min.js

diff --git a/sticky-kit.jquery.json b/relatively-sticky.jquery.json

@@ -1,23 +1,20 @@
    1     1 {
    2    -1   "name": "sticky-kit",
   -1     2   "name": "relatively-sticky",
    3     3   "version": "1.1.1",
    4     4 
    5    -1   "title": "Sticky-kit",
    6    -1   "homepage": "http://leafo.net/sticky-kit",
   -1     5   "title": "Relatively-Sticky",
   -1     6   "homepage": "https://github.com/xi/relatively-sticky",
    7     7   "description": "A jQuery plugin for making smart sticky elements.",
    8     8 
    9    -1   "demo": "http://leafo.net/sticky-kit",
   10    -1 
   11     9   "keywords": [
   12    10     "sticky",
   13    -1     "fixed",
   14    11     "scrolling",
   15    12     "ui"
   16    13   ],
   17    14 
   18    15   "author": {
   19    -1     "name": "Leaf Corcoran",
   20    -1     "email": "leafot@gmail.com",
   -1    16     "name": "Tobias Bengfort",
   -1    17     "email": "tobias.bengfort@posteo.de",
   21    18     "url": "http://leafo.net"
   22    19   },
   23    20 
@@ -31,4 +28,4 @@
   31    28   "dependencies": {
   32    29     "jquery": ">=1.8"
   33    30   }
   34    -1 
   34    -1 
\ No newline at end of file
   -1    31 }

diff --git a/test/index.html b/test/index.html

@@ -90,7 +90,7 @@
   90    90   </style>
   91    91 
   92    92   <script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
   93    -1   <script src="../jquery.sticky-kit.js"></script>
   -1    93   <script src="../jquery.relatively-sticky.js"></script>
   94    94 </head>
   95    95 <body>
   96    96