Skip to content

refactor(ui): reapply legacy widget PCUI migration #2138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kpal81xd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(ui): reapply legacy widget PCUI migration #2138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sass/code-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,5 +739,5 @@ strong {
}
}

@import 'common/ui-common';
@import 'common/shared-overlays';
@import 'common/version-control';
0 sass/common/_ui-common.scss → sass/common/_shared-overlays.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions sass/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import 'pcui/pcui';
@import 'common/fonts';
@import 'common/monaco-merge';
@import 'ui/ui';
@import 'editor/editor-pcui-compat';
@import 'editor/editor-main';
@import 'ui/theme-dark';
@import 'editor/editor-pcui-compat-theme';
@import 'editor/editor-common';
@import 'editor/editor-version-control-picker';
@import 'editor/editor-version-control-diff';
Expand Down
48 changes: 24 additions & 24 deletions sass/editor/_editor-attributes-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,12 +687,12 @@
.ui-panel.component {
outline: none;

> header {
> :is(header, .ui-header) {
text-transform: uppercase;
}

&.pcui-collapsible {
> header {
> :is(header, .ui-header) {
border-top: 1px solid $bcg-darker;

&:hover {
Expand All @@ -702,7 +702,7 @@
}

&.pcui-collapsed {
> header {
> :is(header, .ui-header) {
background-color: $bcg-primary;

&:hover {
Expand All @@ -714,7 +714,7 @@
}

&.entity {
> header {
> :is(header, .ui-header) {
border-top: 1px solid $bcg-dark;

> .title {
Expand Down Expand Up @@ -774,80 +774,80 @@
}
}

&.script > header > .title::before {
&.script > :is(header, .ui-header) > .title::before {
content: '\E236';
}

&.model > header > .title::before {
&.model > :is(header, .ui-header) > .title::before {
content: '\E188';
}

&.animation > header > .title::before {
&.animation > :is(header, .ui-header) > .title::before {
content: '\E198';
}

&.audiosource > header > .title::before {
&.audiosource > :is(header, .ui-header) > .title::before {
content: '\E197';
}

&.sound > header > .title::before {
&.sound > :is(header, .ui-header) > .title::before {
content: '\E197';
}

&.collision > header > .title::before {
&.collision > :is(header, .ui-header) > .title::before {
content: '\E187';
}

&.rigidbody > header > .title::before {
&.rigidbody > :is(header, .ui-header) > .title::before {
content: '\E189';
}

&.particlesystem > header > .title::before {
&.particlesystem > :is(header, .ui-header) > .title::before {
content: '\E199';
}

&.light > header > .title::before {
&.light > :is(header, .ui-header) > .title::before {
content: '\E194';
}

&.audiolistener > header > .title::before {
&.audiolistener > :is(header, .ui-header) > .title::before {
content: '\E196';
}

&.camera > header > .title::before {
&.camera > :is(header, .ui-header) > .title::before {
content: '\E212';
}

&.screen > header > .title::before {
&.screen > :is(header, .ui-header) > .title::before {
content: '\E403';
}

&.element > header > .title::before {
&.element > :is(header, .ui-header) > .title::before {
content: '\E378';
}

&.button > header > .title::before {
&.button > :is(header, .ui-header) > .title::before {
content: '\E405';
}

&.scrollview > header > .title::before {
&.scrollview > :is(header, .ui-header) > .title::before {
content: '\E408';
}

&.scrollbar > header > .title::before {
&.scrollbar > :is(header, .ui-header) > .title::before {
content: '\E409';
}

&.sprite > header > .title::before {
&.sprite > :is(header, .ui-header) > .title::before {
content: '\E395';
}

&.layoutgroup > header > .title::before,
&.layoutchild > header > .title::before {
&.layoutgroup > :is(header, .ui-header) > .title::before,
&.layoutchild > :is(header, .ui-header) > .title::before {
content: '\E143';
}

&.gsplat > header > .title::before {
&.gsplat > :is(header, .ui-header) > .title::before {
content: '\E217';
}
}
Expand Down
149 changes: 135 additions & 14 deletions sass/editor/_editor-main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,49 @@ strong {
> .picker-curve-header {
padding: 5px 10px;

> .content {
> .ui-button.picker-curve-toggle {
&.pcui-container {
align-items: center;
background-color: $bcg-primary;
}

> .content,
&.pcui-container {
> .ui-label {
flex: none;
line-height: 22px;
vertical-align: bottom;
}

> .ui-select-field.pcui-select-input {
flex: none;
height: 24px;
min-height: 0;
padding: 0;
border-radius: 0;
vertical-align: bottom;

> .pcui-select-input-container-value {
height: 100%;
background-color: transparent;
}

.pcui-select-input-value {
height: 22px;
line-height: 22px;
padding: 0 22px 0 8px;
}

.pcui-select-input-icon {
right: 0;
width: 22px;
height: 22px;
line-height: 22px;
}
}

> .ui-button.picker-curve-toggle,
> .pcui-button.picker-curve-toggle {
border-radius: 0;
float: right;
text-align: center;
height: 24px;
Expand All @@ -1339,14 +1380,32 @@ strong {
> .picker-curve-footer {
padding: 5px 10px;

> .content {
> .ui-number-field {
&.pcui-container {
align-items: center;
padding-top: 0;
padding-bottom: 0;
background-color: $bcg-primary;
}

> .content,
&.pcui-container {
> .ui-number-field,
> .pcui-numeric-input {
flex: none;
width: 143px;
border-radius: 0;

> input.field {
line-height: 22px;
}
}

> .ui-button {
> .ui-button,
> .pcui-button {
@extend .font-icon;

flex: none;
border-radius: 0;
font-size: 14px;
width: 32px;
height: 24px;
Expand All @@ -1373,14 +1432,14 @@ strong {
font-size: 11px;

> .picker-gradient-gradient {
width: 346px;
width: 344px;
height: 28px;
display: block;
padding: 10px 10px 0;
}

> .picker-gradient-anchors {
width: 346px;
width: 344px;
height: 28px;
display: block;
padding: 0 10px;
Expand All @@ -1389,18 +1448,63 @@ strong {
> .picker-gradient-footer {
padding: 5px;

> .content {
> .ui-number-field {
&.pcui-container {
align-items: center;
background-color: $bcg-primary;
}

> .content,
&.pcui-container {
> .ui-label {
flex: none;
line-height: 22px;
vertical-align: bottom;
}

> .ui-select-field.pcui-select-input {
flex: none;
height: 24px;
min-height: 0;
padding: 0;
border-radius: 0;
vertical-align: bottom;

> .pcui-select-input-container-value {
height: 100%;
background-color: transparent;
}

.pcui-select-input-value {
height: 22px;
line-height: 22px;
padding: 0 22px 0 8px;
}

.pcui-select-input-icon {
right: 0;
width: 22px;
height: 22px;
line-height: 22px;
}
}

> .ui-number-field,
> .pcui-numeric-input {
flex: none;
border-radius: 0;
vertical-align: bottom;
}

> .ui-slider {
vertical-align: bottom;
}

> .ui-button {
> .ui-button,
> .pcui-button {
@extend .font-icon;

flex: none;
border-radius: 0;
vertical-align: bottom;
}
}
Expand All @@ -1409,7 +1513,12 @@ strong {
> .color-panel {
height: 156px;

> .content {
&.pcui-container {
background-color: $bcg-primary;
}

> .content,
&.pcui-container {
> .color-rect {
margin: 5px 10px 10px;
width: 140px;
Expand Down Expand Up @@ -1453,14 +1562,26 @@ strong {
height: 145px;
vertical-align: top;

> .ui-number-field {
> .ui-number-field,
> .pcui-numeric-input {
margin: 2px 0;
width: 162px;
border-radius: 0;

> input.field {
line-height: 22px;
}
}

> .ui-text-field {
> .ui-text-field,
> .pcui-text-input {
margin: 2px 0;
width: 162px;
border-radius: 0;

> input.field {
line-height: 22px;
}
}
}
}
Expand Down Expand Up @@ -7375,6 +7496,6 @@ strong {
}
}

@import '../common/ui-common';
@import '../common/shared-overlays';
@import '../common/version-control';
@import 'playcanvas-theme';
Loading