From 4fe24111c6eafc58927fcca9d8c46a5b92cc4078 Mon Sep 17 00:00:00 2001 From: Ashley Cai Date: Sat, 10 Jul 2021 00:17:09 -0700 Subject: Standardizing Colors, changing global CSS variables --- src/client/views/nodes/DocumentView.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/client/views/nodes/DocumentView.scss') diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss index bdbece621..8f86417d6 100644 --- a/src/client/views/nodes/DocumentView.scss +++ b/src/client/views/nodes/DocumentView.scss @@ -1,4 +1,4 @@ -@import "../globalCssVariables"; +@import "../global/globalCssVariables"; .documentView-effectsWrapper { border-radius: inherit; @@ -22,7 +22,7 @@ transition: outline .3s linear; cursor: grab; - // background: $light-color; //overflow: hidden; + // background: $white; //overflow: hidden; transform-origin: left top; &.minimized { @@ -218,6 +218,6 @@ .documentView-node:first-child { position: relative; - background: "#B59B66"; //$light-color; + background: "#B59B66"; //$white; } } \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 93c06962c18c916518616ab8f53944487e59fc2a Mon Sep 17 00:00:00 2001 From: bobzel Date: Thu, 29 Jul 2021 12:32:19 -0400 Subject: fixed linking to text in custom text view. --- src/client/views/nodes/DocumentView.scss | 2 +- src/client/views/nodes/formattedText/FormattedTextBox.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/views/nodes/DocumentView.scss') diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss index 8f86417d6..281f25fb3 100644 --- a/src/client/views/nodes/DocumentView.scss +++ b/src/client/views/nodes/DocumentView.scss @@ -147,7 +147,7 @@ .documentView-titleWrapper, .documentView-titleWrapper-hover { overflow: hidden; - color: white; + color: gray; transform-origin: top left; top: 0; width: 100%; diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx index 6dd63fb47..8cac21927 100644 --- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx +++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx @@ -787,7 +787,7 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<(FieldViewProp } componentDidMount() { - this.props.setContentView?.(this); // this tells the DocumentView that this AudioBox is the "content" of the document. this allows the DocumentView to indirectly call getAnchor() on the AudioBox when making a link. + !this.props.dontSelectOnLoad && this.props.setContentView?.(this); // this tells the DocumentView that this AudioBox is the "content" of the document. this allows the DocumentView to indirectly call getAnchor() on the AudioBox when making a link. this._cachedLinks = DocListCast(this.Document.links); this._disposers.breakupDictation = reaction(() => DocumentManager.Instance.RecordingEvent, this.breakupDictation); this._disposers.autoHeight = reaction(() => this.autoHeight, autoHeight => autoHeight && this.tryUpdateScrollHeight()); -- cgit v1.2.3-70-g09d2 From 41ccf50f2b551edd6827c9fd6296b9ff87a65915 Mon Sep 17 00:00:00 2001 From: geireann Date: Sat, 31 Jul 2021 15:32:37 -0400 Subject: linking updates and tab updates --- deploy/index.html | 105 +++++++++++++++++++++++- src/client/views/DocumentButtonBar.scss | 11 ++- src/client/views/DocumentDecorations.scss | 4 +- src/client/views/collections/TabDocView.tsx | 7 +- src/client/views/nodes/DocumentLinksButton.scss | 15 +++- src/client/views/nodes/DocumentLinksButton.tsx | 83 ++++++++++--------- src/client/views/nodes/DocumentView.scss | 2 +- src/client/views/topbar/TopBar.scss | 10 ++- src/client/views/topbar/TopBar.tsx | 2 +- 9 files changed, 182 insertions(+), 57 deletions(-) (limited to 'src/client/views/nodes/DocumentView.scss') diff --git a/deploy/index.html b/deploy/index.html index d96215391..c32aff638 100644 --- a/deploy/index.html +++ b/deploy/index.html @@ -11,8 +11,109 @@ - - + + diff --git a/src/client/views/DocumentButtonBar.scss b/src/client/views/DocumentButtonBar.scss index 621c2bf1b..157f3a4f2 100644 --- a/src/client/views/DocumentButtonBar.scss +++ b/src/client/views/DocumentButtonBar.scss @@ -50,10 +50,13 @@ $linkGap : 3px; } .documentButtonBar-button { - pointer-events: auto; - padding-right: 5px; - width: 25px; - height: 25px; + cursor: pointer; + display: flex; + width: 30px; + height: 30px; + align-content: center; + justify-content: center; + align-items: center; } .documentButtonBar-linker { diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss index 1715f35e7..952d8d150 100644 --- a/src/client/views/DocumentDecorations.scss +++ b/src/client/views/DocumentDecorations.scss @@ -263,7 +263,6 @@ $linkGap : 3px; } .link-button-container { - padding: $linkGap; border-radius: 10px; width: max-content; height: auto; @@ -271,6 +270,9 @@ $linkGap : 3px; flex-direction: row; z-index: 998; position: absolute; + justify-content: center; + align-items: center; + gap: 5px; background: $medium-gray; } diff --git a/src/client/views/collections/TabDocView.tsx b/src/client/views/collections/TabDocView.tsx index d82810652..a24f1eb7a 100644 --- a/src/client/views/collections/TabDocView.tsx +++ b/src/client/views/collections/TabDocView.tsx @@ -169,7 +169,12 @@ export class TabDocView extends React.Component { })); //attach the selection doc buttons menu to the drag handle - const stack = tab.contentItem.parent; + const stack: HTMLDivElement = tab.contentItem.parent; + const header: HTMLDivElement = tab; + console.log("Stack: " + stack.id, stack.className) + stack.onscroll = action((e: any) => { + console.log('scrolling...') + }) const moreInfoDrag = document.createElement("div"); moreInfoDrag.className = "lm_iconWrap"; tab._disposers.buttonDisposer = reaction(() => this.view, view => diff --git a/src/client/views/nodes/DocumentLinksButton.scss b/src/client/views/nodes/DocumentLinksButton.scss index 3809319d7..9bab72d55 100644 --- a/src/client/views/nodes/DocumentLinksButton.scss +++ b/src/client/views/nodes/DocumentLinksButton.scss @@ -1,6 +1,16 @@ @import "../global/globalCssVariables.scss"; +.documentLinksButton-menu { + width: 100%; + height: 100%; + position: relative; + display: flex; + align-content: center; + justify-content: center; + align-items: center; +} + .documentLinksButton-cont { min-width: 20; min-height: 20; @@ -10,8 +20,8 @@ .documentLinksButton, .documentLinksButton-endLink, .documentLinksButton-startLink { - height: 20px; - width: 20px; + height: 25px; + width: 25px; position: absolute; border-radius: 50%; opacity: 0.9; @@ -38,7 +48,6 @@ font-weight: bold; &:hover { - background: $medium-gray; transform: scale(1.05); cursor: pointer; } diff --git a/src/client/views/nodes/DocumentLinksButton.tsx b/src/client/views/nodes/DocumentLinksButton.tsx index ed0e2d1ad..cec06d2d4 100644 --- a/src/client/views/nodes/DocumentLinksButton.tsx +++ b/src/client/views/nodes/DocumentLinksButton.tsx @@ -252,49 +252,50 @@ export class DocumentLinksButton extends React.Component; - return
-
- {this.props.InMenu ? - this.props.StartLink ? - - : link - : Array.from(this.filteredLinks).length} -
- {this.props.InMenu && !this.props.StartLink && DocumentLinksButton.StartLink !== this.props.View.props.Document ? //if the origin node is not this node -
+
DocumentLinksButton.StartLink && DocumentLinksButton.finishLinkClick(e.clientX, e.clientY, DocumentLinksButton.StartLink, this.props.View.props.Document, true, this.props.View)}> - {this.props.StartLink ? - - : link} -
- : (null) - } - {DocumentLinksButton.StartLink === this.props.View.props.Document && this.props.InMenu && this.props.StartLink ? //if link has been started from current node, then set behavior of link button to deactivate linking when clicked again -
- {this.props.StartLink ? - - : link} + backgroundColor: Colors.LIGHT_BLUE, + color: Colors.BLACK, + width: btnDim, + height: btnDim, + }}> + {Array.from(this.filteredLinks).length}
- : (null) - } -
; +
+ : +
+ {this.props.InMenu && !this.props.StartLink && DocumentLinksButton.StartLink !== this.props.View.props.Document ? //if the origin node is not this node +
DocumentLinksButton.StartLink && DocumentLinksButton.finishLinkClick(e.clientX, e.clientY, DocumentLinksButton.StartLink, this.props.View.props.Document, true, this.props.View)}> + {this.props.StartLink ? + + : link} +
+ : (null) + } + { + this.props.InMenu ? //if link has been started from current node, then set behavior of link button to deactivate linking when clicked again +
+ {this.props.StartLink ? + + : link} +
+ : (null)} +
+ ) } render() { diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss index 281f25fb3..7f164ca48 100644 --- a/src/client/views/nodes/DocumentView.scss +++ b/src/client/views/nodes/DocumentView.scss @@ -147,7 +147,7 @@ .documentView-titleWrapper, .documentView-titleWrapper-hover { overflow: hidden; - color: gray; + color: $black; transform-origin: top left; top: 0; width: 100%; diff --git a/src/client/views/topbar/TopBar.scss b/src/client/views/topbar/TopBar.scss index adb968948..ebdf030e7 100644 --- a/src/client/views/topbar/TopBar.scss +++ b/src/client/views/topbar/TopBar.scss @@ -58,8 +58,8 @@ .topbar-dashSelect { border: none; - background-color: transparent; - color: black; + background-color: $dark-gray; + color: $white; font-family: 'Roboto'; font-size: 17; font-weight: 500; @@ -78,6 +78,7 @@ display: flex; justify-content: flex-end; gap: 5px; + margin-right: 5px; } .topbar-left { @@ -89,6 +90,10 @@ width: 450; gap: 5px; + .topBar-icon:hover { + background-color: $logout-red; + } + .topbar-lozenge-user, .topbar-lozenge { height: 23; @@ -99,7 +104,6 @@ padding: 4px; align-self: center; margin-left: 7px; - margin-right: 7px; display: flex; align-items: center; diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx index 6e4d4fe15..bd9935333 100644 --- a/src/client/views/topbar/TopBar.tsx +++ b/src/client/views/topbar/TopBar.tsx @@ -29,7 +29,7 @@ export class TopBar extends React.Component { {`${Doc.CurrentUserEmail}`}
window.location.assign(Utils.prepend("/logout"))}> - {"Logoff"} + {"Sign out"}
-- cgit v1.2.3-70-g09d2