updates for transfer

leaflet-extras · Mar 13, 2013 · 716caab · 716caab
1 parent 7da27b2
commit 716caab
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 39 deletions.
diff --git a/Cakefile b/Cakefile
@@ -17,4 +17,4 @@ task 'build', 'build it', () ->
 			ast.figure_out_scope();
 			ast.compute_char_frequency();
 			ast.mangle_names();
-			fs.writeFile './dist/leaflet.css.min.js',  "var css = #{ css };#{ ast.print_to_string() }"
+			fs.writeFile './dist/leaflet.css.min.js',  ast.print_to_string()
diff --git a/LICENCE.md b/LICENCE.md
@@ -0,0 +1,20 @@
+#Copyright 2013 Calvin Metcalf
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+_THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE._
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Leaflet CSS
 
 small library to add the css for leaflet without having to bother including ugly conditional comments
 
-to use instead of including the css files for leaflet in th head, include this after you include leaflet, then it includes it'self automatically
+to use, instead of including the css files for leaflet in the head, include this after you include leaflet
 
 if you want to call more css in the same way, like maybe for your own plugin, you can do
 
@@ -17,4 +17,4 @@ cake build # if that gets you an error try this first
 npm install -g coffee-script # you may need a sudo
 ```
 
-demo includes [leaflet.sprite](https://github.com/calvinmetcalf/leaflet.sprite)
+The css from leaflet and licenced [per that project](https://raw.github.com/Leaflet/Leaflet/master/LICENSE) the rest is MIT licenced demo includes [leaflet.sprite](https://github.com/leaflet-extras/leaflet.sprite)
diff --git a/dist/leaflet.css.min.js b/dist/leaflet.css.min.js
diff --git a/example/blank.png b/example/blank.png
diff --git a/gh-fork-ribbon.css → example/gh-fork-ribbon.css b/gh-fork-ribbon.css → example/gh-fork-ribbon.css
diff --git a/gh-fork-ribbon.ie.css → example/gh-fork-ribbon.ie.css b/gh-fork-ribbon.ie.css → example/gh-fork-ribbon.ie.css
diff --git a/example/leaflet.sprite.min.js b/example/leaflet.sprite.min.js
diff --git a/script.js → example/script.js b/script.js → example/script.js
diff --git a/example/sprite.png b/example/sprite.png
diff --git a/index.html b/index.html
@@ -22,20 +22,20 @@
                 height: 100% 
             }
         </style>
-    <link rel="stylesheet" href="gh-fork-ribbon.css" />
+    <link rel="stylesheet" href="example/gh-fork-ribbon.css" />
     <!--[if IE]>
-        <link rel="stylesheet" href="gh-fork-ribbon.ie.css" />
+        <link rel="stylesheet" href="example/gh-fork-ribbon.ie.css" />
     <![endif]-->
 </head>
 <body><div class="github-fork-ribbon-wrapper right">
         <div class="github-fork-ribbon"><!--from http://simonwhitaker.github.com/github-fork-ribbon-css/ -->
-            <a href="https://github.com/calvinmetcalf/leaflet.css">Fork me on GitHub</a>
+            <a href="https://github.com/leaflet-extras/leaflet.css">Fork me on GitHub</a>
         </div>
     </div>
         <div id="map"></div>
-        <script type="text/javascript" src="http://cdn.leafletjs.com/leaflet-0.5/leaflet.js"></script>
-        <script type="text/javascript" src="dist/leaflet.css.js"></script>
-        <script type="text/javascript" src="sprite.js"></script>
-        <script type="text/javascript" src="script.js"></script>
+        <script type="text/javascript" src="http://cdn.leafletjs.com/leaflet-0.5.1/leaflet.js"></script>
+        <script type="text/javascript" src="dist/leaflet.css.min.js"></script>
+        <script type="text/javascript" src="example/leaflet.sprite.min.js"></script>
+        <script type="text/javascript" src="example/script.js"></script>
     </body>
 </html>
diff --git a/sprite.js b/sprite.js
diff --git a/sprites.png b/sprites.png
diff --git a/src/leaflet.css b/src/leaflet.css
@@ -1,4 +1,26 @@
-/* required styles */
+/*Copyright (c) 2010-2013, Vladimir Agafonkin
+Copyright (c) 2010-2011, CloudMade
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 
 .leaflet-map-pane,
 .leaflet-tile,
@@ -454,4 +476,4 @@
 .leaflet-editing-icon {
 	-webkit-border-radius: 2px;
 	        border-radius: 2px;
-	}
+	}
diff --git a/src/leaflet.ie.css b/src/leaflet.ie.css
@@ -1,3 +1,26 @@
+/*Copyright (c) 2010-2013, Vladimir Agafonkin
+Copyright (c) 2010-2011, CloudMade
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 .leaflet-vml-shape {
 	width: 1px;
 	height: 1px;
@@ -54,4 +77,4 @@
 .leaflet-control-attribution {
 	border-top: 1px solid #bbb;
 	border-left: 1px solid #bbb;
-	}
+	}