aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranika-ahluwalia <anika.ahluwalia@gmail.com>2020-08-01 15:39:15 -0500
committeranika-ahluwalia <anika.ahluwalia@gmail.com>2020-08-01 15:39:15 -0500
commitb317845a0aa01319ba0b6d45a0f61d8fa2075e3f (patch)
treeabfeabcf44d01a4295ee74b3ccb15dbf26e05a78
parent034e05b5bb587e361e9ab87160c9f3abddc9845b (diff)
UI changes
-rw-r--r--src/client/views/MainView.tsx2
-rw-r--r--src/client/views/collections/CollectionDockingView.scss14
-rw-r--r--src/client/views/collections/CollectionMenu.tsx1
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.scss17
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.tsx8
5 files changed, 25 insertions, 17 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 993c6f4b6..d095a9836 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -172,7 +172,7 @@ export class MainView extends React.Component {
fa.faFillDrip, fa.faLink, fa.faUnlink, fa.faBold, fa.faItalic, fa.faChevronLeft, fa.faUnderline, fa.faStrikethrough, fa.faSuperscript, fa.faSubscript,
fa.faIndent, fa.faEyeDropper, fa.faPaintRoller, fa.faBars, fa.faBrush, fa.faShapes, fa.faEllipsisH, fa.faHandPaper, fa.faMap, fa.faUser, faHireAHelper,
fa.faDesktop, fa.faTrashRestore, fa.faUsers, fa.faWrench, fa.faCog, fa.faMap, fa.faBellSlash, fa.faExpandAlt, fa.faArchive, fa.faBezierCurve, fa.faCircle,
- fa.faLongArrowAltRight, fa.faPenFancy, fa.faAngleDoubleRight, faBuffer, fa.faExpand, fa.faUndo);
+ fa.faLongArrowAltRight, fa.faPenFancy, fa.faAngleDoubleRight, faBuffer, fa.faExpand, fa.faUndo, fa.faSlidersH);
this.initEventListeners();
this.initAuthenticationRouters();
}
diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss
index 6d894b56a..27d66f796 100644
--- a/src/client/views/collections/CollectionDockingView.scss
+++ b/src/client/views/collections/CollectionDockingView.scss
@@ -12,12 +12,14 @@
width: 100%;
height: 100%;
position: absolute;
+
.miniThumb {
background: #25252525;
position: absolute;
}
}
}
+
.lm_title {
margin-top: 3px;
border-radius: 5px;
@@ -27,6 +29,7 @@
transform: translate(0px, -3px);
cursor: grab;
}
+
.lm_title.focus-visible {
cursor: text;
}
@@ -35,8 +38,9 @@
overflow: hidden;
height: 19px;
margin-top: -2px;
- display:inline-block;
+ display: inline-block;
}
+
.lm_active .lm_title {
border: solid 1px lightgray;
}
@@ -47,11 +51,11 @@
}
.lm_header .lm_tab {
- padding-right : 20px;
+ padding-right: 20px;
}
.lm_popout {
- display:none;
+ display: none;
}
.messageCounter {
@@ -74,6 +78,7 @@
position: absolute;
top: 0;
left: 0;
+
// overflow: hidden; // bcz: menus don't show up when this is on (e.g., the parentSelectorMenu)
.collectionDockingView-gear {
padding-left: 5px;
@@ -81,7 +86,10 @@
width: 18px;
display: inline-block;
margin: auto;
+
+ display: none;
}
+
.collectionDockingView-dragAsDocument {
touch-action: none;
position: absolute;
diff --git a/src/client/views/collections/CollectionMenu.tsx b/src/client/views/collections/CollectionMenu.tsx
index 498030b71..fdd1b4e81 100644
--- a/src/client/views/collections/CollectionMenu.tsx
+++ b/src/client/views/collections/CollectionMenu.tsx
@@ -415,6 +415,7 @@ export class CollectionFreeFormViewChrome extends React.Component<CollectionMenu
miniMap = (): void => {
this.document.hideMinimap = !this.document.hideMinimap;
}
+
private _palette = ["#D0021B", "#F5A623", "#F8E71C", "#8B572A", "#7ED321", "#417505", "#9013FE", "#4A90E2", "#50E3C2", "#B8E986", "#000000", "#4A4A4A", "#9B9B9B", "#FFFFFF", ""];
private _width = ["1", "5", "10", "100"];
// private _draw = ["⎯", "→", "↔︎", "∿", "↝", "↭", "ロ", "O", "∆"];
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.scss b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
index 8847fe89d..74f32275a 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.scss
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
@@ -14,18 +14,17 @@
padding-top: 12px;
padding-bottom: 12px;
display: flex;
-
- .propertiesView-title-name {
- font-size: 18px;
- font-weight: bold;
- padding-left: 45px;
- }
+ font-size: 18px;
+ font-weight: bold;
+ justify-content: center;
.propertiesView-title-icon {
width: 20px;
height: 20px;
padding-left: 38px;
margin-top: -5px;
+ right: 19;
+ position: absolute;
&:hover {
color: grey;
@@ -580,7 +579,7 @@
margin-right: 35px;
.arrows-head-title {
- font-size: 12;
+ font-size: 10;
}
.arrows-head-input {
@@ -593,7 +592,7 @@
display: flex;
.arrows-tail-title {
- font-size: 12;
+ font-size: 10;
}
.arrows-tail-input {
@@ -610,7 +609,7 @@
margin-bottom: 6px;
.dashed-title {
- font-size: 12;
+ font-size: 10;
}
.dashed-input {
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
index f39a75b81..3eb3ef8ab 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
@@ -115,7 +115,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
const rows: JSX.Element[] = [];
for (const key of Object.keys(ids).slice().sort()) {
const contents = doc[key];
- if (contents === "UNDEFINED") {
+ if (key[0] === "#") {
rows.push(<div style={{ display: "flex", overflowY: "visible", marginBottom: "2px" }} key={key}>
<span style={{ fontWeight: "bold", whiteSpace: "nowrap" }}>{key}</span>
&nbsp;
@@ -158,7 +158,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
for (const key of Object.keys(ids).slice().sort()) {
if (key[0] === key[0].toUpperCase() || key[0] === "#" || key === "author" || key === "creationDate" || key.indexOf("lastModified") !== -1) {
const contents = doc[key];
- if (contents === "UNDEFINED") {
+ if (key[0] === "#") {
rows.push(<div className="uneditable-field" key={key}>
<span style={{ fontWeight: "bold", whiteSpace: "nowrap" }}>{key}</span>
&nbsp;
@@ -211,7 +211,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
KeyValueBox.SetField(doc, newVal.substring(0, newVal.indexOf(":")), newVal.substring(newVal.indexOf(":") + 1, newVal.length), true);
return true;
} else if (value[0] === "#") {
- const newVal = value + ":'UNDEFINED'";
+ const newVal = value + `:'${value}'`;
KeyValueBox.SetField(doc, newVal.substring(0, newVal.indexOf(":")), newVal.substring(newVal.indexOf(":") + 1, newVal.length), true);
return true;
}
@@ -745,7 +745,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
return <div className="propertiesView" style={{ width: this.props.width }} >
<div className="propertiesView-title" style={{ width: this.props.width }}>
- <div className="propertiesView-title-name">Properties </div>
+ Properties
<div className="propertiesView-title-icon" onPointerDown={this.props.onDown}>
<FontAwesomeIcon icon="times" color="black" size="sm" />
</div>