Skip to content

Commit 9b70773

Browse files
texodustexodus
authored
Merge pull request #3150 from perspective-dev/release-fixes
Workspace theme fixes
2 parents cbb0e7f + def4ff7 commit 9b70773

13 files changed

Lines changed: 301 additions & 217 deletions

File tree

‎docs/static/svg/perspective_logo.svg‎

Lines changed: 73 additions & 0 deletions
Loading

‎packages/viewer-datagrid/src/css/regular_table.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ regular-table table tbody td {
342342
}
343343

344344
regular-table table {
345+
font-size: 1em;
345346
user-select: none;
346347
color: inherit;
347348
border-collapse: separate;

‎packages/workspace/src/themes/pro-dark.css‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
perspective-workspace,
1414
perspective-workspace[theme="Pro Dark"],
1515
perspective-indicator[theme="Pro Dark"] {
16-
--theme-name: "Pro Dark";
16+
--psp-theme-name: "Pro Dark";
1717
}
1818

1919
perspective-workspace perspective-viewer {
@@ -23,11 +23,11 @@ perspective-workspace perspective-viewer {
2323

2424
perspective-workspace perspective-viewer.widget-maximize {
2525
--modal-panel--margin: -4px 0 -4px 0;
26-
--status-bar--border-radius: 6px 0 0 0;
27-
--main-column--margin: 3px 0 3px 3px;
28-
--main-column--border: 1px solid var(--inactive--color);
29-
--main-column--border-width: 1px 0px 1px 1px;
30-
--main-column--border-radius: 6px 0 0 6px;
26+
--psp-status-bar--border-radius: 6px 0 0 0;
27+
--psp-main-column--margin: 3px 0 3px 3px;
28+
--psp-main-column--border: 1px solid var(--psp-inactive--color);
29+
--psp-main-column--border-width: 1px 0px 1px 1px;
30+
--psp-main-column--border-radius: 6px 0 0 6px;
3131
--settings-button--margin: 10px 0 0 0;
3232
}
3333

@@ -55,62 +55,62 @@ perspective-workspace {
5555
--menu-new--content: "description";
5656
--menu-newview--content: "file_copy";
5757

58-
--workspace-tabbar--border: 1px solid var(--inactive--color);
59-
--workspace-tabbar--border-width: 0px 1px 1px 1px;
60-
--workspace-tabbar--border-radius: 6px;
61-
--workspace-tabbar--border-color: var(--inactive--color);
62-
--workspace-tabbar-tab--border-width: 1px 1px 0px 1px;
58+
--psp-workspace--tabbar--border: 1px solid var(--psp-inactive--color);
59+
--psp-workspace--tabbar--border-width: 0px 1px 1px 1px;
60+
--psp-workspace--tabbar--border-radius: 6px;
61+
--psp-workspace--tabbar--border-color: var(--psp-inactive--color);
62+
--psp-workspace--tabbar-tab--border-width: 1px 1px 0px 1px;
6363

6464
/* Workspace */
65-
--column-drag-handle--mask-image: url("../svg/drag-handle.svg");
66-
--bookmarks--mask-image: url("../svg/bookmark-icon.svg");
65+
--psp-icon--column-drag-handle--mask-image: url("../svg/drag-handle.svg");
66+
--psp-icon--bookmarks--mask-image: url("../svg/bookmark-icon.svg");
6767

6868
/* perspective-viewer-pro-dark--colors */
6969
background-color: #242526;
70-
--workspace-split-panel-handle--background-color: #242526;
70+
--psp-workspace--split-panel-handle--background-color: #242526;
7171
color: white;
72-
--icon--color: white;
73-
--active--color: #2770a9;
74-
--error--color: #ff9485;
75-
--inactive--color: #61656e;
76-
--inactive--border-color: #4c505b;
77-
--plugin--background: #242526;
78-
--active--background: rgba(39, 113, 170, 0.5);
79-
--expression--operator-color: #c5c9d0;
80-
--expression--function-color: #22a0ce;
81-
--expression--error-color: rgb(255, 136, 136);
82-
--calendar--filter: invert(1);
83-
--warning--color: #242526;
84-
--warning--background: var(--icon--color);
72+
--psp--color: white;
73+
--psp-active--color: #2770a9;
74+
--psp-error--color: #ff9485;
75+
--psp-inactive--color: #61656e;
76+
--psp-inactive--border-color: #4c505b;
77+
--psp--background-color: #242526;
78+
--psp-active--background: rgba(39, 113, 170, 0.5);
79+
--psp-expression--operator--color: #c5c9d0;
80+
--psp-expression--function--color: #22a0ce;
81+
--psp-expression--error--color: rgb(255, 136, 136);
82+
--psp-calendar--filter: invert(1);
83+
--psp-warning--color: #242526;
84+
--psp-warning--background: var(--psp--color);
8585

86-
--select-arrow--background-image: var(
87-
--select-arrow-light--background-image
86+
--psp-icon--select-arrow--mask-image: var(
87+
--psp-icon--select-arrow-light--mask-image
8888
);
8989

90-
--select-arrow--hover--background-image: var(
91-
--select-arrow-dark--background-image
90+
--psp-icon--select-arrow-hover--mask-image: var(
91+
--psp-icon--select-arrow-dark--mask-image
9292
);
9393

9494
/* Syntax */
95-
--code-editor-symbol--color: white;
96-
--code-editor-literal--color: #7dc3f0;
97-
--code-editor-operator--color: rgb(23, 166, 123);
98-
--code-editor-comment--color: rgb(204, 120, 48);
99-
--code-editor-column--color: #e18ee1;
95+
--psp-code-editor--symbol--color: white;
96+
--psp-code-editor--literal--color: #7dc3f0;
97+
--psp-code-editor--operator--color: rgb(23, 166, 123);
98+
--psp-code-editor--comment--color: rgb(204, 120, 48);
99+
--psp-code-editor--column--color: #e18ee1;
100100

101101
background-color: #000202;
102102
color: white;
103103
--workspace-tabbar--background-color: #242526;
104104
--workspace-secondary--color: #c5c9d0;
105-
--workspace-tabbar--border: 1px solid var(--inactive--color);
106-
--workspace-tabbar--border-width: 1px 1px 1px 1px;
107-
--workspace-tabbar--border-radius: 6px;
108-
--workspace-tabbar--border-color: var(--inactive--color);
109-
--workspace-tabbar-tab--border-width: 1px 1px 0 1px;
105+
--psp-workspace--tabbar--border: 1px solid var(--psp-inactive--color);
106+
--psp-workspace--tabbar--border-width: 1px 1px 1px 1px;
107+
--psp-workspace--tabbar--border-radius: 6px;
108+
--psp-workspace--tabbar--border-color: var(--psp-inactive--color);
109+
--psp-workspace--tabbar-tab--border-width: 1px 1px 0 1px;
110110
}
111111

112112
perspective-viewer[theme="Pro Dark"].workspace-master-widget {
113-
--plugin--background: #242526;
113+
--psp--background-color: #242526;
114114
}
115115

116116
perspective-workspace-menu {

‎packages/workspace/src/themes/pro.css‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
perspective-workspace,
1818
perspective-workspace[theme="Pro Light"],
1919
perspective-indicator[theme="Pro Light"] {
20-
--theme-name: "Pro Light";
20+
--psp-theme-name: "Pro Light";
2121
}
2222

2323
perspective-workspace {
@@ -43,50 +43,50 @@ perspective-workspace {
4343
--menu-close--content: "close";
4444
--menu-new--content: "description";
4545
--menu-newview--content: "file_copy";
46-
--workspace-split-panel-handle--background-color: #f2f4f6;
46+
--psp-workspace--split-panel-handle--background-color: #f2f4f6;
4747

48-
--workspace-tabbar--border: 1px solid var(--inactive--color);
49-
--workspace-tabbar--border-width: 1px 1px 1px 1px;
50-
--workspace-tabbar--border-radius: 6px;
51-
--workspace-tabbar--border-color: var(--inactive--color);
52-
--workspace-tabbar-tab--border-width: 1px 1px 0px 1px;
48+
--psp-workspace--tabbar--border: 1px solid var(--psp-inactive--color);
49+
--psp-workspace--tabbar--border-width: 1px 1px 1px 1px;
50+
--psp-workspace--tabbar--border-radius: 6px;
51+
--psp-workspace--tabbar--border-color: var(--psp-inactive--color);
52+
--psp-workspace--tabbar-tab--border-width: 1px 1px 0px 1px;
5353

5454
/* Workspace */
55-
--column-drag-handle--mask-image: url("../svg/drag-handle.svg");
56-
--bookmarks--mask-image: url("../svg/bookmark-icon.svg");
55+
--psp-icon--column-drag-handle--mask-image: url("../svg/drag-handle.svg");
56+
--psp-icon--bookmarks--mask-image: url("../svg/bookmark-icon.svg");
5757

5858
/* perspective-viewer-pro--colors */
5959
color: #161616;
6060
background-color: #dadada;
61-
--icon--color: #161616;
62-
--inactive--color: #ababab;
63-
--inactive--border-color: #dadada;
61+
--psp--color: #161616;
62+
--psp-inactive--color: #ababab;
63+
--psp-inactive--border-color: #dadada;
6464

65-
--active--color: #2670a9;
66-
--error--color: #ff471e;
67-
--plugin--background: #ffffff;
68-
--overflow-hint-icon--color: rgba(0, 0, 0, 0.2);
69-
--select--background-color: none;
70-
--warning--background: #042121;
71-
--warning--color: #fdfffd;
65+
--psp-active--color: #2670a9;
66+
--psp-error--color: #ff471e;
67+
--psp--background-color: #ffffff;
68+
--psp-icon-overflow-hint--color: rgba(0, 0, 0, 0.2);
69+
--psp-select--background-color: none;
70+
--psp-warning--background: #042121;
71+
--psp-warning--color: #fdfffd;
7272

73-
--select-arrow--background-image: var(
74-
--select-arrow-dark--background-image
73+
--psp-icon--select-arrow--mask-image: var(
74+
--psp-icon--select-arrow-dark--mask-image
7575
);
7676

77-
--select-arrow--hover--background-image: var(
78-
--select-arrow-light--background-image
77+
--psp-icon--select-arrow-hover--mask-image: var(
78+
--psp-icon--select-arrow-light--mask-image
7979
);
8080

8181
/* TODO deprecate me */
82-
--overflow-hint-icon--color: #fdfffd;
82+
--psp-icon-overflow-hint--color: #fdfffd;
8383
}
8484

8585
perspective-workspace perspective-viewer.widget-maximize {
8686
/* --modal-panel--margin: -4px 0 -4px 0; */
8787
--psp-status-bar--border-radius: 6px 0 0 0;
8888
--psp-main-column--margin: 3px 0 3px 3px;
89-
--psp-main-column--border: 1px solid var(--inactive--color);
89+
--psp-main-column--border: 1px solid var(--psp-inactive--color);
9090
--psp-main-column--border-width: 1px 0px 1px 1px;
9191
--psp-main-column--border-radius: 6px 0 0 6px;
9292
/* --settings-button--margin: 10px 0 0 0; */
@@ -99,7 +99,7 @@ perspective-workspace perspective-viewer {
9999

100100
perspective-viewer[theme="Pro Light"].workspace-master-widget {
101101
background-color: #f2f4f6;
102-
--plugin--background: #f2f4f6;
102+
--psp--background-color: #f2f4f6;
103103
regular-table {
104104
td,
105105
th {
@@ -109,7 +109,7 @@ perspective-viewer[theme="Pro Light"].workspace-master-widget {
109109
}
110110

111111
perspective-viewer {
112-
--bookmarks--mask-image: url("../svg/bookmark-icon.svg");
112+
--psp-icon--bookmarks--mask-image: url("../svg/bookmark-icon.svg");
113113
}
114114

115115
perspective-workspace-menu {

0 commit comments

Comments
 (0)