Skip to content

Commit

Permalink
Merge pull request #191 from emqx/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
CrazyWisdom authored Mar 16, 2020
2 parents 9519087 + cdd321f commit bbccf42
Show file tree
Hide file tree
Showing 35 changed files with 1,282 additions and 510 deletions.
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "MQTTX",
"author": "EMQ X Team",
"version": "1.2.3",
"version": "1.3.0",
"license": "Apache",
"description": "MQTT desktop client",
"repository": "https://github.com/emqx/MQTTX",
Expand All @@ -19,13 +19,14 @@
"main": "background.js",
"dependencies": {
"axios": "^0.19.0",
"core-js": "^2.6.5",
"core-js": "^2.6.11",
"element-ui": "^2.13.0",
"fs-extra": "^8.1.0",
"jump.js": "^1.0.2",
"lodash-id": "^0.14.0",
"lowdb": "^1.0.0",
"moment": "^2.24.0",
"monaco-editor": "^0.20.0",
"mqtt": "^3.0.0",
"vue": "^2.6.10",
"vue-class-component": "^7.0.2",
Expand All @@ -41,18 +42,19 @@
"@types/jump.js": "^1.0.3",
"@types/lodash": "^4.14.142",
"@types/lowdb": "^1.0.9",
"@types/mocha": "^5.2.4",
"@vue/cli-plugin-babel": "^3.8.0",
"@vue/cli-plugin-e2e-cypress": "^3.8.0",
"@vue/cli-plugin-typescript": "^3.8.0",
"@vue/cli-plugin-unit-mocha": "^3.8.0",
"@vue/cli-service": "^3.8.0",
"@types/mocha": "^5.2.7",
"@vue/cli-plugin-babel": "^3.12.1",
"@vue/cli-plugin-e2e-cypress": "^3.12.1",
"@vue/cli-plugin-typescript": "^3.12.1",
"@vue/cli-plugin-unit-mocha": "^3.12.1",
"@vue/cli-service": "^3.12.1",
"@vue/test-utils": "1.0.0-beta.29",
"babel-plugin-component": "^1.1.1",
"chai": "^4.1.2",
"electron": "^5.0.0",
"monaco-editor-webpack-plugin": "^1.9.0",
"node-sass": "^4.9.0",
"sass-loader": "^7.1.0",
"sass-loader": "^7.3.1",
"typescript": "^3.7.4",
"vue-cli-plugin-electron-builder": "^1.4.4",
"vue-template-compiler": "^2.6.10"
Expand Down
7 changes: 7 additions & 0 deletions src/assets/scss/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ body {
color: var(--color-text-default);
}

body.select-none {
-moz-user-select: none;
-khtml-user-select: none;
user-select: none;
}

* {
box-sizing: border-box;
}
Expand Down Expand Up @@ -48,6 +54,7 @@ p {
pre {
font-size: $font-size--body;
margin-bottom: 0px;
font-family: Menlo, Monaco, "Courier New", monospace;
}

a {
Expand Down
1 change: 1 addition & 0 deletions src/assets/scss/theme/dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ body.dark {
--color-bg-messagebox: #303133;
--color-bg-follows: #4a4a4a;
--color-bg-code: #38404a;
--color-bg-input_btn: transparent;

/* Font color */
--color-text-title: #ffffff;
Expand Down
139 changes: 139 additions & 0 deletions src/assets/scss/theme/editor-dark.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"base": "vs-dark",
"inherit": true,
"rules": [{
"foreground": "75715e",
"token": "comment"
},
{
"foreground": "e6db74",
"token": "string"
},
{
"foreground": "ae81ff",
"token": "constant.numeric"
},
{
"foreground": "ae81ff",
"token": "constant.language"
},
{
"foreground": "ae81ff",
"token": "constant.character"
},
{
"foreground": "ae81ff",
"token": "constant.other"
},
{
"foreground": "f92672",
"token": "keyword"
},
{
"foreground": "f92672",
"token": "storage"
},
{
"foreground": "66d9ef",
"fontStyle": "italic",
"token": "storage.type"
},
{
"foreground": "a6e22e",
"fontStyle": "underline",
"token": "entity.name.class"
},
{
"foreground": "a6e22e",
"fontStyle": "italic underline",
"token": "entity.other.inherited-class"
},
{
"foreground": "a6e22e",
"token": "entity.name.function"
},
{
"foreground": "fd971f",
"fontStyle": "italic",
"token": "variable.parameter"
},
{
"foreground": "f92672",
"token": "entity.name.tag"
},
{
"foreground": "a6e22e",
"token": "entity.other.attribute-name"
},
{
"foreground": "66d9ef",
"token": "support.function"
},
{
"foreground": "66d9ef",
"token": "support.constant"
},
{
"foreground": "66d9ef",
"fontStyle": "italic",
"token": "support.type"
},
{
"foreground": "66d9ef",
"fontStyle": "italic",
"token": "support.class"
},
{
"foreground": "f8f8f0",
"background": "f92672",
"token": "invalid"
},
{
"foreground": "f8f8f0",
"background": "ae81ff",
"token": "invalid.deprecated"
},
{
"foreground": "cfcfc2",
"token": "meta.structure.dictionary.json string.quoted.double.json"
},
{
"foreground": "75715e",
"token": "meta.diff"
},
{
"foreground": "75715e",
"token": "meta.diff.header"
},
{
"foreground": "f92672",
"token": "markup.deleted"
},
{
"foreground": "a6e22e",
"token": "markup.inserted"
},
{
"foreground": "e6db74",
"token": "markup.changed"
},
{
"foreground": "ae81ffa0",
"token": "constant.numeric.line-number.find-in-files - match"
},
{
"foreground": "e6db74",
"token": "entity.name.filename.find-in-files"
}
],
"colors": {
"editor.foreground": "#F8F8F2",
"editor.background": "#282828",
"editor.selectionBackground": "#49483E",
"editor.lineHighlightBackground": "#3E3D32",
"editorCursor.foreground": "#F8F8F0",
"editorWhitespace.foreground": "#3B3A32",
"editorIndentGuide.activeBackground": "#9D550FB0",
"editor.selectionHighlightBorder": "#222218"
}
}
139 changes: 139 additions & 0 deletions src/assets/scss/theme/editor-night.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"base": "vs-dark",
"inherit": true,
"rules": [{
"foreground": "75715e",
"token": "comment"
},
{
"foreground": "e6db74",
"token": "string"
},
{
"foreground": "ae81ff",
"token": "constant.numeric"
},
{
"foreground": "ae81ff",
"token": "constant.language"
},
{
"foreground": "ae81ff",
"token": "constant.character"
},
{
"foreground": "ae81ff",
"token": "constant.other"
},
{
"foreground": "f92672",
"token": "keyword"
},
{
"foreground": "f92672",
"token": "storage"
},
{
"foreground": "66d9ef",
"fontStyle": "italic",
"token": "storage.type"
},
{
"foreground": "a6e22e",
"fontStyle": "underline",
"token": "entity.name.class"
},
{
"foreground": "a6e22e",
"fontStyle": "italic underline",
"token": "entity.other.inherited-class"
},
{
"foreground": "a6e22e",
"token": "entity.name.function"
},
{
"foreground": "fd971f",
"fontStyle": "italic",
"token": "variable.parameter"
},
{
"foreground": "f92672",
"token": "entity.name.tag"
},
{
"foreground": "a6e22e",
"token": "entity.other.attribute-name"
},
{
"foreground": "66d9ef",
"token": "support.function"
},
{
"foreground": "66d9ef",
"token": "support.constant"
},
{
"foreground": "66d9ef",
"fontStyle": "italic",
"token": "support.type"
},
{
"foreground": "66d9ef",
"fontStyle": "italic",
"token": "support.class"
},
{
"foreground": "f8f8f0",
"background": "f92672",
"token": "invalid"
},
{
"foreground": "f8f8f0",
"background": "ae81ff",
"token": "invalid.deprecated"
},
{
"foreground": "cfcfc2",
"token": "meta.structure.dictionary.json string.quoted.double.json"
},
{
"foreground": "75715e",
"token": "meta.diff"
},
{
"foreground": "75715e",
"token": "meta.diff.header"
},
{
"foreground": "f92672",
"token": "markup.deleted"
},
{
"foreground": "a6e22e",
"token": "markup.inserted"
},
{
"foreground": "e6db74",
"token": "markup.changed"
},
{
"foreground": "ae81ffa0",
"token": "constant.numeric.line-number.find-in-files - match"
},
{
"foreground": "e6db74",
"token": "entity.name.filename.find-in-files"
}
],
"colors": {
"editor.foreground": "#F8F8F2",
"editor.background": "#292B33",
"editor.selectionBackground": "#49483E",
"editor.lineHighlightBackground": "#3E3D32",
"editorCursor.foreground": "#F8F8F0",
"editorWhitespace.foreground": "#3B3A32",
"editorIndentGuide.activeBackground": "#9D550FB0",
"editor.selectionHighlightBorder": "#222218"
}
}
1 change: 1 addition & 0 deletions src/assets/scss/theme/light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ body.light {
--color-bg-messagebox: #ffffff;
--color-bg-follows: #efefef;
--color-bg-code: #e6eef7;
--color-bg-input_btn: #F5F7FA;

/* Font color */
--color-text-title: #262626;
Expand Down
1 change: 1 addition & 0 deletions src/assets/scss/theme/night.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ body.night {
--color-bg-messagebox: #31333F;
--color-bg-follows: #393a42;
--color-bg-code: #4f5965;
--color-bg-input_btn: transparent;

/* Font color */
--color-text-title: #ffffff;
Expand Down
Loading

0 comments on commit bbccf42

Please sign in to comment.