summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-07-20 11:22:24 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-07-21 15:02:21 +0200
commit58debbe42c16ee4ab7d36ffc91a53ae953c09021 (patch)
tree1f2e0a7bc16ea5a3462a9f7d947444b01792e13f /apps
parente302cadae27ed560960b2b87810023ec4827aa4d (diff)
downloadnextcloud-server-58debbe42c16ee4ab7d36ffc91a53ae953c09021.tar.gz
nextcloud-server-58debbe42c16ee4ab7d36ffc91a53ae953c09021.zip
Tests fixes and design bump
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/files.scss3
-rw-r--r--apps/files_sharing/css/sharetabview.scss22
2 files changed, 23 insertions, 2 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 2a71af038cf..017253fdf8e 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -94,7 +94,8 @@
@include icon-color('star-dark', 'files', $color-black, 2, true);
}
.nav-icon-sharingin,
-.nav-icon-sharingout {
+.nav-icon-sharingout,
+.nav-icon-shareoverview {
@include icon-color('share', 'files', $color-black);
}
.nav-icon-sharinglinks {
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 82a04936bfd..b3516c68573 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -135,10 +135,16 @@
margin-left: 0;
margin-right: 0;
}
+ // share note on the sidebar
+ .share-note {
+ border-radius: var(--border-radius);
+ margin-bottom: 10px;
+ margin-left: 37px;
+ }
}
// Sharing tab users list
-#shareWithList {
+.shareWithList {
list-style-type: none;
display: flex;
flex-direction: column;
@@ -218,4 +224,18 @@
left: 8px;
right: auto;
}
+}
+
+.reshare,
+#link label,
+#expiration label {
+ display: inline-flex;
+ align-items: center;
+ .avatar {
+ margin-right: 5px;
+ }
+}
+
+.resharerInfoView.subView {
+ position: relative;
} \ No newline at end of file