From fc5cabedd064fa95f1621490edb6635e07e6995c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 8 Nov 2018 17:55:23 +0100
Subject: [PATCH] Fix design issues on 15
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                  | 10 +++++-----
 js/controller/CardController.js | 10 +++++-----
 templates/part.card.php         | 17 +++++++++--------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/css/style.scss b/css/style.scss
index 9fc25765c..462fec439 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -191,7 +191,7 @@ input.input-inline {
 
 			&.current {
 				box-shadow: 0px 0px 7px 0px $color-darkgrey;
-				box-shadow: 0px 0px 7px 0px var(--color-darkgrey);
+				box-shadow: 0px 0px 7px 0px var(--color-background-dark);
 			}
 		}
 	}
@@ -334,7 +334,7 @@ input.input-inline {
 
 #stack-add {
 	background-color: $color-lightgrey;
-	background-color: var(--color-lightgrey);
+	background-color: var(--color-background-dark);
 	border-radius: 3px;
 	margin: 3px;
 	display: flex;
@@ -810,9 +810,9 @@ input.input-inline {
 		}
 		&.unsaved {
 			background-color: $color-lightgrey;
-			background-color: var(--color-lightgrey);
+			background-color: var(--color-background-dark);
 			color: $color-darkgrey;
-			color: var(--color-darkgrey);
+			color: var(--color-text-light);
 		}
 	}
 
@@ -873,7 +873,7 @@ input.input-inline {
 			z-index: 2;
 			border-radius: 3px;
 			box-shadow: 0 0 3px $color-darkgrey;
-			box-shadow: 0 0 3px var(--color-darkgrey);
+			box-shadow: 0 0 3px var(--color-background-dark);
 			overflow: scroll;
 		}
 		h3.attachment-selector {
diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index b8cfa9b70..27f185487 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -117,7 +117,7 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 			return match;
 		});
 		CardService.update($scope.status.edit).then(function (data) {
-			var header = $('.section-header-tabbed .tabDetails');
+			var header = $('.tabDetails');
 			header.find('.save-indicator.unsaved').hide();
 			header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
 		});
@@ -147,7 +147,7 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 	};
 	$scope.cardEditDescriptionChanged = function ($event) {
 		$scope.status.lastEdit = Date.now();
-		var header = $('.section-header-tabbed .tabDetails');
+		var header = $('.tabDetails');
 		header.find('.save-indicator.unsaved').show();
 		header.find('.save-indicator.saved').hide();
 	};
@@ -157,10 +157,10 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 		if (timeSinceEdit > 1000 && $scope.status.lastEdit > $scope.status.lastSave && !$scope.status.saving) {
 			$scope.status.lastSave = currentTime;
 			$scope.status.saving = true;
-			var header = $('.section-header-tabbed .tabDetails');
+			var header = $('.tabDetails');
 			header.find('.save-indicator.unsaved').fadeIn(500);
 			CardService.update($scope.status.edit).then(function (data) {
-				var header = $('.section-header-tabbed .tabDetails');
+				var header = $('.tabDetails');
 				header.find('.save-indicator.unsaved').hide();
 				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
 				$scope.status.saving = false;
@@ -196,7 +196,7 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 		CardService.update(card).then(function (data) {
 			$scope.status.cardEditDescription = false;
 			$scope.updateMarkdown($scope.status.edit.description);
-			var header = $('.section-header-tabbed .tabDetails');
+			var header = $('.tabDetails');
 			header.find('.save-indicator.unsaved').hide();
 			header.find('.save-indicator.saved').fadeIn(500).fadeOut(1000);
 		});
diff --git a/templates/part.card.php b/templates/part.card.php
index 183b2d469..b0fa011c9 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -90,15 +90,16 @@
 			<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><span class="icon icon-files-dark"></span><?php p($l->t('Attachments')); ?></a></li>
 			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}" ng-if="isTimelineEnabled()"><a><span class="icon icon-activity"></span><?php p($l->t('Timeline')); ?></a></li>
 		</ul>
-		<div class="tabDetails">
-			<span class="save-indicator saved"><?php p($l->t('Saved')); ?></span>
-			<span class="save-indicator unsaved"><?php p($l->t('Unsaved changes')); ?></span>
-			<a ng-if="params.tab === 0" href="https://github.com/nextcloud/deck/wiki/Markdown-Help" target="_blank" class="icon icon-help" data-toggle="tooltip" data-placement="left" title="<?php p($l->t('Formatting help')); ?>"><span class="hidden-visually"><?php p($l->t('Formatting help')); ?></span></a>
-			<label ng-if="params.tab === 1" for="attachment-upload" class="button icon-upload" ng-class="{'icon-loading-small': fileservice.uploader.isUploading}" data-toggle="tooltip" data-placement="left" title="<?php p($l->t('Upload attachment')); ?>"></label>
-			<input id="attachment-upload" type="file" nv-file-select="" uploader="fileservice.uploader" class="hidden" options="{cardId: cardservice.getCurrent().id}"/>
-			<input ng-if="status.cardEditDescription" type="button" ng-mousedown="status.continueEdit = true; status.selectAttachment = true;" class="icon-files-dark" data-toggle="tooltip" data-placement="left" title="<?php p($l->t('Insert attachment')); ?>"/>
+	</div>
+	<div class="tabDetails" style="display: flex;">
+		<span class="save-indicator saved"><?php p($l->t('Saved')); ?></span>
+		<span class="save-indicator unsaved"><?php p($l->t('Unsaved changes')); ?></span>
+		<div style="flex-grow: 1;"> </div>
+		<a ng-if="params.tab === 0" href="https://github.com/nextcloud/deck/wiki/Markdown-Help" target="_blank" class="icon icon-help" data-toggle="tooltip" data-placement="left" title="<?php p($l->t('Formatting help')); ?>"><span class="hidden-visually"><?php p($l->t('Formatting help')); ?></span></a>
+		<label ng-if="params.tab === 1" for="attachment-upload" class="button icon-upload" ng-class="{'icon-loading-small': fileservice.uploader.isUploading}" data-toggle="tooltip" data-placement="left" title="<?php p($l->t('Upload attachment')); ?>"></label>
+		<input id="attachment-upload" type="file" nv-file-select="" uploader="fileservice.uploader" class="hidden" options="{cardId: cardservice.getCurrent().id}"/>
+		<input ng-if="status.cardEditDescription" type="button" ng-mousedown="status.continueEdit = true; status.selectAttachment = true;" class="icon-files-dark" data-toggle="tooltip" data-placement="left" title="<?php p($l->t('Insert attachment')); ?>"/>
 
-		</div>
 	</div>
 	<div class="section-content card-attachments">
 		<div class="error icon-error" ng-if="fileservice.status"><strong>{{ fileservice.status.error }}</strong><br />{{ fileservice.status.message }}</div>