diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5a639b7..16bf5712 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,13 +28,13 @@ jobs: - 17 # LTS steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 if: matrix.java == '8' - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} distribution: adopt # Java 8 and 11 are pre-installed on ubuntu-latest @@ -44,7 +44,7 @@ jobs: run: ./gradlew build - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: matrix.java == '11' with: name: FlatLaf-build-artifacts @@ -63,10 +63,10 @@ jobs: github.repository == 'JFormDesigner/FlatLaf' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Java 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: adopt # pre-installed on ubuntu-latest @@ -99,10 +99,10 @@ jobs: github.repository == 'JFormDesigner/FlatLaf' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Java 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: adopt # pre-installed on ubuntu-latest diff --git a/.github/workflows/natives.yml b/.github/workflows/natives.yml index 8b06d494..8d4c91b8 100644 --- a/.github/workflows/natives.yml +++ b/.github/workflows/natives.yml @@ -25,12 +25,12 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Setup Java 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: adopt @@ -39,11 +39,12 @@ jobs: - name: Build with Gradle # --no-daemon is necessary on Windows otherwise caching Gradle would fail with: # tar.exe: Couldn't open ~/.gradle/caches/modules-2/modules-2.lock: Permission denied - run: ./gradlew :flatlaf-natives-windows:build --no-daemon + run: ./gradlew :flatlaf-natives-windows:build-natives --no-daemon - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: FlatLaf-natives-windows-build-artifacts path: | + flatlaf-core/src/main/resources/com/formdev/flatlaf/natives flatlaf-natives/flatlaf-natives-windows/build diff --git a/CHANGELOG.md b/CHANGELOG.md index 71f1ae31..2a7e957d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,18 @@ FlatLaf Change Log ================== -## 2.2-SNAPSHOT +## 2.2 + +#### New features and improvements + +- SplitPane: Allow limiting one-touch expanding to a single side (set client + property `JSplitPane.expandableSide` to `"left"` or `"right"`). (issue #355) +- TabbedPane: Selected tab underline color now changes depending on whether the + focus is within the tab content. (issue #398) +- IntelliJ Themes: + - Added "Monokai Pro" and "Xcode-Dark" themes. + - TabbedPane now use different background color for selected tabs in all "Arc" + themes, in "Hiberbee Dark" and in all "Material UI Lite" themes. #### Fixed bugs @@ -13,6 +24,8 @@ FlatLaf Change Log coloring. (issue #512) - SplitPane: Fixed `StackOverflowError` caused by layout loop that may occur under special circumstances. (issue #513) +- Table: Slightly changed grid colors to make grid better recognizable. (issue + #514) - ToolBar: Fixed endless loop in focus navigation that may occur under special circumstances. (issue #505) - IntelliJ Themes: `Component.accentColor` UI property now has useful theme diff --git a/build.gradle.kts b/build.gradle.kts index f95007f3..4ea65571 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,8 @@ * limitations under the License. */ -val releaseVersion = "2.1" -val developmentVersion = "2.2-SNAPSHOT" +val releaseVersion = "2.2" +val developmentVersion = "2.3-SNAPSHOT" version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts index 43e9e670..b9630ac0 100644 --- a/flatlaf-core/build.gradle.kts +++ b/flatlaf-core/build.gradle.kts @@ -43,12 +43,6 @@ tasks { options.headerOutputDirectory.set( buildDir.resolve( "generated/jni-headers" ) ) } - processResources { - // build native libraries - if( org.gradle.internal.os.OperatingSystem.current().isWindows ) - dependsOn( ":flatlaf-natives-windows:assemble" ) - } - jar { archiveBaseName.set( "flatlaf" ) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java index 0fb5e513..4b274f1c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java @@ -391,6 +391,40 @@ public interface FlatClientProperties */ String SCROLL_PANE_SMOOTH_SCROLLING = "JScrollPane.smoothScrolling"; + //---- JSplitPane --------------------------------------------------------- + + /** + * Specifies what side of the spilt pane is allowed to expand + * via one-touch expanding arrow buttons. + * Requires that one-touch expanding is enabled with + * {@link javax.swing.JSplitPane#setOneTouchExpandable(boolean)}. + *

+ * Component {@link javax.swing.JSplitPane}
+ * Value type {@link java.lang.String}
+ * Allowed Values + * {@link #SPLIT_PANE_EXPANDABLE_SIDE_LEFT} or + * {@link #SPLIT_PANE_EXPANDABLE_SIDE_RIGHT} + * + * @since 2.2 + */ + String SPLIT_PANE_EXPANDABLE_SIDE = "JSplitPane.expandableSide"; + + /** + * Allow expanding only left/top side of the split pane. + * + * @see #SPLIT_PANE_EXPANDABLE_SIDE + * @since 2.2 + */ + String SPLIT_PANE_EXPANDABLE_SIDE_LEFT = "left"; + + /** + * Allow expanding only right/bottom side of the split pane. + * + * @see #SPLIT_PANE_EXPANDABLE_SIDE + * @since 2.2 + */ + String SPLIT_PANE_EXPANDABLE_SIDE_RIGHT = "right"; + //---- JTabbedPane -------------------------------------------------------- /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java index 8e2c4876..de245e6a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -37,6 +37,7 @@ import com.formdev.flatlaf.json.ParseException; import com.formdev.flatlaf.util.ColorFunctions; import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.StringUtils; +import com.formdev.flatlaf.util.SystemInfo; /** * This class supports loading IntelliJ .theme.json files and using them as a Laf. @@ -162,8 +163,11 @@ public class IntelliJTheme applyCheckBoxColors( defaults ); // copy values - for( Map.Entry e : uiKeyCopying.entrySet() ) - defaults.put( e.getKey(), defaults.get( e.getValue() ) ); + for( Map.Entry e : uiKeyCopying.entrySet() ) { + Object value = defaults.get( e.getValue() ); + if( value != null ) + defaults.put( e.getKey(), value ); + } // IDEA does not paint button background if disabled, but FlatLaf does Object panelBackground = defaults.get( "Panel.background" ); @@ -311,8 +315,19 @@ public class IntelliJTheme @SuppressWarnings( "unchecked" ) private void apply( String key, Object value, UIDefaults defaults, ArrayList defaultsKeysCache, Set uiKeys ) { if( value instanceof Map ) { - for( Map.Entry e : ((Map)value).entrySet() ) - apply( key + '.' + e.getKey(), e.getValue(), defaults, defaultsKeysCache, uiKeys ); + Map map = (Map)value; + if( map.containsKey( "os.default" ) || map.containsKey( "os.windows" ) || map.containsKey( "os.mac" ) || map.containsKey( "os.linux" ) ) { + String osKey = SystemInfo.isWindows ? "os.windows" + : SystemInfo.isMacOS ? "os.mac" + : SystemInfo.isLinux ? "os.linux" : null; + if( osKey != null && map.containsKey( osKey ) ) + apply( key, map.get( osKey ), defaults, defaultsKeysCache, uiKeys ); + else if( map.containsKey( "os.default" ) ) + apply( key, map.get( "os.default" ), defaults, defaultsKeysCache, uiKeys ); + } else { + for( Map.Entry e : map.entrySet() ) + apply( key + '.' + e.getKey(), e.getValue(), defaults, defaultsKeysCache, uiKeys ); + } } else { if( "".equals( value ) ) return; // ignore empty value @@ -612,6 +627,11 @@ public class IntelliJTheme uiKeyCopying.put( "Spinner.buttonSeparatorColor", "Component.borderColor" ); uiKeyCopying.put( "Spinner.buttonDisabledSeparatorColor", "Component.disabledBorderColor" ); + // TabbedPane + uiKeyCopying.put( "TabbedPane.selectedBackground", "DefaultTabs.underlinedTabBackground" ); + uiKeyCopying.put( "TabbedPane.selectedForeground", "DefaultTabs.underlinedTabForeground" ); + uiKeyCopying.put( "TabbedPane.inactiveUnderlineColor", "DefaultTabs.inactiveUnderlineColor" ); + // TitlePane uiKeyCopying.put( "TitlePane.inactiveBackground", "TitlePane.background" ); uiKeyMapping.put( "TitlePane.infoForeground", "TitlePane.foreground" ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java index a05cd009..28fc2d8a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java @@ -86,6 +86,11 @@ import com.formdev.flatlaf.util.SystemInfo; * @uiDefault ComboBox.padding Insets * @uiDefault ComboBox.squareButton boolean default is true * + * + * + * @uiDefault ComboBox.selectionBackground Color + * @uiDefault ComboBox.selectionForeground Color + * * * * @uiDefault ComboBox.minimumWidth int diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java index cec9fae1..0f3d5992 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java @@ -34,6 +34,7 @@ import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicSplitPaneDivider; import javax.swing.plaf.basic.BasicSplitPaneUI; +import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; @@ -52,6 +53,13 @@ import com.formdev.flatlaf.util.UIScale; * @uiDefault SplitPaneDivider.border Border * @uiDefault SplitPaneDivider.draggingColor Color only used if continuousLayout is false * + * + * + * @uiDefault SplitPane.oneTouchButtonSize int + * @uiDefault SplitPane.oneTouchButtonOffset int + * @uiDefault SplitPane.centerOneTouchButtons boolean + * @uiDefault SplitPane.supportsOneTouchButtons boolean optional; default is true + * * * * @uiDefault SplitPane.continuousLayout boolean @@ -345,7 +353,7 @@ public class FlatSplitPaneUI if( leftButton == null || rightButton == null || !splitPane.isOneTouchExpandable() ) return; - // increase side of buttons, which makes them easier to hit by the user + // increase size of buttons, which makes them easier to hit by the user // and avoids cut arrows at small divider sizes int extraSize = UIScale.scale( 4 ); if( orientation == JSplitPane.VERTICAL_SPLIT ) { @@ -360,10 +368,19 @@ public class FlatSplitPaneUI // hide buttons if not applicable boolean leftCollapsed = isLeftCollapsed(); - if( leftCollapsed ) + boolean rightCollapsed = isRightCollapsed(); + if( leftCollapsed || rightCollapsed ) { + leftButton.setVisible( !leftCollapsed ); + rightButton.setVisible( !rightCollapsed ); + } else { + Object expandableSide = splitPane.getClientProperty( FlatClientProperties.SPLIT_PANE_EXPANDABLE_SIDE ); + leftButton.setVisible( expandableSide == null || !FlatClientProperties.SPLIT_PANE_EXPANDABLE_SIDE_LEFT.equals( expandableSide ) ); + rightButton.setVisible( expandableSide == null || !FlatClientProperties.SPLIT_PANE_EXPANDABLE_SIDE_RIGHT.equals( expandableSide ) ); + } + + // move right button if left button is hidden + if( !leftButton.isVisible() ) rightButton.setLocation( leftButton.getLocation() ); - leftButton.setVisible( !leftCollapsed ); - rightButton.setVisible( !isRightCollapsed() ); } } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java index 9a2cdda7..bbe45782 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java @@ -59,6 +59,7 @@ import java.util.Map; import java.util.Set; import java.util.function.BiConsumer; import java.util.function.IntConsumer; +import java.util.function.Predicate; import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.swing.Action; @@ -82,10 +83,12 @@ import javax.swing.event.ChangeListener; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.TabbedPaneUI; import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicTabbedPaneUI; import javax.swing.text.JTextComponent; import javax.swing.text.View; +import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.icons.FlatTabbedPaneCloseIcon; import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; @@ -127,6 +130,7 @@ import com.formdev.flatlaf.util.UIScale; * @uiDefault TabbedPane.selectedBackground Color optional * @uiDefault TabbedPane.selectedForeground Color * @uiDefault TabbedPane.underlineColor Color + * @uiDefault TabbedPane.inactiveUnderlineColor Color * @uiDefault TabbedPane.disabledUnderlineColor Color * @uiDefault TabbedPane.hoverColor Color * @uiDefault TabbedPane.focusColor Color @@ -198,6 +202,7 @@ public class FlatTabbedPaneUI @Styleable protected Color selectedBackground; @Styleable protected Color selectedForeground; @Styleable protected Color underlineColor; + /** @since 2.2 */ @Styleable protected Color inactiveUnderlineColor; @Styleable protected Color disabledUnderlineColor; @Styleable protected Color hoverColor; @Styleable protected Color focusColor; @@ -288,6 +293,7 @@ public class FlatTabbedPaneUI super.installUI( c ); + FlatSelectedTabRepainter.install(); installStyle(); } @@ -318,6 +324,7 @@ public class FlatTabbedPaneUI selectedBackground = UIManager.getColor( "TabbedPane.selectedBackground" ); selectedForeground = UIManager.getColor( "TabbedPane.selectedForeground" ); underlineColor = UIManager.getColor( "TabbedPane.underlineColor" ); + inactiveUnderlineColor = FlatUIUtils.getUIColor( "TabbedPane.inactiveUnderlineColor", underlineColor ); disabledUnderlineColor = UIManager.getColor( "TabbedPane.disabledUnderlineColor" ); hoverColor = UIManager.getColor( "TabbedPane.hoverColor" ); focusColor = UIManager.getColor( "TabbedPane.focusColor" ); @@ -385,6 +392,7 @@ public class FlatTabbedPaneUI selectedBackground = null; selectedForeground = null; underlineColor = null; + inactiveUnderlineColor = null; disabledUnderlineColor = null; hoverColor = null; focusColor = null; @@ -733,7 +741,6 @@ public class FlatTabbedPaneUI // increase size of repaint region to include part of content border if( contentSeparatorHeight > 0 && - getTabType() == TAB_TYPE_CARD && clientPropertyBoolean( tabPane, TABBED_PANE_SHOW_CONTENT_SEPARATOR, true ) ) { int sh = scale( contentSeparatorHeight ); @@ -1205,7 +1212,9 @@ public class FlatTabbedPaneUI } protected void paintTabSelection( Graphics g, int tabPlacement, int x, int y, int w, int h ) { - g.setColor( tabPane.isEnabled() ? underlineColor : disabledUnderlineColor ); + g.setColor( tabPane.isEnabled() + ? (isTabbedPaneOrChildFocused() ? underlineColor : inactiveUnderlineColor) + : disabledUnderlineColor ); // paint underline selection boolean atBottom = (getTabType() != TAB_TYPE_CARD); @@ -1236,6 +1245,23 @@ public class FlatTabbedPaneUI } } + /** @since 2.2 */ + @SuppressWarnings( "unchecked" ) + protected boolean isTabbedPaneOrChildFocused() { + KeyboardFocusManager keyboardFocusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager(); + + Object value = tabPane.getClientProperty( FlatClientProperties.COMPONENT_FOCUS_OWNER ); + if( value instanceof Predicate ) { + return ((Predicate)value).test( tabPane ) && + FlatUIUtils.isInActiveWindow( tabPane, keyboardFocusManager.getActiveWindow() ); + } + + Component focusOwner = keyboardFocusManager.getPermanentFocusOwner(); + return focusOwner != null && + SwingUtilities.isDescendingFrom( focusOwner, tabPane ) && + FlatUIUtils.isInActiveWindow( focusOwner, keyboardFocusManager.getActiveWindow() ); + } + /** * Actually does nearly the same as super.paintContentBorder() but * - not using UIManager.getColor("TabbedPane.contentAreaColor") to be GUI builder friendly @@ -3341,4 +3367,77 @@ public class FlatTabbedPaneUI delegate.actionPerformed( e ); } } + + //---- class FlatSelectedTabRepainter ------------------------------------- + + private static class FlatSelectedTabRepainter + implements PropertyChangeListener//, Runnable + { + private static FlatSelectedTabRepainter instance; + + private KeyboardFocusManager keyboardFocusManager; + + static void install() { + synchronized( FlatSelectedTabRepainter.class ) { + if( instance != null ) + return; + + instance = new FlatSelectedTabRepainter(); + } + } + + FlatSelectedTabRepainter() { + keyboardFocusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager(); + keyboardFocusManager.addPropertyChangeListener( this ); + } + + private void uninstall() { + synchronized( FlatSelectedTabRepainter.class ) { + if( instance == null ) + return; + + keyboardFocusManager.removePropertyChangeListener( this ); + keyboardFocusManager = null; + instance = null; + } + } + + @Override + public void propertyChange( PropertyChangeEvent e ) { + // uninstall if no longer using FlatLaf + if( !(UIManager.getLookAndFeel() instanceof FlatLaf) ) { + uninstall(); + return; + } + + switch( e.getPropertyName() ) { + case "permanentFocusOwner": + Object oldValue = e.getOldValue(); + Object newValue = e.getNewValue(); + if( oldValue instanceof Component ) + repaintSelectedTabs( (Component) oldValue ); + if( newValue instanceof Component ) + repaintSelectedTabs( (Component) newValue ); + break; + + case "activeWindow": + repaintSelectedTabs( keyboardFocusManager.getPermanentFocusOwner() ); + break; + } + } + + private void repaintSelectedTabs( Component c ) { + if( c instanceof JTabbedPane ) + repaintSelectedTab( (JTabbedPane) c ); + + while( (c = SwingUtilities.getAncestorOfClass( JTabbedPane.class, c )) != null ) + repaintSelectedTab( (JTabbedPane) c ); + } + + private void repaintSelectedTab( JTabbedPane tabbedPane ) { + TabbedPaneUI ui = tabbedPane.getUI(); + if( ui instanceof FlatTabbedPaneUI ) + ((FlatTabbedPaneUI) ui).repaintTab( tabbedPane.getSelectedIndex() ); + } + } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java index 2af95f61..fd3ddea2 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java @@ -245,7 +245,7 @@ public class FlatUIUtils isInActiveWindow( c, keyboardFocusManager.getActiveWindow() ); } - private static boolean isInActiveWindow( Component c, Window activeWindow ) { + static boolean isInActiveWindow( Component c, Window activeWindow ) { Window window = SwingUtilities.windowForComponent( c ); return window == activeWindow || (window != null && window.getType() == Window.Type.POPUP && window.getOwner() == activeWindow); diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties index 91126b86..4414670d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -306,6 +306,7 @@ SplitPaneDivider.draggingColor = $Component.borderColor #---- TabbedPane ---- TabbedPane.underlineColor = @accentUnderlineColor +TabbedPane.inactiveUnderlineColor = mix(@accentUnderlineColor,$TabbedPane.background,60%) TabbedPane.disabledUnderlineColor = lighten(@background,23%) TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse) TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,25%) @@ -324,7 +325,7 @@ TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground #---- Table ---- -Table.gridColor = lighten($Table.background,5%) +Table.gridColor = lighten($Table.background,8%) #---- TableHeader ---- diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index 488f991c..a1f62def 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -313,6 +313,7 @@ SplitPaneDivider.draggingColor = $Component.borderColor #---- TabbedPane ---- TabbedPane.underlineColor = @accentUnderlineColor +TabbedPane.inactiveUnderlineColor = mix(@accentUnderlineColor,$TabbedPane.background,50%) TabbedPane.disabledUnderlineColor = darken(@background,28%) TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived) TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,10%) @@ -331,7 +332,7 @@ TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground #---- Table ---- -Table.gridColor = darken($Table.background,5%) +Table.gridColor = darken($Table.background,8%) #---- TableHeader ---- diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties index 05f54d76..e68bb958 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties @@ -82,6 +82,13 @@ HelpButton.hoverBorderColor = null Slider.focusedColor = fade($Component.focusColor,40%,derived) +#---- TabbedPane ---- + +# colors from JBUI.CurrentTheme.DefaultTabs.inactiveUnderlineColor() +[light]TabbedPane.inactiveUnderlineColor = #9ca7b8 +[dark]TabbedPane.inactiveUnderlineColor = #747a80 + + #---- ToggleButton ---- ToggleButton.startBackground = $ToggleButton.background @@ -162,6 +169,8 @@ ToggleButton.endBackground = $ToggleButton.background [Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground [Hiberbee_Dark]TabbedPane.focusColor = #5A5A5A +[Hiberbee_Dark]TabbedPane.selectedBackground = #434241 +[Hiberbee_Dark]TabbedPane.selectedForeground = #70D7FF [Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground [Hiberbee_Dark]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java index 1dd5c188..3101f125 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java @@ -693,6 +693,7 @@ public class TestFlatStyleableInfo "selectedBackground", Color.class, "selectedForeground", Color.class, "underlineColor", Color.class, + "inactiveUnderlineColor", Color.class, "disabledUnderlineColor", Color.class, "hoverColor", Color.class, "focusColor", Color.class, diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java index c85be429..4f60e4c5 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java @@ -862,6 +862,7 @@ public class TestFlatStyling ui.applyStyle( "selectedBackground: #fff" ); ui.applyStyle( "selectedForeground: #fff" ); ui.applyStyle( "underlineColor: #fff" ); + ui.applyStyle( "inactiveUnderlineColor: #fff" ); ui.applyStyle( "disabledUnderlineColor: #fff" ); ui.applyStyle( "hoverColor: #fff" ); ui.applyStyle( "focusColor: #fff" ); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java index eb9fcadd..0f0a7da6 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java @@ -43,7 +43,7 @@ public class IJThemesClassGenerator markdownTable.append( "-----|------\n" ); for( IJThemeInfo ti : themesManager.bundledThemes ) { - if( ti.sourceCodeUrl == null || ti.sourceCodePath == null ) + if( ti.sourceCodeUrl == null ) continue; generateClass( ti, toPath, allInfos, markdownTable ); @@ -77,7 +77,7 @@ public class IJThemesClassGenerator themeName += " (Material)"; StringBuilder buf = new StringBuilder(); - for( String n : name.split( " " ) ) { + for( String n : name.split( "[ \\-]" ) ) { if( n.length() == 0 || n.equals( "-" ) ) continue; diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json index 728512bb..f11677b2 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json @@ -178,6 +178,13 @@ "sourceCodeUrl": "https://github.com/bmikaili/intellij-monocai-theme", "sourceCodePath": "blob/master/resources/Monocai.theme.json" }, + "Monokai_Pro.default.theme.json": { + "name": "Monokai Pro", + "dark": true, + "license": "MIT", + "licenseFile": "Monokai_Pro.LICENSE.txt", + "sourceCodeUrl": "https://github.com/subtheme-dev/monokai-pro" + }, "nord.theme.json": { "name": "Nord", "dark": true, @@ -225,6 +232,14 @@ "sourceCodeUrl": "https://github.com/vuesion/intellij-theme", "sourceCodePath": "blob/master/resources/META-INF/vuesion_theme.theme.json" }, + "Xcode-Dark.theme.json": { + "name": "Xcode-Dark", + "dark": true, + "license": "MIT", + "licenseFile": "Xcode-Dark.LICENSE.txt", + "sourceCodeUrl": "https://github.com/antelle/intellij-xcode-dark-theme", + "sourceCodePath": "blob/master/resources/Xcode-Dark.theme.json" + }, "material-theme-ui-lite/Arc Dark.theme.json": { "name": "Material Theme UI Lite / Arc Dark", diff --git a/flatlaf-intellij-themes/README.md b/flatlaf-intellij-themes/README.md index 398bf2e9..50d69670 100644 --- a/flatlaf-intellij-themes/README.md +++ b/flatlaf-intellij-themes/README.md @@ -65,12 +65,14 @@ Name | Class [Light Flat](https://github.com/nerzhulart/LightFlatTheme) | `com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme` [Material Design Dark](https://github.com/xinkunZ/NotReallyMDTheme) | `com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme` [Monocai](https://github.com/bmikaili/intellij-monocai-theme) | `com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme` +[Monokai Pro](https://github.com/subtheme-dev/monokai-pro) | `com.formdev.flatlaf.intellijthemes.FlatMonokaiProIJTheme` [Nord](https://github.com/arcticicestudio/nord-jetbrains) | `com.formdev.flatlaf.intellijthemes.FlatNordIJTheme` [One Dark](https://github.com/one-dark/jetbrains-one-dark-theme) | `com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme` [Solarized Dark](https://github.com/4lex4/intellij-platform-solarized) | `com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme` [Solarized Light](https://github.com/4lex4/intellij-platform-solarized) | `com.formdev.flatlaf.intellijthemes.FlatSolarizedLightIJTheme` [Spacegray](https://github.com/mturlo/intellij-spacegray) | `com.formdev.flatlaf.intellijthemes.FlatSpacegrayIJTheme` [Vuesion](https://github.com/vuesion/intellij-theme) | `com.formdev.flatlaf.intellijthemes.FlatVuesionIJTheme` +[Xcode-Dark](https://github.com/antelle/intellij-xcode-dark-theme) | `com.formdev.flatlaf.intellijthemes.FlatXcodeDarkIJTheme` Material Theme UI Lite: diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java index 443ee0d8..4ffc6e56 100644 --- a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java @@ -52,12 +52,14 @@ public class FlatAllIJThemes new FlatIJLookAndFeelInfo( "Light Flat", "com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme", false ), new FlatIJLookAndFeelInfo( "Material Design Dark", "com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Monocai", "com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme", true ), + new FlatIJLookAndFeelInfo( "Monokai Pro", "com.formdev.flatlaf.intellijthemes.FlatMonokaiProIJTheme", true ), new FlatIJLookAndFeelInfo( "Nord", "com.formdev.flatlaf.intellijthemes.FlatNordIJTheme", true ), new FlatIJLookAndFeelInfo( "One Dark", "com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Solarized Dark", "com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Solarized Light", "com.formdev.flatlaf.intellijthemes.FlatSolarizedLightIJTheme", false ), new FlatIJLookAndFeelInfo( "Spacegray", "com.formdev.flatlaf.intellijthemes.FlatSpacegrayIJTheme", true ), new FlatIJLookAndFeelInfo( "Vuesion", "com.formdev.flatlaf.intellijthemes.FlatVuesionIJTheme", true ), + new FlatIJLookAndFeelInfo( "Xcode-Dark", "com.formdev.flatlaf.intellijthemes.FlatXcodeDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Arc Dark (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatArcDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Arc Dark Contrast (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatArcDarkContrastIJTheme", true ), new FlatIJLookAndFeelInfo( "Atom One Dark (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatAtomOneDarkIJTheme", true ), diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java new file mode 100644 index 00000000..7be776bc --- /dev/null +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java @@ -0,0 +1,54 @@ +/* + * Copyright 2020 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.intellijthemes; + +// +// DO NOT MODIFY +// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator +// + +import com.formdev.flatlaf.IntelliJTheme; + +/** + * @author Karl Tauber + */ +public class FlatMonokaiProIJTheme + extends IntelliJTheme.ThemeLaf +{ + public static final String NAME = "Monokai Pro"; + + public static boolean setup() { + try { + return setup( new FlatMonokaiProIJTheme() ); + } catch( RuntimeException ex ) { + return false; + } + } + + public static void installLafInfo() { + installLafInfo( NAME, FlatMonokaiProIJTheme.class ); + } + + public FlatMonokaiProIJTheme() { + super( Utils.loadTheme( "Monokai_Pro.default.theme.json" ) ); + } + + @Override + public String getName() { + return NAME; + } +} diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java new file mode 100644 index 00000000..30f7cba3 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java @@ -0,0 +1,54 @@ +/* + * Copyright 2020 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.intellijthemes; + +// +// DO NOT MODIFY +// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator +// + +import com.formdev.flatlaf.IntelliJTheme; + +/** + * @author Karl Tauber + */ +public class FlatXcodeDarkIJTheme + extends IntelliJTheme.ThemeLaf +{ + public static final String NAME = "Xcode-Dark"; + + public static boolean setup() { + try { + return setup( new FlatXcodeDarkIJTheme() ); + } catch( RuntimeException ex ) { + return false; + } + } + + public static void installLafInfo() { + installLafInfo( NAME, FlatXcodeDarkIJTheme.class ); + } + + public FlatXcodeDarkIJTheme() { + super( Utils.loadTheme( "Xcode-Dark.theme.json" ) ); + } + + @Override + public String getName() { + return NAME; + } +} diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json index 021630a8..ede6fb65 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json @@ -127,7 +127,11 @@ "secondaryForeground": "#7ac2cc" }, - "List.background": "#eef0f4", + "List": { + "background": "#eef0f4", + "hoverBackground": "#dae6eb", + "hoverInactiveBackground": "#dae6eb" + }, "Notification": { "MoreButton.innerBorderColor": "#bec5cd", @@ -143,6 +147,12 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#dae6ebB3", + "newNotification.hoverBackground": "#dae6eb", + "Notification.hoverBackground": "#dae6eb" + }, + "PasswordField.background": "#FFFFFF", "Plugins": { @@ -151,7 +161,8 @@ "SectionHeader.foreground": "#808080", "SectionHeader.background": "#edeef2", "Tab.selectedBackground": "#cacccf", - "Tab.hoverBackground": "#cacccf" + "Tab.hoverBackground": "#cacccf", + "hoverBackground": "#e6eef2" }, "Popup": { @@ -249,7 +260,12 @@ } }, - "Tree.background": "#eef0f4", + "Tree": { + "background": "#eef0f4", + "hoverBackground": "#dae6eb", + "hoverInactiveBackground": "#dae6eb", + "hash": "#d0d5db" + }, "WelcomeScreen": { "Details.background": "#eef0f4", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json index 2cfc2bab..79e23c49 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json @@ -120,7 +120,8 @@ "DefaultTabs": { "underlineColor": "#9649cc", "inactiveUnderlineColor": "#877399", - "hoverBackground": "#dfb3ff1a" + "hoverBackground": "#dfb3ff1a", + "borderColor": "#1a1721" }, "DragAndDrop": { @@ -168,6 +169,11 @@ "visitedForeground": "#7094FF" }, + "List": { + "hoverBackground": "#00000033", + "hoverInactiveBackground": "#00000033" + }, + "MenuBar.borderColor": "#1a1721", "NavBar.borderColor": "#1a1721", @@ -197,6 +203,12 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#3D3952B3", + "newNotification.hoverBackground": "#3D3952", + "Notification.hoverBackground": "#3D3952" + }, + "MemoryIndicator": { "allocatedBackground": "#352140", "usedBackground": "#533473" @@ -211,6 +223,8 @@ }, "Plugins": { + "hoverBackground": "#00000022", + "Tab": { "selectedForeground": "#D0D0D9", "selectedBackground": "#593f73", @@ -284,6 +298,13 @@ "SearchOption.selectedBackground": "#424885", + "SegmentedButton": { + "selectedButtonColor": "#45405C", + "focusedSelectedButtonColor": "#693687", + "selectedStartBorderColor": "#4E4C63", + "selectedEndBorderColor": "#4E4C63" + }, + "SpeedSearch": { "foreground": "#D0D0D9", "borderColor": "#69418c", @@ -310,7 +331,8 @@ "Table": { "stripeColor": "#323242", - "hoverBackground": "#00000028" + "hoverBackground": "#00000028", + "gridColor": "#1a1721" }, "TextArea": { @@ -360,7 +382,12 @@ } }, - "Tree.rowHeight": 20, + "Tree": { + "rowHeight": 20, + "hash": "#4E4C63", + "hoverBackground": "#00000033", + "hoverInactiveBackground": "#00000033" + }, "ValidationTooltip": { "errorBackground": "#802d43", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json index d9081180..1da5312d 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json @@ -38,6 +38,26 @@ "pressedBackground": "hoverBackground", "pressedBorderColor": "hoverBackground" }, + "Bookmark": { + "iconBackground": "accentColor", + "Mnemonic": { + "iconForeground": "primaryForeground", + "iconBackground": "#8d6b81", + "iconBorderColor": "accentColor" + } + }, + "BookmarkMnemonicAssigned": { + "foreground": "primaryForeground", + "background": "#786299", + "borderColor": "secondaryAccentColor" + }, + "BookmarkMnemonicAvailable": { + }, + "BookmarkMnemonicCurrent": { + "foreground": "primaryForeground", + "background": "#8d6b81", + "borderColor": "accentColor" + }, "Button": { "foreground": "primaryForeground", "startBorderColor": "selectionBackground", @@ -90,7 +110,7 @@ "inactiveWarningFocusColor": "#f1fa8c" }, "DragAndDrop": { - "areaBorderColor": "selectionBackground" + "borderColor": "selectionBackground" }, "Editor": { "background": "secondaryBackground", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json index ce9dcb9b..68b42d2a 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json @@ -111,6 +111,11 @@ "secondaryForeground": "#77a8d9" }, + "List": { + "hoverBackground": "#00000010", + "hoverInactiveBackground": "#00000010" + }, + "Notification": { "background": "#f7f8fa", "borderColor": "#D4D6D9", @@ -131,6 +136,12 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#dae9f7B3", + "newNotification.hoverBackground": "#00000009", + "Notification.hoverBackground": "#00000009" + }, + "PasswordField.background": "#FFFFFF", "Plugins": { @@ -140,7 +151,7 @@ "Tab.selectedBackground": "#D5D6D7", "Tab.hoverBackground": "#D5D6D7", "lightSelectionBackground": "#E9EFF7", - "hoverBackground": "#f7faff" + "hoverBackground": "#F8F8F8" }, "Popup": { @@ -225,7 +236,11 @@ } }, - "Tree.rowHeight": 22, + "Tree": { + "rowHeight": 22, + "hoverBackground": "#00000010", + "hoverInactiveBackground": "#00000010" + }, "VersionControl": { "Log.Commit.currentBranchBackground": "#e6f0f2", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt new file mode 100644 index 00000000..7aa3caf0 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt @@ -0,0 +1,19 @@ +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json new file mode 100644 index 00000000..c0cf60d4 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json @@ -0,0 +1,684 @@ +{ + "name": "Monokai Pro", + "dark": true, + "author": "Subtheme", + "editorScheme": "/schemes/default.xml", + "ui": { + "*": { + "acceleratorSelectionForeground": "#ffd866", + "background": "#2d2a2e", + "borderColor": "#363337", + "disabledBackground": "#221f22", + "disabledForeground": "#5b595c", + "disabledText": "#5b595c", + "focusColor": "#5b595c", + "focusedBorderColor": "#ffd866", + "foreground": "#fcfcfa", + "inactiveBackground": "#221f22", + "inactiveForeground": "#939293", + "infoForeground": "#939293", + "selectionBackground": "#403e41", + "selectionBackgroundInactive": "#403e41", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#403e41", + "selectionInactiveForeground": "#ffd866", + "separatorColor": "#2d2a2e" + }, + "ActionButton": { + "hoverBackground": "#363337", + "hoverBorderColor": "#363337", + "pressedBackground": "#363337", + "pressedBorderColor": "#363337" + }, + "Borders": { + "ContrastBorderColor": "#363337", + "color": "#363337" + }, + "Button": { + "arc": 0, + "background": "#403e41", + "default": { + "endBackground": "#403e41", + "endBorderColor": "#403e41", + "foreground": "#ffd866", + "focusColor": "#ffd866", + "focusedBorderColor": "#403e41", + "shadowColor": "#403e41", + "startBackground": "#403e41", + "startBorderColor": "#403e41" + }, + "disabledBorderColor": "#403e41", + "disabledText": "#5b595c", + "endBackground": "#403e41", + "endBorderColor": "#403e41", + "focusedBorderColor": "#403e41", + "foreground": "#fcfcfa", + "shadowColor": "#403e41", + "shadowWidth": 0, + "startBackground": "#403e41", + "startBorderColor": "#403e41" + }, + "CheckBox": { + "background": "#2d2a2e", + "disabledText": "#5b595c", + "foreground": "#fcfcfa", + "select": "#ffd866" + }, + "CheckBoxMenuItem": { + "acceleratorForeground": "#939293", + "acceleratorSelectionForeground": "#939293", + "background": "#2d2a2e", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "ColorChooser": { + "background": "#2d2a2e", + "foreground": "#fcfcfa", + "swatchesDefaultRecentColor": "#fcfcfa" + }, + "ComboBoxButton": { + "background": "#363337" + }, + "ComboBox": { + "ArrowButton": { + "background": "#403e41", + "disabledIconColor": "#5b595c", + "iconColor": "#fcfcfa", + "nonEditableBackground": "#2d2a2e" + }, + "background": "#363337", + "disabledBackground": "#221f22", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "modifiedItemForeground": "#ffd866", + "nonEditableBackground": "#363337", + "selectionBackground": "#2d2a2e", + "selectionForeground": "#ffd866" + }, + "ComboPopup": { + "border": "#2d2a2e" + }, + "CompletionPopup": { + "foreground": "#fcfcfa", + "matchForeground": "#ffd866", + "selectionInactiveBackground": "#2d2a2e", + "selectionBackground": "#2d2a2e" + }, + "Component": { + "arc": 4, + "borderColor": "#363337", + "disabledBorderColor": "#363337", + "focusColor": "#ffd866", + "focusedBorderColor": "#ffd866", + "hoverIconColor": "#ffd866", + "infoForeground": "#939293", + "iconColor": "#fcfcfa" + }, + "Counter": { + "background": "#ffd866", + "foreground": "#19181a" + }, + "Debugger": { + "Variables": { + "collectingDataForeground": "#939293", + "changedValueForeground": "#ffd866", + "errorMessageForeground": "#ff6188", + "evaluatingExpressionForeground": "#939293", + "exceptionForeground": "#78dce8", + "modifyingValueForeground": "#ffd866", + "valueForeground": "#ffd866" + } + }, + "DebuggerTabs": { + "underlinedTabBackground": "#5b595c" + }, + "DebuggerPopup": { + "borderColor": "#5b595c" + }, + "DefaultTabs": { + "background": "#2d2a2e", + "borderColor": "#2d2a2e", + "hoverBackground": "#363337", + "inactiveUnderlineColor": "#ffd866", + "underlineColor": "#ffd866", + "underlinedTabBackground": "#2d2a2e", + "underlineHeight": 2 + }, + "DragAndDrop": { + "areaBackground": "#2d2a2e", + "areaBorderColor": "#2d2a2e", + "areaForeground": "#fcfcfa" + }, + "Editor": { + "background": "#221f22", + "foreground": "#fcfcfa", + "shortcutForeground": "#939293" + }, + "EditorPane": { + "background": "#221f22", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveBackground": "#2d2a2e", + "inactiveForeground": "#5b595c", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "EditorTabs": { + "borderColor": "#363337", + "inactiveUnderlineColor": "#ffd866", + "underlineColor": "#ffd866", + "underlinedTabBackground": "#363337", + "underlinedTabForeground": "#c1c0c0" + }, + "FileColor": { + "Yellow": "00000000" + }, + "FormattedTextField": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveBackground": "#403e41", + "inactiveForeground": "#5b595c", + "selectionForeground": "#ffd866", + "selectionBackground": "#403e41" + }, + "Group": { + "disabledSeparatorColor": "#2d2a2e", + "separatorColor": "#2d2a2e" + }, + "GutterTooltip": { + "infoForeground": "#fcfcfa", + "lineSeparatorColor": "#2d2a2e" + }, + "HelpTooltip": { + "borderColor": "#2d2a2e", + "infoForeground": "#939293" + }, + "InformationHint": { + "borderColor": "#2d2a2e" + }, + "InplaceRefactoringPopup": { + "borderColor": "#2d2a2e" + }, + "Label": { + "background": "#2d2a2e", + "disabledForeground": "#5b595c", + "disabledText": "#5b595c", + "foreground": "#939293", + "infoForeground": "#939293", + "selectedForeground": "#ffd866" + }, + "Link": { + "activeForeground": "#ffd866", + "hoverForeground": "#ffd866", + "pressedForeground": "#ffd866", + "secondaryForeground": "#939293", + "visitedForeground": "#ffd866" + }, + "List": { + "background": "#221f22", + "foreground": "#fcfcfa", + "selectionBackground": "#363337", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#363337", + "selectionInactiveForeground": "#ffd866" + }, + "MemoryIndicator": { + "allocatedBackground": "#403e41", + "usedBackground": "#5b595c" + }, + "Menu": { + "acceleratorForeground": "#939293", + "acceleratorSelectionForeground": "#fcfcfa", + "background": "#2d2a2e", + "borderColor": "#363337", + "disabledBackground": "#403e41", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "separatorColor": "#2d2a2e", + "selectionForeground": "#ffd866" + }, + "MenuBar": { + "borderColor": "#363337", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "highlight": "#2d2a2e", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866", + "shadow": "#221f22" + }, + "MenuItem": { + "acceleratorForeground": "#939293", + "background": "#2d2a2e", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "NavBar": { + "borderColor": "#363337" + }, + "Notification": { + "background": "#363337", + "borderColor": "#221f22", + "errorBackground": "#221f22", + "errorBorderColor": "#221f22", + "foreground": "#fcfcfa", + "MoreButton": { + "background": "#403e41", + "foreground": "#fcfcfa", + "innerBorderColor": "#363337" + }, + "ToolWindow": { + "errorBackground": "#363337", + "errorBorderColor": "#363337", + "informativeBackground": "#363337", + "informativeBorderColor": "#363337", + "warningBackground": "#363337", + "warningBorderColor": "#363337" + } + }, + "OptionPane": { + "background": "#2d2a2e", + "foreground": "#fcfcfa", + "messageForeground": "#fcfcfa" + }, + "Panel": { + "background": "#2d2a2e", + "foreground": "#939293" + }, + "ParameterInfo": { + "background": "#403e41", + "borderColor": "#363337", + "currentOverloadBackground": "#403e41", + "currentParameterForeground": "#ffd866", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "infoForeground": "#939293", + "lineSeparatorColor": "#363337" + }, + "PasswordField": { + "background": "#403e41", + "capsLockIconColor": "#ffd866", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "Plugins": { + "background": "#2d2a2e", + "disabledForeground": "#939293", + "eapTagBackground": "#5b595c", + "lightSelectionBackground": "#363337", + "hoverBackground": "#363337", + "tagForeground": "#ffd866", + "tagBackground": "#5b595c", + "Button": { + "installBackground": "#221f22", + "installBorderColor": "#221f22", + "installForeground": "#fcfcfa", + "installFocusedBackground": "#221f22", + "installFillForeground": "#939293", + "installFillBackground": "#221f22", + "updateBackground": "#221f22", + "updateBorderColor": "#221f22", + "updateForeground": "#fcfcfa" + }, + "SearchField": { + "background": "#363337", + "borderColor": "#363337" + }, + "SectionHeader": { + "background": "#2d2a2e", + "foreground": "#939293" + }, + "Tab": { + "hoverBackground": "#363337", + "selectedForeground": "#fcfcfa", + "selectedBackground": "#363337" + } + }, + "Popup": { + "Advertiser": { + "background": "#2d2a2e", + "borderColor": "#2d2a2e", + "foreground": "#ffd866" + }, + "borderColor": "#221f22", + "inactiveBorderColor": "#2d2a2e", + "innerBorderColor": "#2d2a2e", + "Header": { + "activeBackground": "#2d2a2e", + "inactiveBackground": "#221f22" + }, + "paintBorder": true, + "separatorForeground": "#fcfcfa", + "separatorColor": "#2d2a2e", + "Toolbar": { + "background": "#221f22", + "borderColor": "#363337" + } + }, + "PopupMenu": { + "background": "#2d2a2e", + "foreground": "#fcfcfa", + "translucentBackground": "#2d2a2e", + "selectionBackground": "#403e41" + }, + "PopupMenuSeparator": { + "height": 10, + "stripeIndent": 5 + }, + "ProgressBar": { + "background": "#2d2a2e", + "foreground": "#ffd866", + "indeterminateEndColor": "#ffd866", + "indeterminateStartColor": "#ffd866", + "progressColor": "#ffd866", + "selectionBackground": "#5b595c", + "trackColor": "#5b595c" + }, + "RadioButton": { + "background": "#2d2a2e", + "disabledText": "#5b595c", + "foreground": "#fcfcfa" + }, + "RadioButtonMenuItem": { + "acceleratorForeground": "#939293", + "acceleratorSelectionForeground": "#939293", + "background": "#2d2a2e", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "SearchEverywhere": { + "Advertiser": { + "background": "#221f22", + "foreground": "#939293" + }, + "Header": { + "background": "#2d2a2e" + }, + "List": { + "separatorColor": "#2d2a2e", + "separatorForeground": "#939293" + }, + "SearchField": { + "background": "#2d2a2e", + "borderColor": "#221f22", + "infoForeground": "#939293" + }, + "Tab": { + "selectedForeground": "#ffd866", + "selectedBackground": "#5b595c" + } + }, + "SearchMatch": { + "endBackground": "#ffd866", + "startBackground": "#ffd866" + }, + "Separator": { + "separatorColor": "#363337" + }, + "SidePanel": { + "background": "#221f22" + }, + "Slider": { + "background": "#2d2a2e", + "buttonBorderColor": "#ffd866", + "buttonColor": "#ffd866", + "foreground": "#fcfcfa", + "tickColor": "#403e41", + "trackColor": "#403e41" + }, + "SpeedSearch": { + "background": "#5b595c", + "borderColor": "#2d2a2e", + "errorForeground": "#fcfcfa", + "foreground": "#fcfcfa" + }, + "Spinner": { + "background": "#2d2a2e" + }, + "SplitPane": { + "background": "#2d2a2e", + "highlight": "#221f22" + }, + "SplitPaneDivider": { + "draggingColor": "#403e41" + }, + "StatusBar": { + "borderColor": "#363337", + "hoverBackground": "#363337" + }, + "TabbedPane": { + "background": "#2d2a2e", + "contentAreaColor": "#5b595c", + "disabledForeground": "#5b595c", + "disabledUnderlineColor": "#5b595c", + "focus": "#403e41", + "focusColor": "#403e41", + "foreground": "#fcfcfa", + "hoverColor": "#363337", + "tabSelectionHeight": 2, + "underlineColor": "#ffd866" + }, + "Table": { + "background": "#221f22", + "dropLineColor": "#ffd866", + "dropLineShortColor": "#ffd866", + "focusCellBackground": "#221f22", + "focusCellForeground": "#ffd866", + "foreground": "#fcfcfa", + "gridColor": "#221f22", + "lightSelectionForeground": "#ffd866", + "lightSelectionInactiveForeground": "#fcfcfa", + "lightSelectionInactiveBackground": "#363337", + "selectionBackground": "#363337", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#363337", + "selectionInactiveForeground": "#fcfcfa", + "sortIconColor": "#fcfcfa", + "stripeColor": "#221f22" + }, + "TableHeader": { + "background": "#2d2a2e", + "bottomSeparatorColor": "#363337", + "cellBorder": "4,0,4,0", + "foreground": "#fcfcfa", + "focusCellBackground": "#403e41", + "separatorColor": "#363337" + }, + "textText": "#939293", + "TextArea": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "TextField": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "TextPane": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "TitlePane": { + "background": "#221f22", + "Button.hoverBackground": "#5b595c", + "inactiveBackground": "#2d2a2e", + "infoForeground": "#939293", + "inactiveInfoForeground": "#939293" + }, + "TitledBorder": { + "titleColor": "#2d2a2e" + }, + "ToggleButton": { + "borderColor": "#403e41", + "buttonColor": "#fcfcfa", + "disabledText": "#5b595c", + "foreground": "#939293", + "offForeground": "#2d2a2e", + "offBackground": "#2d2a2e", + "onBackground": "#ffd866", + "onForeground": "#ffd866" + }, + "ToolBar": { + "background": "#221f22", + "borderHandleColor": "#939293", + "floatingForeground": "#939293", + "foreground": "#fcfcfa" + }, + "ToolTip": { + "Actions": { + "background": "#2d2a2e", + "infoForeground": "#939293" + }, + "background": "#2d2a2e", + "borderColor": "#5b595c", + "foreground": "#fcfcfa", + "infoForeground": "#939293", + "shortcutForeground": "#939293" + }, + "ToolWindow": { + "Button": { + "hoverBackground": "#363337", + "selectedForeground": "#ffd866", + "selectedBackground": "#363337" + }, + "Header": { + "background": "#2d2a2e", + "borderColor": "#363337", + "inactiveBackground": "#2d2a2e" + }, + "HeaderCloseButton": { + "background": "#2d2a2e" + }, + "HeaderTab": { + "hoverBackground": "#363337", + "hoverInactiveBackground": "#363337", + "inactiveUnderlineColor": "#ffd866", + "selectedInactiveBackground": "#2d2a2e", + "underlineColor": "#ffd866", + "underlinedTabBackground": "#363337", + "underlinedTabInactiveBackground": "#363337" + } + }, + "Tree": { + "background": "#221f22", + "foreground": "#939293", + "hash": "#2d2a2e", + "modifiedItemForeground": "#ffd866", + "rowHeight": 22, + "selectionBackground": "#2d2a2e", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#2d2a2e" + }, + "UiDesigner": { + "Panel": { + "background": "#2d2a2e" + }, + "Preview": { + "background": "#2d2a2e" + } + }, + "ValidationTooltip": { + "errorBackground": "#363337", + "errorBorderColor": "#363337", + "warningBackground": "#363337", + "warningBorderColor": "#363337" + }, + "VersionControl": { + "FileHistory": { + "Commit": { + "selectedBranchBackground": "#2d2a2e" + } + }, + "GitLog": { + "localBranchIconColor": "#ffd866", + "otherIconColor": "#939293", + "remoteBranchIconColor": "#fcfcfa", + "tagIconColor": "#939293" + }, + "HgLog": { + "branchIconColor": "#ffd866", + "bookmarkIconColor": "#ffd866", + "closedBranchIconColor": "#5b595c", + "localTagIconColor": "#939293", + "mqTagIconColor": "#939293", + "tagIconColor": "#939293", + "tipIconColor": "#939293" + }, + "Log": { + "Commit": { + "unmatchedForeground": "#939293", + "currentBranchBackground": "#363337" + } + }, + "RefLabel": { + "foreground": "#ffd866", + "backgroundBase": "#5b595c" + } + }, + "Viewport": { + "background": "#221f22", + "foreground": "#fcfcfa" + }, + "WelcomeScreen": { + "background": "#2d2a2e", + "borderColor": "#363337", + "captionBackground": "#221f22", + "captionForeground": "#fcfcfa", + "footerBackground": "#221f22", + "footerForeground": "#fcfcfa", + "headerBackground": "#2d2a2e", + "headerForeground": "#fcfcfa", + "Projects": { + "background": "#221f22", + "selectionBackground": "#2d2a2e", + "selectionInactiveBackground": "#2d2a2e" + }, + "separatorColor": "#363337" + }, + "window": "#2d2a2e", + "Window": { + "border": "0,0,0,0,#363337" + }, + "windowBorder": "#363337", + "windowText": "#939293" + }, + "icons": { + "ColorPalette": { + "Checkbox.Background.Default.Dark": "##403e41", + "Checkbox.Background.Disabled.Dark": "##221f22", + "Checkbox.Background.Selected.Dark": "##403e41", + "Checkbox.Border.Default.Dark": "##403e41", + "Checkbox.Border.Disabled.Dark": "##221f22", + "Checkbox.Border.Selected.Dark": "##403e41", + "Checkbox.Focus.Thin.Default.Dark": "##403e41", + "Checkbox.Focus.Thin.Selected.Dark": "##221f22", + "Checkbox.Focus.Wide.Dark": "##403e41", + "Checkbox.Foreground.Disabled.Dark": "##939293", + "Checkbox.Foreground.Selected.Dark": "##fcfcfa" + } + } +} \ No newline at end of file diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt new file mode 100644 index 00000000..740ed613 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Antelle + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json new file mode 100644 index 00000000..969724e9 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json @@ -0,0 +1,232 @@ +{ + "name": "Xcode-Dark", + "dark": true, + "author": "Antelle", + "editorScheme": "/Xcode-Dark.xml", + "ui": { + "*": { + "background": "#323333", + "foreground": "#DFDFE0", + + "infoForeground": "#A9A9AA", + + "selectionBackground": "#1D7BED", + "selectionForeground": "#F9FCFF", + "selectionInactiveBackground": "#555657", + "selectionBackgroundInactive": "#555657", + + "lightSelectionBackground": "#2B4059", + "lightSelectionForeground": "#FFFFFF", + "lightSelectionInactiveBackground": "#555657", + "lightSelectionInactiveForeground": "#DFDFE0", + + "disabledBackground": "#323333", + "inactiveBackground": "#313233", + + "disabledForeground": "#737374", + "disabledText": "#737374", + "inactiveForeground": "#737374", + + "acceleratorForeground": "#D0D0D9", + "acceleratorSelectionForeground": "#D0D0D9", + + "errorForeground": "#843937", + + "borderColor": "#414141", + "disabledBorderColor": "#414141", + + "focusColor": "#24648D", + "focusedBorderColor": "#4C8CB5", + + "separatorForeground": "#5A5B5C", + "separatorColor": "#5A5B5C", + "lineSeparatorColor": "#5A5B5C", + + "modifiedItemForeground": "#1E4D86" + }, + + "ActionButton": { + "hoverBackground": "#5A5B5C", + "hoverBorderColor": "#5A5B5C", + "pressedBackground": "#414141", + "pressedBorderColor": "#414141" + }, + + "Button": { + "startBackground": "#424242", + "endBackground": "#424242", + "startBorderColor": "#525252", + "endBorderColor": "#525252", + "shadowColor": "#363636", + + "default": { + "foreground": "#DDE9FA", + "startBackground": "#206DE3", + "endBackground": "#1C61CA", + "startBorderColor": "#6099EC", + "endBorderColor": "#1C61CA", + "focusedBorderColor": "#45A1F4", + "focusColor": "#245F84", + "shadowColor": "#363636" + } + }, + + "Borders": { + "color": "#393A3B", + "ContrastBorderColor": "#4b4c4d" + }, + + "ComboBox": { + "nonEditableBackground": "#4f5051", + "background": "#414141", + "ArrowButton": { + "iconColor": "#DBDBDB", + "background": "#1E67D7", + "disabledIconColor": "#6B6B6C", + "nonEditableBackground": "#4f5051" + } + }, + + "ComboPopup.border": "1,1,1,1,3F3F3F", + + "Component": { + "errorFocusColor": "#843937", + "inactiveErrorFocusColor": "#433239", + "warningFocusColor": "#8F7B2E", + "inactiveWarningFocusColor": "#434136", + "iconColor": "#DFDFE0", + "hoverIconColor": "#FFFFFF" + }, + + "Counter": { + "background": "#909090", + "foreground": "#000000" + }, + + "DebuggerPopup.borderColor": "#414141", + + "DefaultTabs": { + "borderColor": "#484949", + "background": "#2A2B2B", + "inactiveUnderlineColor": "#24648D", + "hoverBackground": "#262727", + "underlineColor": "#1D7BED", + "underlineHeight": 2, + "underlinedTabBackground": "#3D3E3F" + }, + + "DragAndDrop": { + "areaForeground": "#DFDFE0", + "areaBackground": "#363737", + "areaBorderColor": "#414141" + }, + + "EditorTabs": { + "inactiveColoredFileBackground": "#2d281d" + }, + + "FileColor": { + "Yellow": "#3D3B37", + "Green": "#383C38", + "Blue": "#343A3E", + "Violet": "#3C3A3D", + "Orange": "#3D3A36", + "Rose": "#3D383B" + }, + + "Link": { + "activeForeground": "#428EE1", + "hoverForeground": "#7094FF", + "pressedForeground": "#FC4741", + "visitedForeground": "#7094FF" + }, + + "Notification": { + "errorForeground": "#DFDFE0", + "errorBackground": "#843937", + "errorBorderColor": "#982B31", + + "MoreButton.innerBorderColor": "#4b4c4d", + + "ToolWindow": { + "informativeForeground": "#DFDFE0", + "informativeBackground": "#225DA1", + "informativeBorderColor": "#1C61CA", + + "warningForeground": "#DFDFE0", + "warningBackground": "#A98938", + "warningBorderColor": "#FEC42E", + + "errorForeground": "#DFDFE0", + "errorBackground": "#843937", + "errorBorderColor": "#982B31" + } + }, + + "ProgressBar": { + "trackColor": "#252525", + "progressColor": "#CDCCCC", + "indeterminateStartColor": "#CDCCCC", + "indeterminateEndColor": "#B4B3B3", + "failedColor": "#DF1A21", + "failedEndColor": "#982B31", + "passedColor": "#3AA87B", + "passedEndColor": "#368E68" + }, + + "SearchMatch": { + "startBackground": "#f5bc2d", + "endBackground": "#e9b32b" + }, + + "SpeedSearch": { + "errorForeground": "#DF1A21" + }, + + "ToggleButton": { + "onBackground": "#1D7BED" + }, + + "CompletionPopup": { + "matchForeground": "#FDA14F", + "selectionBackground": "#1D7BED" + }, + + "Popup": { + "Header": { + "activeBackground": "#4A4E52", + "inactiveBackground": "#4A4E52" + } + }, + + "SearchEverywhere": { + "Tab": { + "selectedForeground": "#F9FCFF", + "selectedBackground": "#555A5E" + } + }, + + "icons": { + "ColorPalette": { + "Actions.Grey": "#969798", + "Actions.Red": "#FC545B", + "Actions.Yellow": "#e0c24c", + "Actions.Green": "#71bf47", + "Actions.Blue": "#3062d1", + "Actions.GreyInline.Dark": "#6F6F70", + + "Objects.Grey": "#6F6F70", + "Objects.RedStatus": "#FC4741", + "Objects.Red": "#FC545B", + "Objects.Pink": "#F5539E", + "Objects.Yellow": "#e0c24c", + "Objects.Green": "#71bf47", + "Objects.Blue": "#3062d1", + "Objects.Purple": "#A453A5", + "Objects.BlackText": "#000000", + "Objects.YellowDark": "#89744D", + "Objects.GreenAndroid": "#5D7554" + } + } + } +} diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json index 415df184..8a80d74e 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json @@ -7,13 +7,14 @@ "bg30": "#2f343f30", "fg": "#D3DAE3", "text": "#8b9eb5", - "selBg": "#414181", + "selBg": "#8888FF", + "selBg20": "#8888FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#404552", "excl": "#37373d", - "second": "#393f4c", - "dis": "#a2a2a2", + "second": "#393f4c45", + "dis": "#D3DAE3", "accent": "#42A5F5", "accent2": "#42A5F52", "accent50": "#42A5F550", @@ -25,6 +26,7 @@ "hl": "#393f4c", "notif": "#262a33", "hc": "#262b33", + "shadow": "undefined", "white": "#CF6A4C", "blue": "#7587A6", "red": "#CF6A4C", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json index 3be1dfdc..f17bbef6 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json @@ -7,13 +7,14 @@ "bg30": "#2f343f30", "fg": "#D3DAE3", "text": "#8b9eb5", - "selBg": "#414181", + "selBg": "#8888FF", + "selBg20": "#8888FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#404552", "excl": "#37373d", - "second": "#393f4c", - "dis": "#a2a2a2", + "second": "#393f4c45", + "dis": "#D3DAE3", "accent": "#42A5F5", "accent2": "#42A5F52", "accent50": "#42A5F550", @@ -25,6 +26,7 @@ "hl": "#393f4c", "notif": "#262a33", "hc": "#2f343f", + "shadow": "undefined", "white": "#CF6A4C", "blue": "#7587A6", "red": "#CF6A4C", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json index b13f88f5..6ea1b4e9 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#979FAD", "text": "#979FAD", "selBg": "#4D515D", + "selBg20": "#4D515D20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#282C34", @@ -25,6 +26,7 @@ "hl": "#383D48", "notif": "#282C34", "hc": "#21252B", + "shadow": "undefined", "white": "#D19A66", "blue": "#61AEEF", "red": "#e06c75", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json index 723606b3..5d9b3096 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json @@ -8,6 +8,7 @@ "fg": "#979FAD", "text": "#979FAD", "selBg": "#4D515D", + "selBg20": "#4D515D20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#282C34", @@ -25,6 +26,7 @@ "hl": "#383D48", "notif": "#282C34", "hc": "#282C34", + "shadow": "undefined", "white": "#D19A66", "blue": "#61AEEF", "red": "#e06c75", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json index a3374c18..a4d09854 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#232324", "text": "#7f7f7f", "selBg": "#FFFFFF", + "selBg20": "#FFFFFF20", "selFg": "#232324", "activeFg": "#232324", "border": "#DBDBDC", @@ -18,13 +19,14 @@ "accent2": "#2979ff2", "accent50": "#2979ff50", "accent70": "#2979ff70", - "cs": "#eaeaea", + "cs": "#eaeae", "button": "#DBDBDC", "table": "#DBDBDC", - "tree": "#dbdbdc", - "hl": "#DBDBDC", + "tree": "#DBDBDC80", + "hl": "#FFFFFF", "notif": "#F2F2F2", - "hc": "#eaeaea", + "hc": "#eaeae", + "shadow": "undefined", "white": "#986801", "blue": "#4078F2", "red": "#E4564A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json index db3b5085..df7a0d5a 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json @@ -8,6 +8,7 @@ "fg": "#232324", "text": "#7f7f7f", "selBg": "#FFFFFF", + "selBg20": "#FFFFFF20", "selFg": "#232324", "activeFg": "#232324", "border": "#DBDBDC", @@ -18,13 +19,14 @@ "accent2": "#2979ff2", "accent50": "#2979ff50", "accent70": "#2979ff70", - "cs": "#eaeaea", + "cs": "#eaeae", "button": "#DBDBDC", "table": "#DBDBDC", - "tree": "#dbdbdc", - "hl": "#DBDBDC", + "tree": "#DBDBDC80", + "hl": "#FFFFFF", "notif": "#F2F2F2", "hc": "#F4F4F4", + "shadow": "undefined", "white": "#986801", "blue": "#4078F2", "red": "#E4564A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json index 7ec63144..15abffab 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#F8F8F2", "text": "#6272A4", "selBg": "#44475A", + "selBg20": "#44475A20", "selFg": "#8BE9FD", "activeFg": "#FFFFFF", "border": "#21222C", @@ -25,6 +26,7 @@ "hl": "#6272A4", "notif": "#1D2228", "hc": "#191A21", + "shadow": "undefined", "white": "#F8F8F2", "blue": "#8aff80", "red": "#f780bf", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json index 2195fe58..5df07bd1 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json @@ -8,6 +8,7 @@ "fg": "#F8F8F2", "text": "#6272A4", "selBg": "#44475A", + "selBg20": "#44475A20", "selFg": "#8BE9FD", "activeFg": "#FFFFFF", "border": "#21222C", @@ -25,6 +26,7 @@ "hl": "#6272A4", "notif": "#1D2228", "hc": "#282A36", + "shadow": "undefined", "white": "#F8F8F2", "blue": "#8aff80", "red": "#f780bf", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json index 1bfffe4c..e70a8eb7 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json @@ -7,7 +7,8 @@ "bg30": "#F7F8FA30", "fg": "#5B6168", "text": "#292D31", - "selBg": "#c6e5ff", + "selBg": "#bbd2f5", + "selBg20": "#bbd2f520", "selFg": "#111111", "activeFg": "#111111", "border": "#DFE1E4", @@ -21,10 +22,11 @@ "cs": "#fafbfc", "button": "#edf1f5", "table": "#cce5ff", - "tree": "#e1e4e8", + "tree": "#ebebeb", "hl": "#CCE5FF", "notif": "#DFECFE", "hc": "#fafbfc", + "shadow": "undefined", "white": "#24292E", "blue": "#6F42C1", "red": "#22863A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json index ef305b9b..729dfaa4 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#e1e4e8", "text": "#959da5", "selBg": "#3392FF", + "selBg20": "#3392FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#1b1f23", @@ -25,6 +26,7 @@ "hl": "#444d56", "notif": "#2f363d", "hc": "#1e2428", + "shadow": "undefined", "white": "#d1d5da", "blue": "#b392f0", "red": "#85e89d", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json index 53e4cb4b..4272c409 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json @@ -8,6 +8,7 @@ "fg": "#e1e4e8", "text": "#959da5", "selBg": "#3392FF", + "selBg20": "#3392FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#1b1f23", @@ -25,6 +26,7 @@ "hl": "#444d56", "notif": "#2f363d", "hc": "#24292e", + "shadow": "undefined", "white": "#d1d5da", "blue": "#b392f0", "red": "#85e89d", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json index f158c95e..91a28cc3 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json @@ -7,7 +7,8 @@ "bg30": "#F7F8FA30", "fg": "#5B6168", "text": "#292D31", - "selBg": "#c6e5ff", + "selBg": "#bbd2f5", + "selBg20": "#bbd2f520", "selFg": "#111111", "activeFg": "#111111", "border": "#DFE1E4", @@ -21,10 +22,11 @@ "cs": "#fafbfc", "button": "#edf1f5", "table": "#cce5ff", - "tree": "#e1e4e8", + "tree": "#ebebeb", "hl": "#CCE5FF", "notif": "#DFECFE", "hc": "#F7F8FA", + "shadow": "undefined", "white": "#24292E", "blue": "#6F42C1", "red": "#22863A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json index 2ecc877b..4625f336 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#403f53", "text": "#90A7B2", "selBg": "#d3e8f8", + "selBg20": "#d3e8f820", "selFg": "#403f53", "activeFg": "#FFFFFF", "border": "#d9d9d9", @@ -25,6 +26,7 @@ "hl": "#CCCCCC", "notif": "#F0F0F0", "hc": "#f0f0f0", + "shadow": "undefined", "white": "#4876d6", "blue": "#4876d6", "red": "#994cc3", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json index 94a9d7ba..0610caf0 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json @@ -8,6 +8,7 @@ "fg": "#403f53", "text": "#90A7B2", "selBg": "#d3e8f8", + "selBg20": "#d3e8f820", "selFg": "#403f53", "activeFg": "#FFFFFF", "border": "#d9d9d9", @@ -25,6 +26,7 @@ "hl": "#CCCCCC", "notif": "#F0F0F0", "hc": "#F0F0F0", + "shadow": "undefined", "white": "#4876d6", "blue": "#4876d6", "red": "#994cc3", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json index d5ba0609..f23ffda9 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json @@ -8,8 +8,9 @@ "fg": "#fcfcfa", "text": "#939293", "selBg": "#6E6C6F", - "selFg": "#ffd866", - "activeFg": "#FFFFFF", + "selBg20": "#6E6C6F20", + "selFg": "#FFFFFF", + "activeFg": "#ffd866", "border": "#2d2a2e", "excl": "#3a3a3c", "second": "#403E41", @@ -25,6 +26,7 @@ "hl": "#5b595c", "notif": "#363437", "hc": "#221F22", + "shadow": "undefined", "white": "#FCFCFA", "blue": "#A9DC76", "red": "#FF6188", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json index 6d816cda..c0bcbfef 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json @@ -8,8 +8,9 @@ "fg": "#fcfcfa", "text": "#939293", "selBg": "#6E6C6F", - "selFg": "#ffd866", - "activeFg": "#FFFFFF", + "selBg20": "#6E6C6F20", + "selFg": "#FFFFFF", + "activeFg": "#ffd866", "border": "#2d2a2e", "excl": "#3a3a3c", "second": "#403E41", @@ -25,6 +26,7 @@ "hl": "#5b595c", "notif": "#363437", "hc": "#2D2A2E", + "shadow": "undefined", "white": "#FCFCFA", "blue": "#A9DC76", "red": "#FF6188", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json index a33e3b76..1202dbeb 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#c8d3f5", "text": "#a9b8e8", "selBg": "#444a73", + "selBg20": "#444a7320", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#222436", @@ -25,6 +26,7 @@ "hl": "#444a73", "notif": "#191a2a", "hc": "#191a2a", + "shadow": "undefined", "white": "#c8d3f5", "blue": "#70b0ff", "red": "#ff757f", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json index d5cca660..a6dace57 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json @@ -8,6 +8,7 @@ "fg": "#c8d3f5", "text": "#a9b8e8", "selBg": "#444a73", + "selBg20": "#444a7320", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#222436", @@ -25,6 +26,7 @@ "hl": "#444a73", "notif": "#191a2a", "hc": "#222436", + "shadow": "undefined", "white": "#c8d3f5", "blue": "#70b0ff", "red": "#ff757f", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json index 73e70b58..cc376ab5 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json @@ -7,7 +7,8 @@ "bg30": "#01162730", "fg": "#d6deeb", "text": "#5f7e97", - "selBg": "#084d81", + "selBg": "#5f7e97", + "selBg20": "#5f7e9720", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#122d42", @@ -25,6 +26,7 @@ "hl": "#084d81", "notif": "#01111d", "hc": "#010e1a", + "shadow": "undefined", "white": "#addb67", "blue": "#82aaff", "red": "#7fdbca", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json index 63b6d059..ea577cc2 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json @@ -7,7 +7,8 @@ "bg30": "#01162730", "fg": "#d6deeb", "text": "#5f7e97", - "selBg": "#084d81", + "selBg": "#5f7e97", + "selBg20": "#5f7e9720", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#122d42", @@ -25,6 +26,7 @@ "hl": "#084d81", "notif": "#01111d", "hc": "#011627", + "shadow": "undefined", "white": "#addb67", "blue": "#82aaff", "red": "#7fdbca", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json index a9454602..6320164f 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#839496", "text": "#586e75", "selBg": "#2E4C52", + "selBg20": "#2E4C5220", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#0D3640", @@ -25,6 +26,7 @@ "hl": "#005a6f", "notif": "#2E4C52", "hc": "#00252E", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json index 16505030..fbab003b 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json @@ -8,6 +8,7 @@ "fg": "#839496", "text": "#586e75", "selBg": "#2E4C52", + "selBg20": "#2E4C5220", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#0D3640", @@ -25,6 +26,7 @@ "hl": "#005a6f", "notif": "#2E4C52", "hc": "#002B36", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json index 13819565..77c76046 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#586e75", "text": "#93a1a1", "selBg": "#e8dcb6", + "selBg20": "#e8dcb620", "selFg": "#002b36", "activeFg": "#002b36", "border": "#edead9", @@ -25,6 +26,7 @@ "hl": "#d1cbb8", "notif": "#EDE8D4", "hc": "#eee8d5", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json index 011e660d..3d2e9157 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json @@ -8,6 +8,7 @@ "fg": "#586e75", "text": "#93a1a1", "selBg": "#e8dcb6", + "selBg20": "#e8dcb620", "selFg": "#002b36", "activeFg": "#002b36", "border": "#edead9", @@ -25,6 +26,7 @@ "hl": "#d1cbb8", "notif": "#EDE8D4", "hc": "#fdf6e3", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json index 04f3efa2..7bba8603 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json @@ -164,6 +164,10 @@ "background": "#323846", "selectionInactiveForeground": "#e5e9f0" }, + "MemoryIndicator": { + "allocatedBackground": "#81a1c1", + "usedBackground": "#5e81ac" + }, "Menu": { "background": "#323846", "borderColor": "#3b4252", @@ -231,6 +235,9 @@ "activeBackground": "#434c5e" } }, + "PopupMenu": { + "background": "#323846" + }, "ProgressBar": { "background": "#88c0d0", "failedColor": "#bf616a", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json index d490747c..db985f73 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json @@ -8,7 +8,10 @@ "backgroundColor": "#21252b", "borderColor": "#333841", "infoForeground": "#7e8491", - "foregroundColor": "#abb2bf" + "foregroundColor": "#abb2bf", + "notificationBackground": "#3d424b", + "selectionBackground": "#323844", + "selectionForeground": "#d7dae0" }, "ui": { "*": { @@ -17,10 +20,18 @@ "infoForeground": "#5c6370", - "selectionBackground": "#323844", + "selectionBackground": { + "os.default": "selectionBackground", + "os.windows": "selectionBackground", + "os.mac": "selectionBackground" + }, + "selectionForeground": { + "os.default": "selectionForeground", + "os.windows": "selectionForeground", + "os.mac": "selectionForeground" + }, "selectionInactiveBackground": "#2c313a", "selectionBackgroundInactive": "#2c313a", - "selectionForeground": "#d7dae0", "disabledBackground": "backgroundColor", "inactiveBackground": "backgroundColor", @@ -142,6 +153,9 @@ "Editor": { "background": "#282c34", "foreground": "#abb2bf", + "SearchField": { + "background": "#282c34" + }, "shortcutForeground": "accentColor" }, @@ -192,7 +206,7 @@ }, "Notification": { - "background": "#3d424b", + "background": "notificationBackground", "borderColor": "#53565f", "errorForeground": "#abb2bf", @@ -219,6 +233,10 @@ } }, + "NotificationsToolwindow.newNotification.background" : "notificationBackground", + "NotificationsToolwindow.newNotification.hoverBackground" : "#3d424b", + "NotificationsToolwindow.Notification.hoverBackground" : "#3d424b", + "Panel.background": "backgroundColor", "ParameterInfo": { @@ -314,6 +332,8 @@ "Settings.Spotlight.borderColor": "accentColor", + "StatusBar.background": "baseBackground", + "TabbedPane": { "underlineColor": "accentColor", "contentAreaColor": "#323844", @@ -362,6 +382,7 @@ }, "ToolWindow": { + "background": "backgroundColor", "Button": { "hoverBackground": "#323844", "selectedBackground": "#3d424b", diff --git a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts index 442f5c7c..2a47c790 100644 --- a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts +++ b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts @@ -15,84 +15,101 @@ */ plugins { - id( "dev.nokee.jni-library" ) version "0.4.0" - id( "dev.nokee.cpp-language" ) version "0.4.0" + `cpp-library` } library { targetMachines.set( listOf( machines.windows.x86, machines.windows.x86_64 ) ) - variants.configureEach { - sharedLibrary { - compileTasks.configureEach { - onlyIf { isBuildable } + // disable debuggable for release builds to make shared libraries smaller + binaries.configureEach( CppSharedLibrary::class ) { + with( compileTask.get() ) { + if( name.contains( "Release" ) ) + isDebuggable = false + } + with( linkTask.get() ) { + if( name.contains( "Release" ) ) + debuggable.set( false ) + } + } +} - // depend on :flatlaf-core:compileJava because it generates the JNI headers - dependsOn( ":flatlaf-core:compileJava" ) +var javaHome = System.getProperty( "java.home" ) +if( javaHome.endsWith( "jre" ) ) + javaHome += "/.." - doFirst { - println( "Used Tool Chain:" ) - println( " - ${toolChain.get()}" ) - println( "Available Tool Chains:" ) - toolChains.forEach { - println( " - $it" ) - } +tasks { + register( "build-natives" ) { + group = "build" + description = "Builds natives" - // copy needed JNI headers - copy { - from( project( ":flatlaf-core" ).buildDir.resolve( "generated/jni-headers" ) ) - into( "src/main/headers" ) - include( - "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder.h", - "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_WndProc.h" - ) - filter( - "eol" to org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance( "lf" ) - ) - } - } + dependsOn( "linkReleaseX86", "linkReleaseX86-64" ) + } - compilerArgs.addAll( toolChain.map { - when( it ) { - is Gcc, is Clang -> listOf( "-O2", "-DUNICODE" ) - is VisualCpp -> listOf( "/O2", "/Zl", "/GS-", "/DUNICODE" ) - else -> emptyList() - } - } ) + withType().configureEach { + onlyIf { name.contains( "Release" ) } + + // depend on :flatlaf-core:compileJava because it generates the JNI headers + dependsOn( ":flatlaf-core:compileJava" ) + + doFirst { + println( "Used Tool Chain:" ) + println( " - ${toolChain.get()}" ) + println( "Available Tool Chains:" ) + toolChains.forEach { + println( " - $it" ) } - linkTask.configure { - onlyIf { isBuildable } - - val nativesDir = project( ":flatlaf-core" ).projectDir.resolve( "src/main/resources/com/formdev/flatlaf/natives" ) - val is64Bit = targetMachine.architecture.is64Bit - val libraryName = if( is64Bit ) "flatlaf-windows-x86_64.dll" else "flatlaf-windows-x86.dll" - val jawt = if( is64Bit ) "lib/jawt-x86_64" else "lib/jawt-x86" - - outputs.file( "$nativesDir/$libraryName" ) - - linkerArgs.addAll( toolChain.map { - when( it ) { - is Gcc, is Clang -> listOf( "-l${jawt}", "-lUser32", "-lGdi32", "-lshell32", "-lAdvAPI32", "-lKernel32" ) - is VisualCpp -> listOf( "${jawt}.lib", "User32.lib", "Gdi32.lib", "shell32.lib", "AdvAPI32.lib", "Kernel32.lib", "/NODEFAULTLIB" ) - else -> emptyList() - } - } ) - - doLast { - // copy shared library to flatlaf-core resources - copy { - from( linkedFile ) - into( nativesDir ) - rename( "flatlaf-natives-windows.dll", libraryName ) - } - } + // copy needed JNI headers + copy { + from( project( ":flatlaf-core" ).buildDir.resolve( "generated/jni-headers" ) ) + into( "src/main/headers" ) + include( + "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder.h", + "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_WndProc.h" + ) + filter( + "eol" to org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance( "lf" ) + ) } + } - for( taskName in listOf( "jarX86", "jarX86-64" ) ) { - tasks.named( taskName ) { - onlyIf { false } - } + includes.from( + "${javaHome}/include", + "${javaHome}/include/win32" + ) + + compilerArgs.addAll( toolChain.map { + when( it ) { + is Gcc, is Clang -> listOf( "-O2", "-DUNICODE" ) + is VisualCpp -> listOf( "/O2", "/Zl", "/GS-", "/DUNICODE" ) + else -> emptyList() + } + } ) + } + + withType().configureEach { + onlyIf { name.contains( "Release" ) } + + val nativesDir = project( ":flatlaf-core" ).projectDir.resolve( "src/main/resources/com/formdev/flatlaf/natives" ) + val is64Bit = name.contains( "64" ) + val libraryName = if( is64Bit ) "flatlaf-windows-x86_64.dll" else "flatlaf-windows-x86.dll" + val jawt = if( is64Bit ) "lib/jawt-x86_64" else "lib/jawt-x86" + + linkerArgs.addAll( toolChain.map { + when( it ) { + is Gcc, is Clang -> listOf( "-l${jawt}", "-lUser32", "-lGdi32", "-lshell32", "-lAdvAPI32", "-lKernel32" ) + is VisualCpp -> listOf( "${jawt}.lib", "User32.lib", "Gdi32.lib", "shell32.lib", "AdvAPI32.lib", "Kernel32.lib", "/NODEFAULTLIB" ) + else -> emptyList() + } + } ) + + doLast { + // copy shared library to flatlaf-core resources + copy { + from( linkedFile ) + into( nativesDir ) + rename( "flatlaf-natives-windows.dll", libraryName ) } } } diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt index 557dc459..dbaf40eb 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt @@ -1045,6 +1045,7 @@ TabbedPane.hasFullBorder false TabbedPane.hiddenTabsNavigation moreTabsButton TabbedPane.highlight #232324 HSL 240 1 14 javax.swing.plaf.ColorUIResource [UI] TabbedPane.hoverColor #303234 HSL 210 4 20 com.formdev.flatlaf.util.DerivedColor [UI] darken(5%) +TabbedPane.inactiveUnderlineColor #466a92 HSL 212 35 42 javax.swing.plaf.ColorUIResource [UI] TabbedPane.labelShift 1 TabbedPane.light #2f3031 HSL 210 2 19 javax.swing.plaf.ColorUIResource [UI] TabbedPane.scrollButtonsPlacement both @@ -1091,7 +1092,7 @@ Table.focusCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.F Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI] lineColor=#000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 Table.font [active] $defaultFont [UI] Table.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] -Table.gridColor #525658 HSL 200 4 33 javax.swing.plaf.ColorUIResource [UI] +Table.gridColor #5a5e60 HSL 200 3 36 javax.swing.plaf.ColorUIResource [UI] Table.intercellSpacing 0,0 javax.swing.plaf.DimensionUIResource [UI] Table.rowHeight 20 Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt index 7992ca66..6c536ec7 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt @@ -1050,6 +1050,7 @@ TabbedPane.hasFullBorder false TabbedPane.hiddenTabsNavigation moreTabsButton TabbedPane.highlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] TabbedPane.hoverColor #e0e0e0 HSL 0 0 88 com.formdev.flatlaf.util.DerivedColor [UI] darken(7% autoInverse) +TabbedPane.inactiveUnderlineColor #97bbdc HSL 209 50 73 javax.swing.plaf.ColorUIResource [UI] TabbedPane.labelShift 1 TabbedPane.light #e1e1e1 HSL 0 0 88 javax.swing.plaf.ColorUIResource [UI] TabbedPane.scrollButtonsPlacement both @@ -1096,7 +1097,7 @@ Table.focusCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.F Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI] lineColor=#000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 Table.font [active] $defaultFont [UI] Table.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] -Table.gridColor #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] +Table.gridColor #ebebeb HSL 0 0 92 javax.swing.plaf.ColorUIResource [UI] Table.intercellSpacing 0,0 javax.swing.plaf.DimensionUIResource [UI] Table.rowHeight 20 Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt index 25dd0eb2..aa5760b6 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt @@ -1060,6 +1060,7 @@ TabbedPane.hasFullBorder false TabbedPane.hiddenTabsNavigation moreTabsButton TabbedPane.highlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] TabbedPane.hoverColor #eeeeee HSL 0 0 93 javax.swing.plaf.ColorUIResource [UI] +TabbedPane.inactiveUnderlineColor #ff00ff HSL 300 100 50 javax.swing.plaf.ColorUIResource [UI] TabbedPane.labelShift 1 TabbedPane.light #e3e3e3 HSL 0 0 89 javax.swing.plaf.ColorUIResource [UI] TabbedPane.scrollButtonsPlacement both diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties index 820d5436..28e9c599 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties @@ -347,6 +347,7 @@ TabbedPane.disabledForeground = #777 TabbedPane.selectedBackground = #0f0 TabbedPane.selectedForeground = #00f TabbedPane.underlineColor = #ff0 +TabbedPane.inactiveUnderlineColor = #f0f TabbedPane.disabledUnderlineColor = #7a7a7a TabbedPane.hoverColor = #eee TabbedPane.focusColor = #ddd diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt index 7c69d876..37dfb70f 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt @@ -821,6 +821,7 @@ TabbedPane.hasFullBorder TabbedPane.hiddenTabsNavigation TabbedPane.highlight TabbedPane.hoverColor +TabbedPane.inactiveUnderlineColor TabbedPane.labelShift TabbedPane.light TabbedPane.scrollButtonsPlacement diff --git a/settings.gradle.kts b/settings.gradle.kts index 84f0c699..767617af 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,8 +25,7 @@ include( "flatlaf-demo" ) include( "flatlaf-testing" ) include( "flatlaf-theme-editor" ) -if( org.gradle.internal.os.OperatingSystem.current().isWindows ) - includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" ) +includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" ) includeProject( "flatlaf-natives-jna", "flatlaf-natives/flatlaf-natives-jna" ) includeProject( "flatlaf-testing-modular-app", "flatlaf-testing/flatlaf-testing-modular-app" )