Skip to content

Commit 22ea159

Browse files
committed
Merge branch 'fix/drawer' into beta
2 parents 7878f40 + 42db92f commit 22ea159

File tree

7 files changed

+612
-710
lines changed

7 files changed

+612
-710
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,4 +333,9 @@ body {
333333
0 11px 15px -7px rgba(0, 0, 0, 0.4);
334334

335335
--variables-preview-overlay-background-color: var(--primary-background-color);
336+
--arc-env-container-color: #000;
337+
--arc-toolbar-variables-toggle-icon-color: #000;
338+
--arc-toolbar-back-icon-color: #000;
339+
--arc-env-selector-background-color: transparent;
340+
--arc-env-selector-color: #000;
336341
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,10 @@ body {
243243
--project-details-description-color: #fff;
244244

245245
--web-url-input-background-color: #616161;
246+
247+
--arc-env-container-color: #fff;
248+
--arc-toolbar-variables-toggle-icon-color: #fff;
249+
--arc-toolbar-back-icon-color: #fff;
246250
}
247251

248252
body[narrow] {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body {
1414
--menu-link-color: #111111;
1515
--link-color: #00A1DF;
1616
--toolbar-color: #ffffff;
17-
--toolbar-background-color: var(--primary-color);
17+
--toolbar-background-color: #00569a;
1818
--main-section-border-color: rgba(0, 0, 0, 0.12);
1919
--hover-button-accent-color: #df0052;
2020
--pages-fixed-height: calc(100vh - 64px);
@@ -133,6 +133,9 @@ body {
133133
--bottom-sheet-box-shadow: var(--box-shadow-6dp);
134134

135135
--variables-preview-overlay-background-color: var(--primary-background-color);
136+
--arc-env-container-color: #fff;
137+
--arc-toolbar-variables-toggle-icon-color: #fff;
138+
--arc-toolbar-back-icon-color: #fff;
136139
}
137140

138141
body[narrow] {

package-lock.json

Lines changed: 509 additions & 463 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,7 @@
236236
"webDependencies": [
237237
"jexl/lib/Jexl.js",
238238
"lit-element/lit-element.js",
239-
"@polymer/app-layout/app-layout.js",
240-
"@polymer/app-layout/app-drawer-layout/app-drawer-layout.js",
241-
"@polymer/app-layout/app-drawer/app-drawer.js",
242-
"@polymer/app-layout/app-header-layout/app-header-layout.js",
243-
"@polymer/app-layout/app-header/app-header.js",
244-
"@polymer/app-layout/app-toolbar/app-toolbar.js",
245239
"@polymer/paper-toast/paper-toast.js",
246-
"@polymer/iron-media-query/iron-media-query.js",
247240
"@polymer/iron-test-helpers/iron-test-helpers.js",
248241
"@advanced-rest-client/arc-icons/ArcIcons.js",
249242
"@advanced-rest-client/arc-messages-service/arc-messages-service.js",
@@ -253,6 +246,7 @@
253246
"@advanced-rest-client/host-rules-editor/host-rules-editor.js",
254247
"@advanced-rest-client/about-arc-electron/about-arc-electron.js",
255248
"@advanced-rest-client/arc-app-mixin/arc-app-mixin.js",
249+
"@advanced-rest-client/arc-app-mixin/AppStyles.js",
256250
"@advanced-rest-client/themes-panel/themes-panel.js",
257251
"@advanced-rest-client/variables-preview-overlay/variables-preview-overlay.js",
258252
"@advanced-rest-client/arc-request-workspace/arc-request-workspace.js",

src/AppStyles.js

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)