Merge pull request #3285 from akre54/bb-120

Draft changelog for Backbone 1.2.0

Author: jashkenas

backbone-min.js

@@ -1,4 +1,4 @@
-//     Backbone.js 1.1.2
+//     Backbone.js 1.2.0
 
 //     (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Backbone may be freely distributed under the MIT license.
@@ -40,7 +40,7 @@
   var slice = array.slice;
 
   // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '1.1.2';
+  Backbone.VERSION = '1.2.0';
 
   // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
   // the `$` variable.

backbone-min.map

@@ -1,6 +1,6 @@
 {
   "name"          : "backbone",
-  "version"       : "1.1.2",
+  "version"       : "1.2.0",
   "main"          : "backbone.js",
   "dependencies"  : {
     "underscore"  : ">=1.7.0"

backbone.js

@@ -1,6 +1,6 @@
 {
   "name"          : "backbone",
-  "version"       : "1.1.2",
+  "version"       : "1.2.0",
   "description"   : "Give your JS App some Backbone with Models, Views, Collections, and Events.",
   "keywords"      : ["model", "view", "controller", "router", "server", "client", "browser"],
   "repo"          : "jashkenas/backbone",

bower.json

@@ -16,20 +16,18 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page_wrapper">
-            <div id="jump_page">
-              
-                
-                <a class="source" href="backbone.localStorage.html">
-                  backbone.localStorage.js
-                </a>
+          <div id="jump_page">
+            
 
-                
-                <a class="source" href="todos.html">
-                  todos.js
-                </a>
+              <a class="source" href="backbone.localStorage.html">
+                backbone.localStorage.js
+              </a>
+            
 
-            </div>
+              <a class="source" href="todos.html">
+                todos.js
+              </a>
+            
           </div>
         </li>
       </ul>

component.json

@@ -21,11 +21,11 @@
 }
 
 @font-face {
-    font-family: 'roboto-black';
-    src: url('public/fonts/roboto-black.eot');
-    src: url('public/fonts/roboto-black.eot?#iefix') format('embedded-opentype'),
-         url('public/fonts/roboto-black.woff') format('woff'),
-         url('public/fonts/roboto-black.ttf') format('truetype');
+    font-family: 'novecento-bold';
+    src: url('public/fonts/novecento-bold.eot');
+    src: url('public/fonts/novecento-bold.eot?#iefix') format('embedded-opentype'),
+         url('public/fonts/novecento-bold.woff') format('woff'),
+         url('public/fonts/novecento-bold.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -67,17 +67,14 @@ h1, h2, h3, h4, h5, h6 {
   color: #112233;
   line-height: 1em;
   font-weight: normal;
-  font-family: "roboto-black";
+  font-family: "novecento-bold";
   text-transform: uppercase;
   margin: 30px 0 15px 0;
 }
 
 h1 {
   margin-top: 40px;
 }
-h2 {
-  font-size: 1.26em;
-}
 
 hr {
   border: 0;
@@ -183,18 +180,9 @@ ul.sections > li > div {
   display: block;
 }
 
-#jump_page_wrapper{
-  position: fixed;
-  right: 0;
-  top: 0;
-  bottom: 0;
-}
-
 #jump_page {
   padding: 5px 0 3px;
   margin: 0 0 25px 25px;
-  max-height: 100%;
-  overflow: auto;
 }
 
 #jump_page .source {