nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-12-18 14:09:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed sharing styles

Browse source 
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
This commit is contained in:
fnuesse 2018-11-25 22:46:47 +01:00
parent 11005bd496
commit 02dfbdcf6e
No known key found for this signature in database
GPG key ID: 2089A3431243E819
6 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/importers/importer-passmanjson.js
View file

@ -42,7 +42,7 @@ var PassmanImporter = PassmanImporter || {};
var item = parsed_json[i]; var item = parsed_json[i];
var _credential = PassmanImporter.newCredential(); var _credential = PassmanImporter.newCredential();
_credential.label = item.label; _credential.label = item.label;
_credential.username = item.account; _credential.username = item.username;
_credential.password = item.password; _credential.password = item.password;
_credential.email = item.email; _credential.email = item.email;
_credential.url = item.url; _credential.url = item.url;

4
sass/credentials.scss
View file

@ -541,12 +541,12 @@
} }
white-space: nowrap; white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 70%; max-width: 100%;
} }
.tools { .tools {
margin-left: 10px; margin-left: 10px;
margin-top: 8px;
overflow: hidden; overflow: hidden;
float: left; float: left;
.cell { .cell {

11
sass/public-page.scss
View file

@ -30,6 +30,16 @@ header {
padding-top: 0; padding-top: 0;
} }
.share-controller{
width: 100%;
.share-container{
margin-top: 50px;
margin-left: auto;
margin-right: auto;
width: 25%;
}
}
.credential_container{ .credential_container{
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
@ -45,6 +55,7 @@ header {
} }
button, .text{ button, .text{
margin: 0 auto; margin: 0 auto;
margin-bottom: 25px;
display: block; display: block;
i{ i{
margin-right: 5px; margin-right: 5px;

8
sass/share_credential.scss
View file

@ -22,6 +22,10 @@
.sharing_table { .sharing_table {
.button{
min-height: 42px;
margin: 5px 0 0 0;
}
td:first-child { td:first-child {
width: 55%; width: 55%;
@ -52,6 +56,10 @@
} }
} }
.shared_table { .shared_table {
.pending{
margin-right: 10px;
}
.fa-trash { .fa-trash {
cursor: pointer; cursor: pointer;
} }

4
templates/public_share.php
View file

@ -66,7 +66,8 @@ style('passman', 'app');
style('passman', 'public-page'); style('passman', 'public-page');
?> ?>
<div ng-app="passmanApp" ng-controller="PublicSharedCredential"> <div class="share-controller" ng-app="passmanApp" ng-controller="PublicSharedCredential">
<div class="share-container">
<div class="row"> <div class="row">
<div class="col-xs-8 col-xs-push-2 col-xs-pull-2 credential_container"> <div class="col-xs-8 col-xs-push-2 col-xs-pull-2 credential_container">
<h2>Passman</h2> <h2>Passman</h2>
@ -204,4 +205,5 @@ style('passman', 'public-page');
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>

2
templates/views/partials/forms/share_credential/basics.html
View file

@ -78,7 +78,7 @@
<i class="fa fa-user" ng-if="user.pending === false"></i> <i class="fa fa-user" ng-if="user.pending === false"></i>
<i class="fa fa-user-times" ng-if="user.pending === true"></i> <i class="fa fa-user-times" ng-if="user.pending === true"></i>
{{user.userId}} {{user.userId}}
<small ng-if="user.pending === true" class="pull-right col-xs-4">{{ 'pending' | translate}}</small> <small ng-if="user.pending === true" class="pull-right pending">{{ 'pending' | translate}}</small>
</td> </td>
<td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.READ)" ng-checked="hasPermission(user.acl, default_permissions.permissions.READ)"> </td> <td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.READ)" ng-checked="hasPermission(user.acl, default_permissions.permissions.READ)"> </td>
<td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.WRITE)" ng-checked="hasPermission(user.acl, default_permissions.permissions.WRITE)"></td> <td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.WRITE)" ng-checked="hasPermission(user.acl, default_permissions.permissions.WRITE)"></td>