Skip to content

[pull] dev from mrdoob:dev #1073

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

Merged
pull merged 5 commits into from
Jan 12, 2026
Merged

[pull] dev from mrdoob:dev #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20417c3
Editor: Move render options from sidebar to menubar. (#32727)
mrdoob Jan 12, 2026
9ee0e74
Editor: Replace FFmpeg with WebCodecs for video rendering. (#32728)
mrdoob Jan 12, 2026
f02c685
Editor: Use parseAsync when rendering image.
mrdoob Jan 12, 2026
2408112
Editor: Add Resources panel to Project sidebar. (#32729)
mrdoob Jan 12, 2026
66ab258
Editor: UI css scope (#32714)
linbingquan Jan 12, 2026
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
126 changes: 102 additions & 24 deletions editor/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@ hr {
border-top: 1px solid #ccc;
}

button {
.Button {
position: relative;
}

input {
.Input {
vertical-align: middle;
}

input[type="color"]::-webkit-color-swatch-wrapper {
.Input[type="color"]::-webkit-color-swatch-wrapper {
padding: 0;
}
input[type="color"]::-webkit-color-swatch {
.Input[type="color"]::-webkit-color-swatch {
border: none;
}

textarea {
.TextArea {
tab-size: 4;
white-space: pre;
word-wrap: normal;
}

textarea.success {
.TextArea.success {
border-color: #8b8 !important;
}

textarea.fail {
.TextArea.fail {
border-color: #f00 !important;
background-color: rgba(255,0,0,0.05);
}

textarea, input { outline: none; } /* osx */
.TextArea, .Input { outline: none; } /* osx */

.Panel {
-moz-user-select: none;
Expand Down Expand Up @@ -121,11 +121,15 @@ textarea, input { outline: none; } /* osx */
}

.Listbox .ListboxItem {
padding: 6px;
padding: 4px;
color: #666;
white-space: nowrap;
}

.Listbox .ListboxItem:hover {
background-color: rgba(0, 0, 0, 0.02);
}

.Listbox .ListboxItem.active {
background-color: rgba(0, 0, 0, 0.04);
}
Expand Down Expand Up @@ -264,7 +268,7 @@ textarea, input { outline: none; } /* osx */

/* */

button {
.Button {
color: #555;
background-color: #ddd;
border: 0px;
Expand All @@ -276,27 +280,27 @@ button {
outline: none;
}

button:hover {
.Button:hover {
background-color: #fff;
}

button.selected {
.Button.selected {
background-color: #fff;
}

input, textarea {
.Input, .TextArea {
border: 1px solid transparent;
color: #444;
}

input.Number {
.Input.Number {
color: #08f!important;
font-size: 12px;
border: 0px;
padding: 2px;
}

select {
.Select {
color: #666;
background-color: #ddd;
border: 0px;
Expand All @@ -305,7 +309,7 @@ select {
outline: none;
}

select:hover {
.Select:hover {
background-color: #fff;
}

Expand Down Expand Up @@ -533,11 +537,11 @@ select {
text-align: center;
}

#toolbar button, #toolbar input {
#toolbar .Button, #toolbar .Input {
height: 32px;
}

#toolbar button img {
#toolbar .Button img {
width: 16px;
opacity: 0.5;
}
Expand Down Expand Up @@ -644,33 +648,33 @@ select {

@media ( prefers-color-scheme: dark ) {

button {
.Button {
color: #aaa;
background-color: #222;
}

button:hover {
.Button:hover {
color: #ccc;
background-color: #444;
}

button.selected {
.Button.selected {
color: #fff;
background-color: #08f;
}

input, textarea {
.Input, .TextArea {
background-color: #222;
border: 1px solid transparent;
color: #888;
}

select {
.Select {
color: #aaa;
background-color: #222;
}

select:hover {
.Select:hover {
color: #ccc;
background-color: #444;
}
Expand Down Expand Up @@ -784,6 +788,80 @@ select {
background-color: rgba(21,60,94,1);
}

}

/* Dialog */

.Dialog {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 100;
display: flex;
align-items: center;
justify-content: center;
}

.Dialog-background {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
}

.Dialog-content {
position: relative;
background: #eee;
min-width: 300px;
max-width: 90%;
max-height: 90%;
overflow: auto;
}

.Dialog-title {
padding: 10px 15px;
color: #666;
text-transform: uppercase;
}

.Dialog-body {
padding: 15px;
}

.Dialog-body .Row {
display: flex;
align-items: center;
min-height: 24px;
margin-bottom: 10px;
}

.Dialog-body .Row .Label {
width: 120px;
color: #888;
}

.Dialog-buttons {
display: flex;
justify-content: flex-end;
margin-top: 15px;
}

@media ( prefers-color-scheme: dark ) {

.Dialog-content {
background: #111;
}

.Dialog-title {
color: #888;
}



}

/* Temporary Chrome fix (#24794) */
Expand Down
2 changes: 0 additions & 2 deletions editor/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
<script src="js/libs/esprima.js"></script>
<script src="js/libs/jsonlint.js"></script>

<script src="https://cdn.jsdelivr.net/npm/@ffmpeg/ffmpeg@0.11.6/dist/ffmpeg.min.js"></script>

<link rel="stylesheet" href="js/libs/codemirror/addon/dialog.css">
<link rel="stylesheet" href="js/libs/codemirror/addon/show-hint.css">
<link rel="stylesheet" href="js/libs/codemirror/addon/tern.css">
Expand Down
Loading