From 485e1a78f6efe8ca1174be06420e625e21e4bc8c Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sun, 11 Jun 2017 17:55:06 -0400
Subject: [PATCH] fix: removed jquery explicit includes
---
client/js/app.js | 2 +-
client/js/components/editor.component.js | 2 +-
client/js/components/search.vue | 2 --
client/js/login.js | 2 +-
client/js/pages/content-view.component.js | 3 ++-
client/scss/app.scss | 2 +-
.../scss/components/{_editor.scss => editor.scss} | 15 +++++++++++++++
package.json | 2 +-
server/views/pages/edit.pug | 8 ++++++--
yarn.lock | 6 +++---
10 files changed, 31 insertions(+), 13 deletions(-)
rename client/scss/components/{_editor.scss => editor.scss} (96%)
diff --git a/client/js/app.js b/client/js/app.js
index c4f07b01..7e0ab444 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -1,8 +1,8 @@
'use strict'
+/* global $ */
/* eslint-disable no-new */
-import $ from 'jquery'
import Vue from 'vue'
import VueResource from 'vue-resource'
import VueClipboards from 'vue-clipboards'
diff --git a/client/js/components/editor.component.js b/client/js/components/editor.component.js
index ba43e928..43658d8f 100644
--- a/client/js/components/editor.component.js
+++ b/client/js/components/editor.component.js
@@ -1,6 +1,6 @@
'use strict'
-import $ from 'jquery'
+/* global $ */
let mde
diff --git a/client/js/components/search.vue b/client/js/components/search.vue
index 38f54a47..eb3d8810 100644
--- a/client/js/components/search.vue
+++ b/client/js/components/search.vue
@@ -18,8 +18,6 @@
</template>
<script>
- import * as $ from 'jquery'
-
export default {
data () {
return {
diff --git a/client/js/login.js b/client/js/login.js
index 2cd8d59d..892e3306 100644
--- a/client/js/login.js
+++ b/client/js/login.js
@@ -1,6 +1,6 @@
'use strict'
-import $ from 'jquery'
+/* global $ */
$(() => {
$('#login-user').focus()
diff --git a/client/js/pages/content-view.component.js b/client/js/pages/content-view.component.js
index fd6db5e4..2ab74411 100644
--- a/client/js/pages/content-view.component.js
+++ b/client/js/pages/content-view.component.js
@@ -1,7 +1,8 @@
'use strict'
+/* global $ */
+
import MathJax from 'mathjax'
-import $ from 'jquery'
export default {
name: 'content-view',
diff --git a/client/scss/app.scss b/client/scss/app.scss
index f0bbdb84..915b87e1 100644
--- a/client/scss/app.scss
+++ b/client/scss/app.scss
@@ -32,7 +32,7 @@ $primary: 'indigo';
@import 'node_modules/highlight.js/styles/atom-one-dark';
@import 'node_modules/simplemde/dist/simplemde.min';
-@import 'components/_editor';
+@import 'components/editor';
@import 'layout/_header';
@import 'layout/_loader';
diff --git a/client/scss/components/_editor.scss b/client/scss/components/editor.scss
similarity index 96%
rename from client/scss/components/_editor.scss
rename to client/scss/components/editor.scss
index f967c252..d5bdae77 100644
--- a/client/scss/components/_editor.scss
+++ b/client/scss/components/editor.scss
@@ -367,3 +367,18 @@ main > .ace-container {
bottom: 0;
right: 0;
}
+
+.editor-sd {
+ max-width: 250px;
+ flex: 0 1 250px;
+ background-color: mc('blue-grey', '100');
+
+ &-item {
+ background-color: mc('blue-grey', '50');
+
+ &:first-child {
+ margin-top: 60px;
+ }
+ }
+
+}
diff --git a/package.json b/package.json
index 1ec3593c..9a06fd26 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
"eslint-plugin-node": "^5.0.0",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
- "fuse-box": "2.1.0-beta.10",
+ "fuse-box": "^2.0.2",
"i18next-xhr-backend": "^1.4.2",
"jest": "^20.0.4",
"jquery": "^3.2.1",
diff --git a/server/views/pages/edit.pug b/server/views/pages/edit.pug
index 7373e967..120acb2d 100644
--- a/server/views/pages/edit.pug
+++ b/server/views/pages/edit.pug
@@ -15,8 +15,12 @@ block rootNavRight
block content
editor(inline-template, current-path=pageData.meta.path, v-cloak)
- .editor-area
- textarea(ref='editorTextArea', v-pre)= pageData.markdown
+ .columns.is-gapless
+ .column.editor-area
+ textarea(ref='editorTextArea', v-pre)= pageData.markdown
+ .column.editor-sd
+ .editor-sd-item Images
+ .editor-sd-item Files
editor-file
editor-video
diff --git a/yarn.lock b/yarn.lock
index bc6655c3..0cf8f668 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2618,9 +2618,9 @@ functional-red-black-tree@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-fuse-box@2.1.0-beta.10:
- version "2.1.0-beta.10"
- resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.1.0-beta.10.tgz#37a3eced1aaa3e665a848af6523f3b87f39e6cbc"
+fuse-box@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.0.2.tgz#f1171f1c7d5a584dc8151dbfbb50f739c1477b82"
dependencies:
acorn "^4.0.3"
acorn-es7 "^0.1.0"