From 5346cc40424b8d3986b8aa50115ccd0f9c5996e4 Mon Sep 17 00:00:00 2001
From: artemanufrij <artem.anufrij@live.de>
Date: Tue, 25 Apr 2017 15:42:39 +0200
Subject: [PATCH 1/3] Move add stack input to the header

Signed-off-by: Artem Anufrij <artem.anufrij@live.de>
---
 css/style.css                     | 21 ++++++++++++++++--
 templates/part.board.mainView.php | 36 +++++++++++++++----------------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/css/style.css b/css/style.css
index f79fc0544..f87e108aa 100644
--- a/css/style.css
+++ b/css/style.css
@@ -2,6 +2,7 @@
  * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
  *
  * @author Julius Härtl <jus@bitgrid.net>
+ * @author Artem Anufrij <artem.anufrij@live.de>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -134,7 +135,6 @@ button:hover {
 	position: relative;
 	color: #888;
 	margin: 8px;
-
 }
 
 #board-actions .filter .filter-button {
@@ -176,7 +176,6 @@ button:hover {
 .board-actions button {
 	border: none;
 	background-color: transparent;
-	color: #fff;
 }
 
 .board-action-button {
@@ -186,6 +185,24 @@ button:hover {
 	margin-left: 10px;
 }
 
+#stack-add {
+	float: right;
+	margin: 8px;
+	background-color: #ffffff;
+	border: 1px solid #bbb;
+	border-radius: 4px;
+}
+
+#stack-add input {
+	padding: 4px 5px;
+	margin: 0px;
+	border: 0px none transparent;
+}
+
+#stack-add button {
+	padding: 3px;
+}
+
 .stack {
 	width: 320px;
 	margin-right: 10px;
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 947bf7f25..b26c36f6d 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -9,12 +9,23 @@
 	<h1>
 		{{ boardservice.getCurrent().title }}
 	</h1>
-  <div id="board-actions">
-    <div class="board-action-button" ng-if="filter!='archive'"><a ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
-    <div class="board-action-button" ng-if="filter=='archive'"><a ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
-    <div class="board-action-button"><a ui-sref="board.detail({ id: id })" title="<?php p($l->t('Board details')); ?>"><i class="icon icon-details{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a>
+  	<div id="board-actions">
+		<div class="board-action-button" ng-if="filter!='archive'"><a ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
+		<div class="board-action-button" ng-if="filter=='archive'"><a ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
+		<div class="board-action-button"><a ui-sref="board.detail({ id: id })" title="<?php p($l->t('Board details')); ?>"><i class="icon icon-details{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a>
     </div>
-  </div>
+</div>
+
+<div id="stack-add" ng-if="boardservice.canEdit() && checkCanEdit()">
+	<form class="ng-pristine ng-valid" ng-submit="createStack()">
+		<input type="text" placeholder="Add a new stack"
+				ng-focus="status.addStack=true"
+				ng-blur="status.addStack=false"
+				ng-model="newStack.title" required/>
+		<button class="icon icon-add" style="opacity: {{status.addStack ? 1: 0.5}};"
+				type="submit"></button>
+	</form>
+	</div>
 </div>
 <div id="board" class="scroll-container">
 
@@ -111,18 +122,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="stack" style="display: inline-block;" ng-if="boardservice.canEdit() && checkCanEdit()">
-			<form class="ng-pristine ng-valid" ng-submit="createStack()">
-				<h2>
-					<input type="text" placeholder="Add a new stack"
-						   ng-focus="status.addStack=true"
-						   ng-blur="status.addStack=false"
-						   ng-model="newStack.title" required/>
-					<button class="icon icon-add" ng-show="status.addStack"
-							type="submit"></button>
-				</h2>
-			</form>
-		</div>
+		
 	</div>
 
-</div>
+</div>
\ No newline at end of file

From e2012dd2c51f810bc365bdb0c047510af3cc3dc5 Mon Sep 17 00:00:00 2001
From: artemanufrij <artem.anufrij@live.de>
Date: Wed, 26 Apr 2017 22:48:21 +0200
Subject: [PATCH 2/3] Fixed css

Signed-off-by: Artem Anufrij <artem.anufrij@live.de>
---
 css/style.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/css/style.css b/css/style.css
index f87e108aa..22fae45b5 100644
--- a/css/style.css
+++ b/css/style.css
@@ -197,10 +197,13 @@ button:hover {
 	padding: 4px 5px;
 	margin: 0px;
 	border: 0px none transparent;
+    display: table-cell;
+    vertical-align: middle;
 }
 
 #stack-add button {
-	padding: 3px;
+	display: table-cell;
+    vertical-align: middle;
 }
 
 .stack {

From 1b6531e748a4f8b1079b131d1910122dfd70ff2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 27 Apr 2017 12:48:19 +0200
Subject: [PATCH 3/3] Fix positioning on Nextcloud 12
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.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/css/style.css b/css/style.css
index 22fae45b5..b81957a92 100644
--- a/css/style.css
+++ b/css/style.css
@@ -197,8 +197,9 @@ button:hover {
 	padding: 4px 5px;
 	margin: 0px;
 	border: 0px none transparent;
-    display: table-cell;
-    vertical-align: middle;
+	display: table-cell;
+	vertical-align: middle;
+	min-height: initial;
 }
 
 #stack-add button {