Skip to content
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

Jump to bottom

Increased editor UI contrast #8855

Merged
merged 6 commits into from
May 13, 2024
Merged

Increased editor UI contrast #8855

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe345ff
Reverted palette back to original anno 2020
britzl Apr 25, 2024
681423e
Updated colors
britzl Apr 26, 2024
aa585b7
Fixed context menu divider color
britzl Apr 29, 2024
4a0b194
Fixed toolbar color
britzl Apr 29, 2024
57d0842
Update _cljfx-form.scss
britzl Apr 29, 2024
2910441
Update _cljfx-form.scss
britzl Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions editor/resources/splash.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,20 @@ Label.emphasis {
}

* {
-df-background-darker: derive(#212428, -10%);
-df-background-dark: derive(#212428, -5%);
-df-background-darker: derive(#212428, -40%);
-df-background: #212428;
-df-background-light: derive(#212428, 10%);
-df-background-lighter: derive(#212428, 20%);
-df-component-darker: derive(#464c55, -20%);
-df-component-dark: derive(#464c55, -10%);
-df-component: #464c55;
-df-component-light: derive(#464c55, 10%);
-df-component-lighter: derive(#464c55, 20%);
-df-text-darker: derive(#b4bac1, -20%);
-df-text-dark: derive(#b4bac1, -40%);
-df-text: #b4bac1;
-df-text-selected: derive(#b4bac1, 20%);
-df-background-light: #2c2e33;
-df-background-lighter: #3B3F43;
-df-background-input: #292a2f;
-df-component-darker: #212428;
-df-component-dark: #393c41;
-df-component-light: #45474B;
-df-component-lighter: #52575c;
-df-component-icon: #8f9296;
-df-text-dark: #848484;
-df-text: #a2b0be;
-df-text-light: #f0f2f6;
-df-text-selected: #f0f2f6;
-df-defold-red-dark: derive(#e32f44, -10%);
-df-defold-red: #e32f44;
-df-defold-red-light: derive(#e32f44, 10%);
Expand Down Expand Up @@ -179,7 +179,7 @@ Label.emphasis {
}

.progress-indicator {
-fx-progress-color: -df-component;
-fx-progress-color: -df-component-lighter;
}

@font-face {
Expand Down Expand Up @@ -235,17 +235,17 @@ Label.emphasis {
-fx-border-radius: 4;
-fx-padding: 6px 17px;
-fx-min-width: 100px;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
-fx-background-insets: 0;
-fx-border-color: -df-background-dark;
-fx-border-color: -df-component-darker;
-fx-border-width: 1;
-fx-text-fill: -df-text;
}

.button:hover {
-fx-background-color: -df-component-darker;
-fx-background-color: -df-component-lighter;
}

.button:armed {
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-light;
}
16 changes: 8 additions & 8 deletions editor/styling/stylesheets/_dialogs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ $spacing-largest: 40px;
-fx-text-fill: -df-text;
-fx-background-radius: 2px;
-fx-border-radius: 2px;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
-fx-padding: 0;
-fx-min-width: 28px;
-fx-max-width: 28px;
Expand All @@ -106,7 +106,7 @@ $spacing-largest: 40px;
-fx-focus-traversable: false;
-fx-border-width: 0;
&:hover {
-fx-background-color: -df-component;
-fx-background-color: -df-component-lighter;
}
&:armed {
-fx-background-color: -df-background-light !important;
Expand Down Expand Up @@ -161,8 +161,8 @@ $spacing-largest: 40px;
@include font-size-default();
-fx-highlight-fill: -df-component-light;
-fx-text-fill: -df-text-selected;
-fx-prompt-text-fill: -df-component;
-fx-background-color: -df-background-darker;
-fx-prompt-text-fill: -df-component-light;
-fx-background-color: -df-background-input;
-fx-border-width: 1px;

&:readonly {
Expand Down Expand Up @@ -240,10 +240,10 @@ $spacing-largest: 40px;
-fx-background-radius: 5px;
-fx-background-insets: 1px;
&:hover {
-fx-background-color: -df-component;
-fx-background-color: -df-component-light;
}
&:pressed {
-fx-background-color: -df-component-lighter;
-fx-background-color: -df-component-light;
}
}
&:vertical {
Expand Down Expand Up @@ -349,12 +349,12 @@ Text {
}

.track {
-fx-background-color: -df-component;
-fx-background-color: -df-component-light;
}
}

.context-menu {
-fx-background-color: -df-component;
-fx-background-color: -df-component-light;
-fx-background-radius: 2px;
-fx-padding: 5px;
.menu-item {
Expand Down
10 changes: 5 additions & 5 deletions editor/styling/stylesheets/_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,20 @@ Links:
}

.about-value {
-fx-text-fill: -df-component;
-fx-text-fill: -df-component-lighter;
}

#progress-hbox {
.label {
-fx-text-fill: -df-component;
-fx-text-fill: -df-component-lighter;
}
-fx-alignment: center-left;
-fx-spacing: 10px;
}

/* Status bar */
#status-label {
-fx-text-fill: -df-component;
-fx-text-fill: -df-component-lighter;
-fx-padding: 7 0 7 15;
}

Expand All @@ -121,7 +121,7 @@ Links:
}

#status-pane #progress-hbox #progress-cancel-button {
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-background-dark;
-cross-color: -df-text;
-fx-background-radius: 50%;
-fx-border-width: 0;
Expand All @@ -132,7 +132,7 @@ Links:
-fx-max-height: 16px;
-fx-content-display: center;
&:hover {
-fx-background-color: -df-component-darker;
-fx-background-color: -df-component-lighter;
-cross-color: -df-text-selected;
}
&:armed {
Expand Down
8 changes: 4 additions & 4 deletions editor/styling/stylesheets/_splash.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
-fx-border-radius: 4;
-fx-padding: 6px 17px;
-fx-min-width: 100px;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
-fx-background-insets: 0;
-fx-border-color: -df-background-dark;
-fx-border-color: -df-component-darker;
-fx-border-width: 1;
-fx-text-fill: -df-text; }
.button:hover {
-fx-background-color: -df-component-darker; }
-fx-background-color: -df-component-lighter; }
.button:armed {
-fx-background-color: -df-background-lighter; }
-fx-background-color: -df-component-light; }
36 changes: 18 additions & 18 deletions editor/styling/stylesheets/base/_palette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
* {
// Background
-df-background-darker: derive(#212428, -10%);
-df-background-dark: derive(#212428, -5%);
-df-background: #212428;
-df-background-light: derive(#212428, 10%);
-df-background-lighter: derive(#212428, 20%);
-df-background-darker: derive(#212428, -40%); // dialog input field background (original name: dark-grey-darker)
-df-background: #212428; // background (original name: dark-grey)
-df-background-light: #2c2e33; // panels (original name: dark-grey-light)
-df-background-lighter: #3B3F43; // tree view selection (original name: dark-grey-selected)
-df-background-input: #292a2f; // input field background (original name: input-background)

// Component
-df-component-darker: derive(#464c55, -20%);
-df-component-dark: derive(#464c55, -10%);
-df-component: #464c55;
-df-component-light: derive(#464c55, 10%);
-df-component-lighter: derive(#464c55, 20%);
-df-component-darker: #212428; // button outline, scene view controls panel (original name: dark-grey)
-df-component-dark: #393c41; // button, input field border (original name: mid-grey)
-df-component-light: #45474B; // button selected, input field border selected (original: mid-grey-light)
-df-component-lighter: #52575c; // button hovered (original name: grey)
-df-component-icon: #8f9296; // button icon (original name: bright-grey)

// Text & icons
-df-text-darker: derive(#b4bac1, -20%);
-df-text-dark: derive(#b4bac1, -40%);
-df-text: #b4bac1;
-df-text-selected: derive(#b4bac1, 20%);
-df-text-dark: #848484; // property components (hardcoded in fxml in original css)
-df-text: #a2b0be; // non editable text, input field hint (original name: bright-grey-light)
-df-text-light: #f0f2f6; // editable text (original name: defold-white)
-df-text-selected: #f0f2f6; // non editable selected text (original name: defold-white)

// Red
-df-defold-red-dark: derive(#e32f44, -10%);
Expand Down Expand Up @@ -48,11 +48,11 @@
-df-defold-blue-lighter: derive(#4cb1ff, 20%);

/* Status colors */
-df-error-severity-fatal: -df-defold-red;
-df-error-severity-fatal-dim: -df-defold-red-dark;
-df-error-severity-warning: -df-defold-yellow;
-df-error-severity-fatal: -df-defold-red;
-df-error-severity-fatal-dim: -df-defold-red-dark;
-df-error-severity-warning: -df-defold-yellow;
-df-error-severity-warning-dim: -df-defold-yellow-dark;
-df-error-severity-info: -df-defold-blue-lighter;
-df-error-severity-info: -df-defold-blue-lighter;

/* Lua script colors */
-df-script-helper: #33cccc;
Expand Down
24 changes: 12 additions & 12 deletions editor/styling/stylesheets/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
-fx-border-width: 1;
-fx-text-fill: -df-text;
&:hover {
-fx-background-color: -df-component;
-fx-background-color: -df-component-lighter;
-fx-text-fill: -df-text-selected;
}
&:armed {
-fx-background-color: -df-component;
-fx-background-color: -df-component-light;
-fx-text-fill: -df-text-selected;
}
&.low-prio {
Expand All @@ -23,7 +23,7 @@
-fx-font-weight: normal;
}
&.low-prio:hover {
-fx-background-color: -df-component-dark;
-fx-background-color: -df-component-light;
-fx-text-fill: -df-text;
}
&.low-prio:armed {
Expand All @@ -48,7 +48,7 @@
.clear-button {
-fx-background-radius: 0;
-fx-border-radius: 0;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
-fx-padding: 0;
-fx-min-width: 27px;
-fx-max-width: 27px;
Expand All @@ -57,10 +57,10 @@
-fx-border-width: 0;
-fx-text-fill: -df-text;
&:hover {
-fx-background-color: -df-component !important;
-fx-background-color: -df-component-lighter !important;
}
&:armed {
-fx-background-color: -df-background-light !important;
-fx-background-color: -df-component-light !important;
}
}

Expand All @@ -70,29 +70,29 @@
-fx-padding: 4px;
-fx-background-insets: 0px;
-fx-border-insets: 0px;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
&:hover {
-fx-background-color: -df-component-darker;
-fx-background-color: -df-component-lighter;
}
&:selected {
-fx-background-color: -df-background;
-fx-background-color: -df-component-light;
& > .image-view {
@include effect-lighten-blue()
}
}
&:armed {
-fx-background-color: -df-background-light;
-fx-background-color: -df-component-light;
}
}

.toggle-button,
.color-picker.split-button > .color-picker-label {
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
-fx-background-insets: 0;
-fx-background-radius: 4;
-fx-border-width: 1;
-fx-border-radius: 4;
-fx-border-color: -df-background;
-fx-border-color: -df-component-darker;
-fx-text-fill: -fx-text-base-color;
}

Expand Down
12 changes: 6 additions & 6 deletions editor/styling/stylesheets/components/_cljfx-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@
-fx-focus-traversable: false;
-fx-border-width: 0;
&:hover {
-fx-background-color: -df-component !important;
-fx-background-color: -df-component-lighter !important;
}
&:armed {
-fx-background-color: -df-component !important;
-fx-background-color: -df-component-light !important;
}
}

.cljfx-form-list-view {
-fx-border-radius: 2px;
-fx-padding: 0 0 1px 0;
-fx-border-color: -df-component-dark;
-fx-background-color: -df-background-light;
-fx-background-radius: 20px;
-fx-background-color: -df-background-input;
-fx-background-radius: 0px;
.list-cell {
.text-field {
-fx-border-width: 0;
Expand Down Expand Up @@ -151,9 +151,9 @@
-fx-text-fill: -df-text;
&:active {
-fx-text-fill: -df-text-selected;
-fx-background-color: -df-component;
-fx-background-color: -df-component-dark;
&:hover {
-fx-background-color: -df-component;
-fx-background-color: -df-component-lighter;
}
}
&:hover {
Expand Down
2 changes: 1 addition & 1 deletion editor/styling/stylesheets/components/_color-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
-fx-border-width: 0;
-fx-background-insets: 0;
-fx-padding: 5 7;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
&:hover {
-fx-background-color: -df-component-darker;
}
Expand Down
8 changes: 4 additions & 4 deletions editor/styling/stylesheets/components/_composite-property-control.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
-fx-background-radius: 0px;
-fx-border-radius: 0px;
-fx-background-insets: 0;
-fx-background-color: -df-background-lighter;
-fx-background-color: -df-component-dark;
-fx-border-width: 0;
-fx-padding: 5 4;
-fx-pref-width: 23;
-fx-max-width: 24px;
-fx-text-fill: -df-text-dark;
-fx-text-fill: -df-component-icon;
&:hover {
-fx-background-color: -df-component-darker !important;
-fx-background-color: -df-component-lighter !important;
-fx-border-color: -df-background;
}
&:armed, &:pressed {
-fx-background-color: -df-background-light !important;
-fx-background-color: -df-component-light !important;
}
}
}