aboutsummaryrefslogtreecommitdiff
path: root/src/client/util
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2020-09-06 09:24:50 -0400
committerGitHub <noreply@github.com>2020-09-06 09:24:50 -0400
commit98b4c7b3269f61c65c561709c432fcd2078f82f0 (patch)
treecf5f3fa3c458935dffecb96ee678962b1b6ab5c5 /src/client/util
parent2ef7900d1210bc0e5261e1d1f8fd1ba5f3a0ee4c (diff)
parent41c890ed4ffadc8fd6734052b8aa5accb463cd7f (diff)
Merge pull request #681 from browngraphicslab/acls_uv
Some small changes
Diffstat (limited to 'src/client/util')
-rw-r--r--src/client/util/Import & Export/DirectoryImportBox.tsx4
-rw-r--r--src/client/util/SettingsManager.scss6
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..9f271594e 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;
+ width: 55;
margin-top: 2px;
.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;
}