summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.eslintrc.js1
-rw-r--r--public/css/index.css18
-rw-r--r--public/css/ui/toolbar.css33
-rw-r--r--public/js/lib/editor/index.js4
-rw-r--r--public/js/lib/editor/toolbar.html34
-rw-r--r--public/vendor/showup/showup.css22
-rw-r--r--webpack.common.js12
7 files changed, 55 insertions, 69 deletions
diff --git a/.eslintrc.js b/.eslintrc.js
index b826a37b..cdd673fd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,6 +10,7 @@ module.exports = {
// wrong.
"import/first": ["warn"],
"indent": ["warn"],
+ "no-console": ["warn"],
"no-multiple-empty-lines": ["warn"],
"no-multi-spaces": ["warn"],
"object-curly-spacing": ["warn"],
diff --git a/public/css/index.css b/public/css/index.css
index c304a969..fb8356eb 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -20,24 +20,6 @@ body.night{
background: #333 !important;
}
-.toolbar {
- background-color: #1c1c1e;
- border: 1px solid #343434;
-}
-
-.toolbar > .btn-toolbar > .btn-group > .btn {
- background-color: #1c1c1e;
- padding: 5px;
- font-size: 1em;
-}
-
-.toolbar > .btn-toolbar > .btn-group > .btn:hover {
- background-color: #383a3e;
-
- padding: 5px;
-}
-
-
.CodeMirror {
font-family: "Source Code Pro", Consolas, monaco, monospace;
letter-spacing: 0.025em;
diff --git a/public/css/ui/toolbar.css b/public/css/ui/toolbar.css
new file mode 100644
index 00000000..fa51e1cb
--- /dev/null
+++ b/public/css/ui/toolbar.css
@@ -0,0 +1,33 @@
+.toolbar {
+ background-color: #fafafa;
+ border: 1px solid #ededed;
+}
+
+.toolbar > .btn-toolbar > .btn-group > .btn {
+ background-color: #fafafa;
+ padding: 5px;
+ font-size: 1em;
+ color: #555;
+}
+
+.toolbar > .btn-toolbar > .btn-group > .btn:hover {
+ background-color: #e1e1e1;
+ padding: 5px;
+}
+
+body.night .toolbar {
+ background-color: #1c1c1e;
+ border: 1px solid #353538;
+}
+
+body.night .toolbar > .btn-toolbar > .btn-group > .btn {
+ background-color: #1c1c1e;
+ padding: 5px;
+ font-size: 1em;
+ color: #5EB7E0;
+}
+
+body.night .toolbar > .btn-toolbar > .btn-group > .btn:hover {
+ background-color: #37373b;
+ padding: 5px;
+}
diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js
index 17d30ca4..8553caa9 100644
--- a/public/js/lib/editor/index.js
+++ b/public/js/lib/editor/index.js
@@ -3,6 +3,8 @@ import config from './config'
import statusBarTemplate from './statusbar.html'
import toolBarTemplate from './toolbar.html'
+import '../../../css/ui/toolbar.css'
+
/* config section */
const isMac = CodeMirror.keyMap.default === CodeMirror.keyMap.macDefault
const defaultEditorMode = 'gfm'
@@ -219,8 +221,8 @@ export default class Editor {
makeComment.click(() => {
utils.insertText(this.editor, '> []')
})
+
uploadImage.bind('change', function (e) {
- console.log("tiggered")
var files = e.target.files || e.dataTransfer.files
e.dataTransfer = {}
e.dataTransfer.files = files
diff --git a/public/js/lib/editor/toolbar.html b/public/js/lib/editor/toolbar.html
index 9ea1aacc..dc5b8ad4 100644
--- a/public/js/lib/editor/toolbar.html
+++ b/public/js/lib/editor/toolbar.html
@@ -1,49 +1,49 @@
<div class="toolbar">
<div class="btn-toolbar" role="toolbar" aria-label="Editor toolbar">
<div class="btn-group" role="group">
- <a id="makeBold" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Bold">
+ <a id="makeBold" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Bold">
<i class="fa fa-bold fa-fw"></i>
</a>
- <a id="makeItalic" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Italic">
+ <a id="makeItalic" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Italic">
<i class="fa fa-italic fa-fw"></i>
</a>
- <a id="makeStrike" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Strikethrough">
+ <a id="makeStrike" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Strikethrough">
<i class="fa fa-strikethrough fa-fw"></i>
</a>
- <a id="makeHeader" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Heading">
+ <a id="makeHeader" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Heading">
<i class="fa fa-h1 fa-fw">H</i>
</a>
- <a id="makeCode" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Code">
+ <a id="makeCode" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Code">
<i class="fa fa-code fa-fw"></i>
</a>
- <a id="makeQuote" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Quote">
+ <a id="makeQuote" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Quote">
<i class="fa fa-quote-right fa-fw"></i>
</a>
- <a id="makeGenericList" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="List">
+ <a id="makeGenericList" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="List">
<i class="fa fa-list fa-fw"></i>
</a>
- <a id="makeOrderedList" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Numbered List">
+ <a id="makeOrderedList" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Numbered List">
<i class="fa fa-list-ol fa-fw"></i>
</a>
- <a id="makeCheckList" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Check List">
+ <a id="makeCheckList" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Check List">
<i class="fa fa-check-square fa-fw"></i>
</a>
- <a id="makeLink" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Link">
+ <a id="makeLink" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Link">
<i class="fa fa-link fa-fw"></i>
</a>
- <a id="makeImage" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Image">
+ <a id="makeImage" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Image">
<i class="fa fa-image fa-fw"></i>
</a>
- <span id="uploadImage" class="btn btn-sm btn-dark btn-file ui-upload-image" title="Upload Image">
- <i class="fa fa-upload fa-fw"></i><input type="file" accept="image/*" name="upload" multiple>
- </span>
- <a id="makeTable" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Table">
+ <a id="uploadImage" class="btn btn-sm btn-file ui-upload-image" title="Upload Image">
+ <i class="fa fa-upload fa-fw"></i><input type="file" accept="image/*" name="upload" multiple title="Upload Image">
+ </a>
+ <a id="makeTable" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Table">
<i class="fa fa-table fa-fw"></i>
</a>
- <a id="makeLine" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Line">
+ <a id="makeLine" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Line">
<i class="fa fa-minus fa-fw"></i>
</a>
- <a id="makeComment" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Comment">
+ <a id="makeComment" class="btn btn-sm text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Comment">
<i class="fa fa-comment fa-fw"></i>
</a>
</div>
diff --git a/public/vendor/showup/showup.css b/public/vendor/showup/showup.css
index d92523fa..30d39ce0 100644
--- a/public/vendor/showup/showup.css
+++ b/public/vendor/showup/showup.css
@@ -87,26 +87,6 @@
margin-right: 10px;
}
-/* Light theme */
-.btn-light {
- color: #555;
- background-color: rgba(0, 0, 0,.1);
-}
-.btn-light:hover {
- color: #111;
- background-color: rgba(0, 0, 0,.25);
-}
-
-/* Dark theme */
-.btn-dark {
- color: #fff;
- background-color: rgba(0, 0, 0,.5);
-}
-.btn-dark:hover {
- color: #fff;
- background-color: rgba(0, 0, 0,.9);
-}
-
/* Buttons displayed throughout the content */
.btn-showup {
position: relative;
@@ -122,4 +102,4 @@
outline: none;
background-color: #39235A;
border-color: #39235A;
-} \ No newline at end of file
+}
diff --git a/webpack.common.js b/webpack.common.js
index 5c799739..ee8e9e80 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -392,18 +392,6 @@ module.exports = {
'css-loader'
]
}, {
- test: /\.scss$/,
- use: [
- MiniCssExtractPlugin.loader,
- {
- loader: 'css-loader',
- options: {
- importLoaders: 1
- }
- },
- 'sass-loader'
- ]
- }, {
test: /\.less$/,
use: [
MiniCssExtractPlugin.loader,
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 08:28:53 +0000