Skip to content

Commit 7544ebc

Browse files
committed
fix: fixes #205 - dark theme styling and theme manager logic
1 parent ec68682 commit 7544ebc

File tree

19 files changed

+531
-362
lines changed

19 files changed

+531
-362
lines changed

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"windows": {
1111
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
1212
},
13-
"args" : ["."]
13+
"args" : [".", "--debug", "--debug-level=\"silly\"", "--workspace-path=\"~/arc-dev/workspace\"", "--settings-file=\"~/arc-dev/dev-settings.json\"", "--themes-path=\"~/arc-dev/themes-esm\""]
1414
}
1515
]
16-
}
16+
}

app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
font-family: 'Roboto', 'Noto', sans-serif;
1515
color: #333;
1616
margin: 0;
17-
font-size: 100%;
1817
line-height: 1.5;
1918
background-color: var(--arc-bg-color);
2019
-webkit-user-select: none;
@@ -26,6 +25,7 @@
2625
html, body {
2726
height: 100%;
2827
margin: 0;
28+
font-size: 15px;
2929
}
3030

3131
.loader {

appresources/themes/@advanced-rest-client/arc-electron-anypoint-theme/arc-electron-anypoint-theme.css

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ body {
187187
--warning-contrast-color: #fff;
188188
--pages-fixed-height: calc(100vh - 64px);
189189
--arc-menu-height: 100%;
190-
--arc-toolbar-color: #ffffff;
190+
--arc-toolbar-color: #000;
191191
--arc-toolbar-background-color: var(--anypoint-color-steel5);
192192
--arc-toolbar-environment-selector-input-color: var(--anypoint-color-tertiary);
193193
--arc-toolbar-paper-icon-button-active-color: var(--anypoint-color-tertiary);
@@ -334,9 +334,12 @@ body {
334334

335335
--variables-preview-overlay-background-color: var(--primary-background-color);
336336
--arc-env-container-color: #000;
337-
--arc-toolbar-variables-toggle-icon-color: #000;
338-
--arc-toolbar-back-icon-color: #000;
339337
--arc-env-selector-background-color: transparent;
340338
--arc-env-selector-color: #000;
341-
--arc-toolbar-icon-color: #fff;
339+
340+
--arc-toolbar-variables-toggle-icon-color: #000;
341+
--arc-toolbar-back-icon-color: #000;
342+
--arc-toolbar-icon-color: #000;
343+
344+
--anypoint-item-hover-background-color: #EEEEEE;
342345
}

appresources/themes/@advanced-rest-client/arc-electron-dark-theme/arc-electron-dark-theme.css

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
body {
2+
background-color: #424242;
3+
height: 100vh;
4+
color: #fff;
5+
26
--arc-font-family: 'Roboto', 'Noto', sans-serif;
37
--arc-font-font-smoothing: antialiased;
48
--arc-font-code-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
@@ -41,9 +45,6 @@ body {
4145
--select-text-user-select: text;
4246
--select-text-cursor: text;
4347

44-
background-color: #424242;
45-
height: 100vh;
46-
color: #fff;
4748
--primary-color: #BBDEFB;
4849
--primary-text-color: #fff;
4950
--error-color: #FF5722;
@@ -183,6 +184,13 @@ body {
183184
--api-console-menu-color: #fff;
184185

185186
--api-endpoint-documentation-bottom-navigation-color: #fff;
187+
--api-navigation-section-title-focus-background-color: #616161;
188+
--api-endpoint-documentation-tryit-background-color: #424242;
189+
--api-endpoint-documentation-tryit-panels-background-color: #424242;
190+
--api-type-document-property-color: #fff;
191+
--api-endpoint-documentation-description-color: #fff;
192+
--api-body-document-code-color: #fff;
193+
186194

187195
--arc-menu-color: #fff;
188196
--request-list-item-history-group-header-color: #fff;
@@ -248,6 +256,10 @@ body {
248256
--arc-toolbar-variables-toggle-icon-color: #fff;
249257
--arc-toolbar-back-icon-color: #fff;
250258
--arc-toolbar-icon-color: #fff;
259+
--arc-toolbar-button-background-color: #212121;
260+
261+
--about-arc-version-label-color: #fff;
262+
--about-arc-updates-section-background-color: #424242;
251263
}
252264

253265
body[narrow] {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# arc-electron-default-theme
2+
3+
Default theme definition for Advanced REST Client - desktop client.
4+
5+
This package is installed by ARC automatically when new version is released.
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
{
22
"name": "@advanced-rest-client/arc-electron-default-theme",
3-
"description": "A default theme definition for Advanced REST Client",
4-
"version": "3.0.2",
3+
"description": "Default theme definition for Advanced REST Client",
4+
"version": "3.0.4",
55
"license": "Apache-2.0",
66
"main": "arc-electron-default-theme.css",
7+
"keywords": [
8+
"arc",
9+
"theme"
10+
],
711
"authors": [
812
"Pawel Psztyc",
913
"The Advanced REST client authors <[email protected]>"
1014
],
11-
"private": false,
12-
"scripts": {
13-
"lint": "polymer lint arc-electron-default-theme.html",
14-
"test": "exit 0"
15-
},
15+
"contributors": [
16+
"Pawel Psztyc",
17+
"The Advanced REST client authors <[email protected]>"
18+
],
1619
"repository": {
1720
"type": "git",
1821
"url": "git://github.com/advanced-rest-client/arc-electron-default-theme.git"
1922
},
2023
"bugs": {
2124
"url": "https://github.com/advanced-rest-client/arc-electron-default-theme/issues",
2225
"email": "[email protected]"
26+
},
27+
"private": false,
28+
"scripts": {
29+
"test": "exit 0"
2330
}
2431
}

appresources/themes/themes-info.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"kind": "ARC#ThemeInfo",
44
"themes": [
55
{
6-
"_id": "advanced-rest-client/arc-electron-default-theme",
6+
"_id": "@advanced-rest-client/arc-electron-default-theme",
77
"title": "Default theme",
88
"name": "@advanced-rest-client/arc-electron-default-theme",
99
"version": "3.0.2",
@@ -13,7 +13,7 @@
1313
"isDefault": true
1414
},
1515
{
16-
"_id": "advanced-rest-client/arc-electron-anypoint-theme",
16+
"_id": "@advanced-rest-client/arc-electron-anypoint-theme",
1717
"title": "Anypoint theme",
1818
"name": "@advanced-rest-client/arc-electron-anypoint-theme",
1919
"version": "3.0.2",
@@ -23,7 +23,7 @@
2323
"isDefault": true
2424
},
2525
{
26-
"_id": "advanced-rest-client/arc-electron-dark-theme",
26+
"_id": "@advanced-rest-client/arc-electron-dark-theme",
2727
"title": "Dark theme",
2828
"name": "@advanced-rest-client/arc-electron-dark-theme",
2929
"version": "3.0.2",

0 commit comments

Comments
 (0)