Merge pull request #44 from pferreir/fix-23
Fix toolbar day mode and upload button
This commit is contained in:
commit
dabcb91185
7 changed files with 55 additions and 69 deletions
|
@ -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"],
|
||||
|
|
|
@ -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;
|
||||
|
|
33
public/css/ui/toolbar.css
Normal file
33
public/css/ui/toolbar.css
Normal file
|
@ -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;
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
22
public/vendor/showup/showup.css
vendored
22
public/vendor/showup/showup.css
vendored
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -391,18 +391,6 @@ module.exports = {
|
|||
MiniCssExtractPlugin.loader,
|
||||
'css-loader'
|
||||
]
|
||||
}, {
|
||||
test: /\.scss$/,
|
||||
use: [
|
||||
MiniCssExtractPlugin.loader,
|
||||
{
|
||||
loader: 'css-loader',
|
||||
options: {
|
||||
importLoaders: 1
|
||||
}
|
||||
},
|
||||
'sass-loader'
|
||||
]
|
||||
}, {
|
||||
test: /\.less$/,
|
||||
use: [
|
||||
|
|
Loading…
Reference in a new issue