ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix design issues on 15

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-11-08 17:55:23 +01:00
parent b60abba6e4
commit fc5cabedd0
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
css/style.scss
View File

@@ -191,7 +191,7 @@ input.input-inline {
&.current { &.current {
box-shadow: 0px 0px 7px 0px $color-darkgrey; 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 { #stack-add {
background-color: $color-lightgrey; background-color: $color-lightgrey;
background-color: var(--color-lightgrey); background-color: var(--color-background-dark);
border-radius: 3px; border-radius: 3px;
margin: 3px; margin: 3px;
display: flex; display: flex;
@@ -810,9 +810,9 @@ input.input-inline {
} }
&.unsaved { &.unsaved {
background-color: $color-lightgrey; background-color: $color-lightgrey;
background-color: var(--color-lightgrey); background-color: var(--color-background-dark);
color: $color-darkgrey; color: $color-darkgrey;
color: var(--color-darkgrey); color: var(--color-text-light);
} }
} }
@@ -873,7 +873,7 @@ input.input-inline {
z-index: 2; z-index: 2;
border-radius: 3px; border-radius: 3px;
box-shadow: 0 0 3px $color-darkgrey; 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; overflow: scroll;
} }
h3.attachment-selector { h3.attachment-selector {

10
js/controller/CardController.js
View File

@@ -117,7 +117,7 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
return match; return match;
}); });
CardService.update($scope.status.edit).then(function (data) { 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.unsaved').hide();
header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000); 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.cardEditDescriptionChanged = function ($event) {
$scope.status.lastEdit = Date.now(); $scope.status.lastEdit = Date.now();
var header = $('.section-header-tabbed .tabDetails'); var header = $('.tabDetails');
header.find('.save-indicator.unsaved').show(); header.find('.save-indicator.unsaved').show();
header.find('.save-indicator.saved').hide(); 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) { if (timeSinceEdit > 1000 && $scope.status.lastEdit > $scope.status.lastSave && !$scope.status.saving) {
$scope.status.lastSave = currentTime; $scope.status.lastSave = currentTime;
$scope.status.saving = true; $scope.status.saving = true;
var header = $('.section-header-tabbed .tabDetails'); var header = $('.tabDetails');
header.find('.save-indicator.unsaved').fadeIn(500); header.find('.save-indicator.unsaved').fadeIn(500);
CardService.update($scope.status.edit).then(function (data) { 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.unsaved').hide();
header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000); header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
$scope.status.saving = false; $scope.status.saving = false;
@@ -196,7 +196,7 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
CardService.update(card).then(function (data) { CardService.update(card).then(function (data) {
$scope.status.cardEditDescription = false; $scope.status.cardEditDescription = false;
$scope.updateMarkdown($scope.status.edit.description); $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.unsaved').hide();
header.find('.save-indicator.saved').fadeIn(500).fadeOut(1000); header.find('.save-indicator.saved').fadeIn(500).fadeOut(1000);
}); });

5
templates/part.card.php
View File

@@ -90,16 +90,17 @@
<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==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> <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> </ul>
<div class="tabDetails"> </div>
<div class="tabDetails" style="display: flex;">
<span class="save-indicator saved"><?php p($l->t('Saved')); ?></span> <span class="save-indicator saved"><?php p($l->t('Saved')); ?></span>
<span class="save-indicator unsaved"><?php p($l->t('Unsaved changes')); ?></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> <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> <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 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')); ?>"/> <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>
<div class="section-content card-attachments"> <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> <div class="error icon-error" ng-if="fileservice.status"><strong>{{ fileservice.status.error }}</strong><br />{{ fileservice.status.message }}</div>
<attachment-list-component ng-if="params.tab === 1 && cardservice.getCurrent() && isArray(cardservice.getCurrent().attachments)" attachments="cardservice.getCurrent().attachments"></attachment-list-component> <attachment-list-component ng-if="params.tab === 1 && cardservice.getCurrent() && isArray(cardservice.getCurrent().attachments)" attachments="cardservice.getCurrent().attachments"></attachment-list-component>