diff options
| author | bobzel <zzzman@gmail.com> | 2020-09-06 16:48:25 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-09-06 16:48:25 -0400 |
| commit | 47e4998172b5f33d053da8855030fc8157dcdf21 (patch) | |
| tree | c57360200ee1d56fe783a0b5cdf09c9ddb9cfa2d /src/client/util | |
| parent | 2ef7900d1210bc0e5261e1d1f8fd1ba5f3a0ee4c (diff) | |
| parent | c6d6b4e9229b26e4a96001551962842f5384f372 (diff) | |
Merge branch 'acls_uv'
Diffstat (limited to 'src/client/util')
| -rw-r--r-- | src/client/util/Import & Export/DirectoryImportBox.tsx | 4 | ||||
| -rw-r--r-- | src/client/util/SettingsManager.scss | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/util/Import & Export/DirectoryImportBox.tsx b/src/client/util/Import & Export/DirectoryImportBox.tsx index d04270afa..7f01966b9 100644 --- a/src/client/util/Import & Export/DirectoryImportBox.tsx +++ b/src/client/util/Import & Export/DirectoryImportBox.tsx @@ -11,7 +11,7 @@ import { List } from "../../../fields/List"; import { listSpec } from "../../../fields/Schema"; import { SchemaHeaderField } from "../../../fields/SchemaHeaderField"; import { BoolCast, Cast, NumCast } from "../../../fields/Types"; -import { AcceptibleMedia, Upload } from "../../../server/SharedMediaTypes"; +import { AcceptableMedia, Upload } from "../../../server/SharedMediaTypes"; import { Utils } from "../../../Utils"; import { GooglePhotos } from "../../apis/google_docs/GooglePhotosClientUtils"; import { Docs, DocumentOptions, DocUtils } from "../../documents/Documents"; @@ -87,7 +87,7 @@ export class DirectoryImportBox extends React.Component<FieldViewProps> { const file = files.item(i); if (file && !unsupported.includes(file.type)) { const ext = path.extname(file.name).toLowerCase(); - if (AcceptibleMedia.imageFormats.includes(ext)) { + if (AcceptableMedia.imageFormats.includes(ext)) { validated.push(file); } } diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss index 68e0b91b0..badba35f4 100644 --- a/src/client/util/SettingsManager.scss +++ b/src/client/util/SettingsManager.scss @@ -159,14 +159,15 @@ .preferences-content { display: flex; margin-top: 4px; + color: black; + font-size: 11; .preferences-color { display: flex; margin-top: 2px; + width: 55; .preferences-color-text { - color: black; - font-size: 11; margin-top: 4; margin-right: 4; } @@ -179,7 +180,6 @@ .preferences-font-text { color: black; - font-size: 11; margin-top: 4; margin-right: 4; } |