Merge pull request #695 from nextcloud/bugfix/noid/tabdetails

Fix tab details alignment
nextcloud · Nov 12, 2018 · 65e192e · 65e192e
2 parents 470538a + 81a0c62
commit 65e192e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/css/style.scss b/css/style.scss
@@ -776,6 +776,7 @@ input.input-inline {
 			flex: 1;
 		}
 	}
+
 	.section-header-tabbed {
 		margin-top: 10px;
 		margin-bottom: 5px;
@@ -785,8 +786,15 @@ input.input-inline {
 			margin: 0;
 			flex-grow: 1;
 		}
-		.tabDetails {
-			display: flex;
+	}
+
+	.tabDetails {
+		display: flex;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+		input[type=button] {
+			width: 32px;
 		}
 	}
 
@@ -796,7 +804,6 @@ input.input-inline {
 		padding: 0 10px;
 		font-size: 8pt;
 		display: none;
-		align-self: flex-end;
 		text-align: center;
 		&.saved {
 			background-color: $color-success;

diff --git a/templates/part.card.php b/templates/part.card.php
@@ -91,13 +91,12 @@
 			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}" ng-if="isTimelineEnabled()"><span class="icon icon-activity"></span><a><?php p($l->t('Timeline')); ?></a></li>
 		</ul>
 	</div>
-	<div class="tabDetails" style="display: flex;">
+	<div class="tabDetails" ng-if="params.tab === 0">
 		<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>
 		<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')); ?>"/>
-
+		<a href="https://deck.readthedocs.io/en/latest/Markdown/" 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>
 	</div>
 	<div class="section-content card-attachments">
 		<div>
@@ -126,9 +125,9 @@
 				  autofocus-on-insert> </textarea>
 		<div class="container" ng-click="clickCardDescription($event)"
 			 ng-if="!status.cardEditDescription" ng-animate>
-			<div id="markdown" ng-bind-html="description()">{{ description() }}</div>
 			<div class="placeholder"
 				 ng-if="!description()"><?php p($l->t('Add a card description…')); ?></div>
+			<div id="markdown" ng-bind-html="description()">{{ description() }}</div>
 		</div>
 	</div>