Skip to content

Commit 4c405e6

Browse files
MykolaYaremchukMykolaYaremchuk
committed
Applied new UI theme for Jetbrains
1 parent ac53670 commit 4c405e6

File tree

10 files changed

+87
-128
lines changed

10 files changed

+87
-128
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [2.0.35] - 2023-03-01
5+
### Changed
6+
- Applied new UI theme styles for Jetbrains
7+
48
## [2.0.34] - 2023-03-01
59
### Changed
610
- Configured CodeLens for Java project to open sidepane instead of "Recent Activity"
@@ -25,4 +29,5 @@ All notable changes to this project will be documented in this file.
2529
[2.0.32]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.31...v2.0.32
2630
[2.0.33]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.32...v2.0.33
2731
[2.0.34]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.33...v2.0.34
28-
[Unreleased]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.34...HEAD
32+
[2.0.35]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.34...v2.0.35
33+
[Unreleased]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.35...HEAD

‎src/main/java/org/digma/intellij/plugin/toolwindow/UiTheme.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.digma.intellij.plugin.toolwindow;
22

33
public enum UiTheme {
4-
DARK("dark"),
4+
DARK("dark-jetbrains"),
55
LIGHT("light"),
66
;
77

‎src/main/resources/webview/fonts/JetBrainsMono-Medium.ttf‎

112 KB
Binary file not shown.

‎src/main/resources/webview/fonts/Nunito-Bold.ttf‎

-129 KB
Binary file not shown.

‎src/main/resources/webview/fonts/Nunito-Medium.ttf‎

-129 KB
Binary file not shown.

‎src/main/resources/webview/fonts/Nunito-Regular.ttf‎

-129 KB
Binary file not shown.

‎src/main/resources/webview/fonts/Nunito-SemiBold.ttf‎

-129 KB
Binary file not shown.

‎src/main/resources/webview/index.html‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,25 @@
44
<meta charset="UTF-8" />
55
<style>
66
@font-face {
7-
font-family: "Nunito";
8-
src: url("/fonts/Nunito-Regular.ttf") format("truetype");
9-
font-weight: 400;
10-
font-style: normal;
11-
}
12-
13-
@font-face {
14-
font-family: "Nunito";
15-
src: url("/fonts/Nunito-Medium.ttf") format("truetype");
7+
font-family: "JetBrains Mono";
8+
src: url("/fonts/JetBrainsMono-Medium.ttf") format("truetype");
169
font-weight: 500;
1710
font-style: normal;
1811
}
19-
20-
@font-face {
21-
font-family: "Nunito";
22-
src: url("/fonts/Nunito-SemiBold.ttf") format("truetype");
23-
font-weight: 600;
24-
font-style: normal;
25-
}
26-
27-
@font-face {
28-
font-family: "Nunito";
29-
src: url("/fonts/Nunito-Bold.ttf") format("truetype");
30-
font-weight: 700;
31-
font-style: normal;
32-
}
3312
</style>
3413
</head>
3514
<body>
3615
<div id="root"></div>
3716
<!-- Environment variables -->
3817
<script>
39-
window.theme = "dark";
18+
window.environment;
19+
window.theme = "dark-jetbrains";
20+
window.mainFont;
21+
window.codeFont;
4022
window.recentActivityRefreshInterval;
4123
window.recentActivityExpirationLimit;
4224
window.recentActivityDocumentationURL = "https://github.com/digma-ai/digma-intellij-plugin/blob/main/README.md";
4325
</script>
44-
<script src="/main.js"></script>
26+
<script src="/index.js"></script>
4527
</body>
4628
</html>

src/main/resources/webview/main.js renamed to src/main/resources/webview/index.js

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

‎src/main/resources/webview/indextemplate.ftl‎

Lines changed: 25 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,28 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<style>
6-
@font-face {
7-
font-family: "Nunito";
8-
src: url("/fonts/Nunito-Regular.ttf") format("truetype");
9-
font-weight: 400;
10-
font-style: normal;
11-
}
12-
13-
@font-face {
14-
font-family: "Nunito";
15-
src: url("/fonts/Nunito-Medium.ttf") format("truetype");
16-
font-weight: 500;
17-
font-style: normal;
18-
}
19-
20-
@font-face {
21-
font-family: "Nunito";
22-
src: url("/fonts/Nunito-SemiBold.ttf") format("truetype");
23-
font-weight: 600;
24-
font-style: normal;
25-
}
26-
27-
@font-face {
28-
font-family: "Nunito";
29-
src: url("/fonts/Nunito-Bold.ttf") format("truetype");
30-
font-weight: 700;
31-
font-style: normal;
32-
}
33-
</style>
34-
</head>
35-
<body>
36-
<div id="root"></div>
37-
<!-- Environment variables -->
38-
<script>
39-
window.theme = "${theme}"
40-
window.recentActivityRefreshInterval;
41-
window.recentActivityExpirationLimit;
42-
window.recentActivityDocumentationURL = "https://github.com/digma-ai/digma-intellij-plugin/blob/main/README.md";
43-
</script>
44-
<script src="/main.js"></script>
45-
</body>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<style>
6+
@font-face {
7+
font-family: "JetBrains Mono";
8+
src: url("/fonts/JetBrainsMono-Medium.ttf") format("truetype");
9+
font-weight: 500;
10+
font-style: normal;
11+
}
12+
</style>
13+
</head>
14+
<body>
15+
<div id="root"></div>
16+
<!-- Environment variables -->
17+
<script>
18+
window.environment = "JetBrains";
19+
window.theme = "${theme}";
20+
window.mainFont;
21+
window.codeFont;
22+
window.recentActivityRefreshInterval;
23+
window.recentActivityExpirationLimit;
24+
window.recentActivityDocumentationURL;
25+
</script>
26+
<script src="/index.js"></script>
27+
</body>
4628
</html>

0 commit comments

Comments
 (0)