aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorusodhi <61431818+usodhi@users.noreply.github.com>2020-07-30 23:29:37 +0530
committerusodhi <61431818+usodhi@users.noreply.github.com>2020-07-30 23:29:37 +0530
commita61c116e9028c2778b5c48cd596f9cb00d80d0f6 (patch)
treec643e65b662b8ff81e5a97860fdc4d093e7f84f9 /src
parent8b963a68f3e14046679bb2037f0970b017ddcb05 (diff)
ui and other minor changes
Diffstat (limited to 'src')
-rw-r--r--src/client/util/GroupMemberView.scss2
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.scss15
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.tsx14
3 files changed, 20 insertions, 11 deletions
diff --git a/src/client/util/GroupMemberView.scss b/src/client/util/GroupMemberView.scss
index c609c5c7b..e8a4bc0c1 100644
--- a/src/client/util/GroupMemberView.scss
+++ b/src/client/util/GroupMemberView.scss
@@ -43,7 +43,7 @@
text-overflow: ellipsis;
&:hover {
- text-overflow: visible;
+ text-overflow: unset;
overflow-x: auto;
}
}
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.scss b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
index 4ccc0950b..4917b7822 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.scss
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
@@ -126,7 +126,7 @@
padding-left: 2px;
padding-right: 2px;
margin-top: 2px;
- margin-right: 3px;
+ margin-left: 3px;
.notify-button-icon {
width: 6px;
@@ -166,18 +166,25 @@
display: flex;
padding: 3px;
-
+ align-items: center;
border-bottom: 0.5px solid grey;
+ &:hover .propertiesView-sharingTable-item-name {
+ overflow-x: unset;
+ white-space: unset;
+ overflow-wrap: break-word;
+ }
+
.propertiesView-sharingTable-item-name {
font-weight: bold;
width: 80px;
overflow-x: hidden;
display: inline-block;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.propertiesView-sharingTable-item-permission {
-
display: flex;
.permissions-select {
@@ -185,6 +192,8 @@
border: none;
background-color: inherit;
width: 75px;
+ text-align: justify; // for Edge
+ text-align-last: end;
&:hover {
cursor: pointer;
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
index b33b37f4b..bd720ac82 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
@@ -263,7 +263,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
}
@computed get notifyIcon() {
- return <Tooltip title={<><div className="dash-tooltip">{"Notify group of permissions change"}</div></>}>
+ return <Tooltip title={<><div className="dash-tooltip">Notify with message</div></>}>
<div className="notify-button">
<FontAwesomeIcon className="notify-button-icon" icon="bell" color="white" size="sm" />
</div>
@@ -282,10 +282,10 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
</Tooltip>;
}
- sharingItem(name: string, notify: boolean, effectiveAcl: symbol, permission?: string) {
+ sharingItem(name: string, effectiveAcl: symbol, permission?: string) {
return <div className="propertiesView-sharingTable-item">
- <div className="propertiesView-sharingTable-item-name" style={{ width: notify ? "70px" : "80px" }}> {name} </div>
- {notify ? this.notifyIcon : null}
+ <div className="propertiesView-sharingTable-item-name" style={{ width: name !== "Me" ? "70px" : "80px" }}> {name} </div>
+ {name !== "Me" ? this.notifyIcon : null}
<div className="propertiesView-sharingTable-item-permission">
{effectiveAcl === AclAdmin && permission !== "Owner" ? this.getPermissionsSelect(name) : permission}
{permission === "Owner" ? this.expansionIcon : null}
@@ -308,12 +308,12 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
if (this.selectedDoc![AclSym]) {
for (const [key, value] of Object.entries(this.selectedDoc![AclSym])) {
const name = key.substring(4).replace("_", ".");
- if (name !== Doc.CurrentUserEmail && name !== this.selectedDoc!.author) tableEntries.push(this.sharingItem(name, false, effectiveAcl, AclMap.get(value)!));
+ if (name !== Doc.CurrentUserEmail && name !== this.selectedDoc!.author) tableEntries.push(this.sharingItem(name, effectiveAcl, AclMap.get(value)!));
}
}
- tableEntries.unshift(this.sharingItem("Me", false, effectiveAcl, Doc.CurrentUserEmail === this.selectedDoc!.author ? "Owner" : StrCast(this.selectedDoc![`ACL-${Doc.CurrentUserEmail.replace(".", "_")}`])));
- if (Doc.CurrentUserEmail !== this.selectedDoc!.author) tableEntries.unshift(this.sharingItem(StrCast(this.selectedDoc!.author), false, effectiveAcl, "Owner"));
+ tableEntries.unshift(this.sharingItem("Me", effectiveAcl, Doc.CurrentUserEmail === this.selectedDoc!.author ? "Owner" : StrCast(this.selectedDoc![`ACL-${Doc.CurrentUserEmail.replace(".", "_")}`])));
+ if (Doc.CurrentUserEmail !== this.selectedDoc!.author) tableEntries.unshift(this.sharingItem(StrCast(this.selectedDoc!.author), effectiveAcl, "Owner"));
return <div className="propertiesView-sharingTable">
{tableEntries}