From 9f58b1ea07c83348a093760ef37de97326a78c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sun, 10 Jun 2018 20:43:31 +0200
Subject: [PATCH] Fix invisible picker and webpack migration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 css/style.scss                         | 1 +
 js/controller/ColorPickerController.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/css/style.scss b/css/style.scss
index 9819b3587..0469ebbb4 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -105,6 +105,7 @@ input.input-inline {
 		.colorselect {
 			div, label {
 				height: 32px;
+				width: auto;
 			}
 		}
 		form {
diff --git a/js/controller/ColorPickerController.js b/js/controller/ColorPickerController.js
index 3c91d0d19..fb4c5e119 100644
--- a/js/controller/ColorPickerController.js
+++ b/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 = '';