Skip to content

Commit ab24c34

Browse files
jarrodekjarrodek
committed
Merge branch 'develop' into alpha
2 parents c197b1f + 00e449a commit ab24c34

File tree

10 files changed

+1352
-1102
lines changed

10 files changed

+1352
-1102
lines changed

‎.github/workflows/test-and-publish.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Test and build application
2+
3+
on: push
4+
5+
jobs:
6+
test:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
os: [macos-latest, ubuntu-latest]
11+
steps:
12+
- name: Check out Git repository
13+
uses: actions/checkout@v1
14+
- name: Install Node.js, NPM and Yarn
15+
uses: actions/setup-node@v1
16+
with:
17+
node-version: 14
18+
- name: Install dependencies
19+
run: npm install
20+
- name: Test electron application
21+
uses: GabrielBB/xvfb-action@v1
22+
with:
23+
run: npm test
24+
env:
25+
CI: true
26+
build:
27+
if: github.event == 'push' && github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/master'
28+
needs: test
29+
runs-on: ${{ matrix.os }}
30+
strategy:
31+
matrix:
32+
os: [macos-latest, ubuntu-latest, windows-latest]
33+
steps:
34+
- name: Check out Git repository
35+
uses: actions/checkout@v1
36+
37+
- name: Install Node.js, NPM and Yarn
38+
uses: actions/setup-node@v1
39+
with:
40+
node-version: 14
41+
42+
- name: Install dependencies
43+
run: npm install
44+
45+
- name: Prepare for app notarization
46+
if: startsWith(matrix.os, 'macos')
47+
# Import Apple API key for app notarization on macOS
48+
run: |
49+
mkdir -p ~/private_keys/
50+
echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
51+
52+
- name: Build/release Electron app
53+
uses: samuelmeuli/action-electron-builder@v1
54+
with:
55+
github_token: ${{ secrets.github_token }}
56+
release: true
57+
mac_certs: ${{ secrets.mac_certs }}
58+
mac_certs_password: ${{ secrets.mac_certs_password }}
59+
windows_certs: ${{ secrets.windows_certs }}
60+
windows_certs_password: ${{ secrets.windows_certs_password }}
61+
env:
62+
API_KEY_ID: ${{ secrets.api_key_id }}
63+
API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}

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

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
body {
1+
html {
22
--primary-color: #ffcc80;
33
--primary-text-color: #fff;
44
--accent-color: #E040FB;
55
--secondary-text-color: rgba(255, 255, 255, 0.84);
66
--primary-background-color: #212121;
7-
--secondary-background-color: #424242;
7+
--secondary-background-color: #313131;
88
--error-color: #ff9090;
99
--link-color: #8bc34a;
10-
--input-background-color: #494949;
10+
--input-background-color: var(--primary-background-color);
1111
--active-background-color: #616161;
1212

13-
background-color: var(--primary-background-color);
14-
color: var(--primary-text-color);
15-
1613
--anypoint-dropdown-shadow: 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 2px 4px -1px rgba(0, 0, 0, 0.4);
1714
--anypoint-autocomplete-dropdown-shadow: var(--anypoint-dropdown-shadow);
1815

@@ -68,6 +65,7 @@ body {
6865
--anypoint-button-emphasis-low-hover-background-color: var(--active-background-color);
6966
--anypoint-button-emphasis-low-focus-background-color: var(--anypoint-button-emphasis-low-hover-background-color);
7067
--anypoint-button-emphasis-low-focus-color: var(--primary-color);
68+
--anypoint-button-emphasis-high-color: #000;
7169
/* --anypoint-button-emphasis-high-hover-background-color: var(--primary-color); */
7270

7371
--code-mirror-background-color: #1e1e1e;
@@ -122,10 +120,13 @@ body {
122120
--authorization-method-oauth2-redirect-info-color: var(--secondary-text-color);
123121
--auth-method-certificate-second-line-color: var(--secondary-text-color);
124122

125-
--request-editor-url-area-background-color: var(--secondary-background-color);
123+
--request-editor-url-area-background-color: var(--primary-background-color);
126124
--request-editor-url-input-background-color: var(--primary-background-color);
125+
--workspace-tab-decorator-background-color: var(--secondary-background-color);
127126
--progress-info-background-color: #404040;
128127
--progress-info-color: var(--primary-text-color);
128+
--request-editor-pill-background-color: var(--secondary-background-color);
129+
--request-editor-pill-color: var(--primary-text-color);
129130

130131
--arc-request-workspace-tabs-close-color: #9e9e9e;
131132
--workspace-tabs-add-color: var(--primary-text-color);
@@ -159,15 +160,18 @@ body {
159160
--request-timings-progress-color: #c6f68d;
160161

161162
/* App toolbar */
162-
--arc-toolbar-background: var(--secondary-background-color);
163+
--arc-toolbar-background: var(--primary-background-color);
163164

164165
/* ARC menu */
165166
--arc-rail-menu-icon-color: #757575;
166167
--arc-rail-menu-icon-selected-color: var(--primary-text-color);
167-
--arc-menu-title-background-color: var(--secondary-background-color);
168+
--arc-menu-title-background-color: var(--primary-background-color);
168169
--arc-menu-title-color: var(--primary-text-color);
169-
--requests-list-history-group-header-background-color: var(--secondary-background-color);
170+
171+
--requests-list-history-group-header-background-color: var(--primary-background-color);
170172
--requests-list-item-history-group-header-color: rgba(255, 255, 255, 0.74);
173+
--requests-list-content-actions-background-color: var(--secondary-background-color);
174+
--requests-list-content-actions-icon-color: var(--secondary-text-color);
171175

172176
/* HTTP method colors */
173177
--http-get-color: #c6f68d;
@@ -212,8 +216,10 @@ body {
212216
--anypoint-dialog-content-color: var(--primary-text-color);
213217

214218
/* Bottom sheets */
215-
--bottom-sheet-background-color: var(--secondary-background-color);
219+
--bottom-sheet-background-color: var(--primary-background-color);
216220
--bottom-sheet-color: var(--primary-text-color);
221+
--arc-workspace-detail-data-list-color: var(--secondary-text-color);
222+
--saved-request-editor-options-color: var(--secondary-text-color);
217223

218224
/* Cookies manager */
219225
--cookie-details-meta-color: var(--primary-text-color);
@@ -224,4 +230,31 @@ body {
224230
/* API Console's try it */
225231
--api-endpoint-documentation-tryit-background-color: var(--secondary-background-color);
226232
--api-endpoint-documentation-tryit-panels-background-color: var(--primary-background-color);
233+
234+
/* Exchange browser */
235+
--exchange-search-list-item-author-color: var(--secondary-text-color);
236+
237+
/* variables overlay */
238+
--variables-overlay-background-color: var(--primary-background-color);
239+
--variables-overlay-color: var(--primary-text-color);
240+
--variables-overlay-intro-color: var(--secondary-text-color);
241+
--variables-overlay-var-name-color: var(--secondary-text-color);
242+
--variables-overlay-var-value-color: var(--secondary-text-color);
243+
244+
/* requests lists */
245+
--requests-list-history-group-header-background-color: var(--secondary-background-color);
246+
--requests-list-item-history-group-header-color: var(--secondary-text-color);
247+
--requests-list-content-actions-background-color: var(--secondary-background-color);
248+
--requests-list-content-actions-icon-color: var(--secondary-text-color);
249+
--requests-list-list-background-color: var(--primary-background-color);
250+
251+
/* Import / Export */
252+
--import-data-inspector-meta-color: var(--secondary-text-color);
253+
--import-table-auth-no-info-color: var(--secondary-text-color);
254+
}
255+
256+
body {
257+
background-color: var(--secondary-background-color);
258+
color: var(--primary-text-color);
259+
--arc-font-code-family: Noto, monospace;
227260
}

‎appresources/themes/@advanced-rest-client/arc-electron-dark-theme/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@advanced-rest-client/arc-electron-dark-theme",
33
"description": "Dark theme definition for Advanced REST Client",
4-
"version": "4.0.0",
4+
"version": "4.0.1",
55
"license": "Apache-2.0",
66
"main": "arc-electron-dark-theme.css",
77
"keywords": [

‎build/entitlements.mac.plist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>com.apple.security.cs.allow-jit</key>
6+
<true/>
57
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
68
<true/>
9+
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
10+
<true/>
711
</dict>
812
</plist>

0 commit comments

Comments
 (0)