aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2019-09-16 19:34:49 -0400
committerSam Wilkins <samwilkins333@gmail.com>2019-09-16 19:34:49 -0400
commit97f1835d9ee5fba6aa6ebc5d792f6d8a4d979cfa (patch)
treea116ff9e871666cd1669f784d6cf579a8dd6135a /src/client
parent44175322d76505ac732435876464fe1f17005ad2 (diff)
directory import and document decorations tweaks
Diffstat (limited to 'src/client')
-rw-r--r--src/client/apis/google_docs/GoogleApiClientUtils.ts1
-rw-r--r--src/client/util/Import & Export/DirectoryImportBox.tsx6
-rw-r--r--src/client/views/DocumentDecorations.scss4
-rw-r--r--src/client/views/DocumentDecorations.tsx4
4 files changed, 4 insertions, 11 deletions
diff --git a/src/client/apis/google_docs/GoogleApiClientUtils.ts b/src/client/apis/google_docs/GoogleApiClientUtils.ts
index cbc5da15b..2c84741db 100644
--- a/src/client/apis/google_docs/GoogleApiClientUtils.ts
+++ b/src/client/apis/google_docs/GoogleApiClientUtils.ts
@@ -4,7 +4,6 @@ import { RouteStore } from "../../../server/RouteStore";
import { Opt } from "../../../new_fields/Doc";
import { isArray } from "util";
import { EditorState } from "prosemirror-state";
-import { RichTextField } from "../../../new_fields/RichTextField";
export const Pulls = "googleDocsPullCount";
export const Pushes = "googleDocsPushCount";
diff --git a/src/client/util/Import & Export/DirectoryImportBox.tsx b/src/client/util/Import & Export/DirectoryImportBox.tsx
index d371766dd..c9d34b594 100644
--- a/src/client/util/Import & Export/DirectoryImportBox.tsx
+++ b/src/client/util/Import & Export/DirectoryImportBox.tsx
@@ -156,11 +156,7 @@ export default class DirectoryImportBox extends React.Component<FieldViewProps>
if (docs.length < 50) {
importContainer = Docs.Create.MasonryDocument(docs, options);
} else {
- const headers = [
- new SchemaHeaderField("title", "yellow"),
- new SchemaHeaderField("size", "blue"),
- new SchemaHeaderField("googlePhotosTags", "green")
- ];
+ const headers = [new SchemaHeaderField("title"), new SchemaHeaderField("size")];
importContainer = Docs.Create.SchemaDocument(headers, docs, options);
}
runInAction(() => this.phase = 'External: uploading files to Google Photos...');
diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss
index 39fc7031a..117e63a37 100644
--- a/src/client/views/DocumentDecorations.scss
+++ b/src/client/views/DocumentDecorations.scss
@@ -287,10 +287,10 @@ $linkGap : 3px;
@keyframes shadow-pulse {
0% {
- box-shadow: 0 0 0 0px rgba(0, 0, 0, 0.2);
+ box-shadow: 0 0 0 0px rgba(0, 0, 0, 0.8);
}
100% {
- box-shadow: 0 0 0 35px rgba(0, 0, 0, 0);
+ box-shadow: 0 0 0 10px rgba(0, 255, 0, 0);
}
} \ No newline at end of file
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 0a971ed22..e8a1d08e4 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -727,9 +727,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
return (
<div className={"linkButtonWrapper"}>
<div title={`${published ? "Push" : "Publish"} to Google Docs`} className="linkButton-linker" onClick={() => {
- if (!published) {
- runInAction(() => this.isAnimatingPulse = true);
- }
+ runInAction(() => this.isAnimatingPulse = true);
DocumentDecorations.hasPushedHack = false;
this.targetDoc[Pushes] = NumCast(this.targetDoc[Pushes]) + 1;
}} style={{ animation: this.isAnimatingPulse ? "shadow-pulse 1s infinite" : "none" }}>