Merge branch 'master' into gh-pages

Author: jashkenas

.gitignore

@@ -1,2 +1,5 @@
 raw
 node_modules
+*.log
+*.idea
+*.swp

.travis.yml

@@ -1,8 +1,23 @@
 language: node_js
+addons:
+  firefox: "10.0"
 node_js:
-  - 0.8
-  - '0.10'
+  - "0.8"
+  - "0.12"
+  - "io.js"
+matrix:
+  include:
+    - node_js: "0.10"
+      env: BROWSER=true
+env: BROWSER=false
 before_install:
-  - 'npm install npm -g'
+  - npm install -g npm
+  - if [[ $BROWSER == true ]]; then npm install karma-phantomjs-launcher karma-firefox-launcher; fi
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+script:
+  - npm test
+  - "[ $BROWSER == false ] || ./node_modules/karma/bin/karma start --browsers Firefox,PhantomJS"
 notifications:
   email: false

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative
+Copyright (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative
 Reporters & Editors
 
 Permission is hereby granted, free of charge, to any person

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "underscore",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "main": "underscore.js",
   "keywords": ["util", "functional", "server", "client", "browser"],
   "ignore" : ["docs", "test", "*.yml", "CNAME", "index.html", "favicon.ico", "CONTRIBUTING.md"]

component.json

@@ -5,6 +5,6 @@
   "repo"          : "jashkenas/underscore",
   "main"          : "underscore.js",
   "scripts"       : ["underscore.js"],
-  "version"       : "1.7.0",
+  "version"       : "1.8.0",
   "license"       : "MIT"
 }

docs/docco.css

@@ -21,11 +21,11 @@
 }
 
 @font-face {
-    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-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-weight: normal;
     font-style: normal;
 }
@@ -67,14 +67,17 @@ h1, h2, h3, h4, h5, h6 {
   color: #112233;
   line-height: 1em;
   font-weight: normal;
-  font-family: "novecento-bold";
+  font-family: "roboto-black";
   text-transform: uppercase;
   margin: 30px 0 15px 0;
 }
 
 h1 {
   margin-top: 40px;
 }
+h2 {
+  font-size: 1.26em;
+}
 
 hr {
   border: 0;