Merge branch 'master' into remove-python_2_unicode_compatible

Author: pradyunsg

.gitignore

@@ -78,7 +78,7 @@ debug.log
 
 # Node modules & bower components
 junction/static/node_modules/
-junction/static/bower_components/
+junction/static/bower_components
 _docs_html/
 
 # generated by unit tests

junction/static/bower.json

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
@@ -1095,7 +1095,6 @@ a:focus {
   text-decoration: underline;
 }
 a:focus {
-  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -2524,7 +2523,6 @@ select[size] {
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
-  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -2623,17 +2621,10 @@ input[type="search"] {
 .radio,
 .checkbox {
   position: relative;
-  display: inline;
+  display: block;
   margin-top: 10px;
   margin-bottom: 10px;
 }
-form#reviewer-vote .radio {
-  position: inherit;
-  display: block;
-}
-form#reviewer-vote label.control-label{
-  text-align: left;
-}
 .radio label,
 .checkbox label {
   min-height: 20px;
@@ -3022,7 +3013,6 @@ select[multiple].input-lg {
 .btn.focus,
 .btn:active.focus,
 .btn.active.focus {
-  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -8490,6 +8480,9 @@ input#id_remember {
 .green {
   color: green;
 }
+.spam {
+  background-color: #b3a6a6;
+}
 .align-bottom {
   vertical-align: bottom;
 }
@@ -9000,6 +8993,3 @@ textarea.review-form select {
 .dropdown {
   margin-left: 10px;
 }
-.spam{
-    background-color: #b3a6a6;
-}

junction/static/css/app.css

@@ -68,3 +68,7 @@ input#id_remember {
 .green {
     color: green;
 }
+
+.spam{
+    background-color: #b3a6a6;
+}

junction/static/less/ui.less

@@ -1,12 +1,22 @@
 {
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 0.10.0",
+    "yarn": ">= 1.0.0"
   },
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-less": "^1.0.0",
     "grunt-contrib-nodeunit": "~0.4.1",
     "grunt-contrib-watch": "~0.6.1"
-  }
+  },
+  "dependencies": {
+    "@bower_components/bootstrap": "twbs/bootstrap#~3.3.2",
+    "@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.2.0",
+    "@bower_components/jquery": "jquery/jquery-dist#1.9.1 - 3"
+  },
+  "scripts": {
+    "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\""
+  },
+  "license": "MIT"
 }