Fix invisible picker and webpack migration

Signed-off-by: Julius Härtl <jus@bitgrid.net>

css/style.scss

@@ -105,6 +105,7 @@ input.input-inline {
 		.colorselect {
 			div, label {
 				height: 32px;
+				width: auto;
 			}
 		}
 		form {

js/controller/ColorPickerController.js

@@ -20,6 +20,8 @@
  *
  */
 
+import app from '../app/App.js';
+
 /* global oc_defaults OC */
 app.controller('ColorPickerController', ['$scope', function($scope) {
     $scope.hashedColor = '';