From 4929d8b562c4f6300053cfd7d9583106df75b221 Mon Sep 17 00:00:00 2001 From: eperelm2 Date: Tue, 18 Jul 2023 16:06:29 -0400 Subject: continued fixing merge --- src/client/views/PropertiesView.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/client/views/PropertiesView.scss') diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss index 060b506e3..23bf31b95 100644 --- a/src/client/views/PropertiesView.scss +++ b/src/client/views/PropertiesView.scss @@ -26,6 +26,17 @@ padding: 5px 10px; } + .propertiesView-propAndInfoGrouping{ + display: flex; + } + + .propertiesView-info{ + margin-top: 20; + margin-right: 10; + float: right; + font-size: 20; + } + .propertiesView-sharing { //border-bottom: 1px solid black; -- cgit v1.2.3-70-g09d2 From e09aaab486733de052f362d5710794f0b0e17d62 Mon Sep 17 00:00:00 2001 From: srichman333 Date: Thu, 24 Aug 2023 18:05:09 -0400 Subject: PropertiesView documentation info icon cleanup --- src/client/views/PropertiesView.scss | 2 ++ src/client/views/PropertiesView.tsx | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/client/views/PropertiesView.scss') diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss index a0b054851..e3a481206 100644 --- a/src/client/views/PropertiesView.scss +++ b/src/client/views/PropertiesView.scss @@ -23,6 +23,8 @@ padding: 10px; font-size: 24px; font-weight: bold; + display: flex; + flex-direction: row; } overflow-x: hidden; diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx index 82ab54787..9e054b876 100644 --- a/src/client/views/PropertiesView.tsx +++ b/src/client/views/PropertiesView.tsx @@ -1663,9 +1663,9 @@ export class PropertiesView extends React.Component {
Properties -
-
window.open('https://brown-dash.github.io/Dash-Documentation/')}> - {' '} +
window.open('https://brown-dash.github.io/Dash-Documentation/')}> + } color={StrCast(Doc.UserDoc().userColor)} /> +
-- cgit v1.2.3-70-g09d2 From f259986fec815660af93a3bf08e6f1baec029b85 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 27 Aug 2023 12:37:04 -0400 Subject: made info icon more visible for dark mode --- src/client/views/PropertiesView.scss | 3 +++ src/client/views/PropertiesView.tsx | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/client/views/PropertiesView.scss') diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss index e2e06cde9..bb91ee53d 100644 --- a/src/client/views/PropertiesView.scss +++ b/src/client/views/PropertiesView.scss @@ -42,6 +42,9 @@ margin-right: 10; float: right; font-size: 20; + path { + fill: white !important; + } } .propertiesView-sharing { diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx index b6aabb662..37b61ab41 100644 --- a/src/client/views/PropertiesView.tsx +++ b/src/client/views/PropertiesView.tsx @@ -1668,7 +1668,7 @@ export class PropertiesView extends React.Component { Properties
window.open('https://brown-dash.github.io/Dash-Documentation//properties/')}> - {' '} + {' '}
-- cgit v1.2.3-70-g09d2 From a1aab448616e3330bf53f82a8bd29209850a1d23 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 27 Aug 2023 14:01:55 -0400 Subject: more cleanup --- src/client/util/CurrentUserUtils.ts | 7 +++---- src/client/util/SettingsManager.tsx | 3 --- src/client/views/PropertiesView.scss | 8 ++++---- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src/client/views/PropertiesView.scss') diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index 672f7d99f..ea995e4af 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -1,7 +1,6 @@ import { observable, reaction, runInAction } from "mobx"; import * as rp from 'request-promise'; import { Doc, DocListCast, DocListCastAsync, Opt } from "../../fields/Doc"; -import { FieldLoader } from "../../fields/FieldLoader"; import { InkTool } from "../../fields/InkField"; import { List } from "../../fields/List"; import { PrefetchProxy } from "../../fields/Proxy"; @@ -12,7 +11,7 @@ import { Cast, DateCast, DocCast, StrCast } from "../../fields/Types"; import { nullAudio } from "../../fields/URLField"; import { SetCachedGroups, SharingPermissions } from "../../fields/util"; import { GestureUtils } from "../../pen-gestures/GestureUtils"; -import { OmitKeys, Utils, addStyleSheetRule } from "../../Utils"; +import { addStyleSheetRule, OmitKeys, Utils } from "../../Utils"; import { DocServer } from "../DocServer"; import { Docs, DocumentOptions, DocUtils, FInfo } from "../documents/Documents"; import { CollectionViewType, DocumentType } from "../documents/DocumentTypes"; @@ -20,8 +19,9 @@ import { TreeViewType } from "../views/collections/CollectionTreeView"; import { DashboardView } from "../views/DashboardView"; import { Colors } from "../views/global/globalEnums"; import { MainView } from "../views/MainView"; -import { ButtonType } from "../views/nodes/FontIconBox/FontIconBox"; import { OpenWhere } from "../views/nodes/DocumentView"; +import { ButtonType } from "../views/nodes/FontIconBox/FontIconBox"; +import { ImportElementBox } from "../views/nodes/importBox/ImportElementBox"; import { OverlayView } from "../views/OverlayView"; import { DragManager, dropActionType } from "./DragManager"; import { MakeTemplate } from "./DropConverter"; @@ -30,7 +30,6 @@ import { LinkManager } from "./LinkManager"; import { ScriptingGlobals } from "./ScriptingGlobals"; import { ColorScheme, SettingsManager } from "./SettingsManager"; import { UndoManager } from "./UndoManager"; -import { ImportElementBox } from "../views/nodes/importBox/ImportElementBox"; interface Button { // DocumentOptions fields a button can set diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx index 8133e9eff..4814c3644 100644 --- a/src/client/util/SettingsManager.tsx +++ b/src/client/util/SettingsManager.tsx @@ -17,9 +17,6 @@ import { FontIconBox } from '../views/nodes/FontIconBox/FontIconBox'; import { GroupManager } from './GroupManager'; import './SettingsManager.scss'; import { undoBatch } from './UndoManager'; -const higflyout = require('@hig/flyout'); -export const { anchorPoints } = higflyout; -export const Flyout = higflyout.default; export enum ColorScheme { Dark = 'Dark', diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss index 63b9b53c2..b116a622c 100644 --- a/src/client/views/PropertiesView.scss +++ b/src/client/views/PropertiesView.scss @@ -267,10 +267,10 @@ } } -.propertiesView-presentationTrails { - //border-bottom: 1px solid black; - //padding: 8.5px; -} +//.propertiesView-presentationTrails { +//border-bottom: 1px solid black; +//padding: 8.5px; +//} .inking-button { display: flex; -- cgit v1.2.3-70-g09d2