diff --git a/src/main/java/com/weis/darklaf/LafManager.java b/src/main/java/com/weis/darklaf/LafManager.java index b6b68994..9dacd6b0 100644 --- a/src/main/java/com/weis/darklaf/LafManager.java +++ b/src/main/java/com/weis/darklaf/LafManager.java @@ -24,7 +24,7 @@ package com.weis.darklaf; import com.weis.darklaf.theme.DarculaTheme; -import com.weis.darklaf.theme.IntelliJTheme; +import com.weis.darklaf.theme.SolarizedDarkTheme; import com.weis.darklaf.theme.Theme; import org.jetbrains.annotations.NotNull; @@ -80,7 +80,7 @@ public final class LafManager { */ public static Theme getTheme() { if (theme == null) { - theme = new IntelliJTheme(); + theme = new SolarizedDarkTheme(); } return theme; } diff --git a/src/main/java/com/weis/darklaf/components/OverlayScrollPane.java b/src/main/java/com/weis/darklaf/components/OverlayScrollPane.java index 78600f19..27ffdc47 100644 --- a/src/main/java/com/weis/darklaf/components/OverlayScrollPane.java +++ b/src/main/java/com/weis/darklaf/components/OverlayScrollPane.java @@ -261,7 +261,6 @@ public class OverlayScrollPane extends JLayeredPane { private ControlPanel(@NotNull final OScrollPane scrollPane) { setLayout(null); - setOpaque(false); scrollPane.setVerticalScrollBar(scrollPane.verticalScrollBar); if (scrollPane.getVerticalScrollBarPolicy() != JScrollPane.VERTICAL_SCROLLBAR_NEVER) { @@ -276,6 +275,11 @@ public class OverlayScrollPane extends JLayeredPane { } } + @Override + public boolean isOpaque() { + return false; + } + private void showVerticalScrollBar(final boolean show) { if (show == showVertical) { return; diff --git a/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java b/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java new file mode 100644 index 00000000..b87783fb --- /dev/null +++ b/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java @@ -0,0 +1,42 @@ +/* + * MIT License + * + * Copyright (c) 2019 Jannis Weis + * + * 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. + */ +package com.weis.darklaf.theme; + +public class SolarizedDarkTheme extends Theme { + + @Override + protected String getResourcePath() { + return "solarized_dark/"; + } + + @Override + public String getName() { + return "solarized_dark"; + } + + @Override + public boolean isDark() { + return true; + } +} diff --git a/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java b/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java new file mode 100644 index 00000000..694d77ee --- /dev/null +++ b/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java @@ -0,0 +1,47 @@ +/* + * MIT License + * + * Copyright (c) 2019 Jannis Weis + * + * 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. + */ +package com.weis.darklaf.theme; + +public class SolarizedLightTheme extends Theme { + + @Override + public void beforeInstall() { + throw new UnsupportedThemeException("Currently not finished"); + } + + @Override + protected String getResourcePath() { + return "solarized_light/"; + } + + @Override + public String getName() { + return "solarized_light"; + } + + @Override + public boolean isDark() { + return true; + } +} diff --git a/src/main/java/com/weis/darklaf/theme/UnsupportedThemeException.java b/src/main/java/com/weis/darklaf/theme/UnsupportedThemeException.java new file mode 100644 index 00000000..16bc46bc --- /dev/null +++ b/src/main/java/com/weis/darklaf/theme/UnsupportedThemeException.java @@ -0,0 +1,31 @@ +/* + * MIT License + * + * Copyright (c) 2019 Jannis Weis + * + * 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. + */ +package com.weis.darklaf.theme; + +public class UnsupportedThemeException extends RuntimeException { + + public UnsupportedThemeException(final String message) { + super(message); + } +} diff --git a/src/main/java/com/weis/darklaf/ui/list/DarkListUI.java b/src/main/java/com/weis/darklaf/ui/list/DarkListUI.java index bc1dc1ce..2c78e74a 100644 --- a/src/main/java/com/weis/darklaf/ui/list/DarkListUI.java +++ b/src/main/java/com/weis/darklaf/ui/list/DarkListUI.java @@ -72,7 +72,7 @@ public class DarkListUI extends DarkListUIBridge { colCounter++) { // And then how many rows in this columnn int row = convertLocationToRowInColumn(paintBounds.y, colCounter); - int rowCount = rowsPerColumn; + int rowCount = Math.max(rowsPerColumn, getRowCount(colCounter)); int index = getModelIndex(colCounter, row); Rectangle rowBounds = getCellBounds(list, index, index); diff --git a/src/main/resources/com/weis/darklaf/icons/control/checkBox.svg b/src/main/resources/com/weis/darklaf/icons/control/checkBox.svg index 6b900e80..4d93566f 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/checkBox.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/checkBox.svg @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/checkBoxDisabled.svg b/src/main/resources/com/weis/darklaf/icons/control/checkBoxDisabled.svg index 44c52e3f..f34e7d51 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/checkBoxDisabled.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/checkBoxDisabled.svg @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/checkBoxFocused.svg b/src/main/resources/com/weis/darklaf/icons/control/checkBoxFocused.svg index 569d9cbb..7d2b9add 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/checkBoxFocused.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/checkBoxFocused.svg @@ -14,11 +14,10 @@ - + + d="M5,2 L15,2 C16.1045695,2 17,2.8954305 17,4 L17,14 C17,15.1045695 16.1045695,16 15,16 L5,16 C3.8954305,16 3,15.1045695 3,14 L3,4 C3,2.8954305 3.8954305,2 5,2 Z M5,3 C4.44771525,3 4,3.44771525 4,4 L4,14 C4,14.5522847 4.44771525,15 5,15 L15,15 C15.5522847,15 16,14.5522847 16,14 L16,4 C16,3.44771525 15.5522847,3 15,3 L5,3 Z"/> diff --git a/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelected.svg b/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelected.svg index 1e6d804b..ef447b5f 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelected.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelected.svg @@ -14,7 +14,7 @@ - + - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelectedFocused.svg b/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelectedFocused.svg index 7ea29847..5e95b930 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelectedFocused.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/checkBoxIndeterminateSelectedFocused.svg @@ -18,12 +18,11 @@ - + + d="M5,2 L15,2 C16.1045695,2 17,2.8954305 17,4 L17,14 C17,15.1045695 16.1045695,16 15,16 L5,16 C3.8954305,16 3,15.1045695 3,14 L3,4 C3,2.8954305 3.8954305,2 5,2 Z M5,3 C4.44771525,3 4,3.44771525 4,4 L4,14 C4,14.5522847 4.44771525,15 5,15 L15,15 C15.5522847,15 16,14.5522847 16,14 L16,4 C16,3.44771525 15.5522847,3 15,3 L5,3 Z"/> diff --git a/src/main/resources/com/weis/darklaf/icons/control/checkBoxSelected.svg b/src/main/resources/com/weis/darklaf/icons/control/checkBoxSelected.svg index 7725c83e..0365bb85 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/checkBoxSelected.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/checkBoxSelected.svg @@ -14,7 +14,7 @@ - + - + - + + d="M5,2 L15,2 C16.1045695,2 17,2.8954305 17,4 L17,14 C17,15.1045695 16.1045695,16 15,16 L5,16 C3.8954305,16 3,15.1045695 3,14 L3,4 C3,2.8954305 3.8954305,2 5,2 Z M5,3 C4.44771525,3 4,3.44771525 4,4 L4,14 C4,14.5522847 4.44771525,15 5,15 L15,15 C15.5522847,15 16,14.5522847 16,14 L16,4 C16,3.44771525 15.5522847,3 15,3 L5,3 Z"/> diff --git a/src/main/resources/com/weis/darklaf/icons/control/radio.svg b/src/main/resources/com/weis/darklaf/icons/control/radio.svg index bca152eb..b29bd04c 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/radio.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/radio.svg @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/radioDisabled.svg b/src/main/resources/com/weis/darklaf/icons/control/radioDisabled.svg index 34e2cfa4..1bed86a5 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/radioDisabled.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/radioDisabled.svg @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/radioFocused.svg b/src/main/resources/com/weis/darklaf/icons/control/radioFocused.svg index 3c901d41..0c8d68c3 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/radioFocused.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/radioFocused.svg @@ -14,11 +14,10 @@ - + + d="M9.5,17 C5.35786438,17 2,13.6421356 2,9.5 C2,5.35786438 5.35786438,2 9.5,2 C13.6421356,2 17,5.35786438 17,9.5 C17,13.6421356 13.6421356,17 9.5,17 Z M9.5,16 C13.0898509,16 16,13.0898509 16,9.5 C16,5.91014913 13.0898509,3 9.5,3 C5.91014913,3 3,5.91014913 3,9.5 C3,13.0898509 5.91014913,16 9.5,16 Z"/> diff --git a/src/main/resources/com/weis/darklaf/icons/control/radioSelected.svg b/src/main/resources/com/weis/darklaf/icons/control/radioSelected.svg index d4db44d8..56f4662e 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/radioSelected.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/radioSelected.svg @@ -14,7 +14,7 @@ - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/radioSelectedDisabled.svg b/src/main/resources/com/weis/darklaf/icons/control/radioSelectedDisabled.svg index 0e010d12..8ca2ff1d 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/radioSelectedDisabled.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/radioSelectedDisabled.svg @@ -14,7 +14,7 @@ - + diff --git a/src/main/resources/com/weis/darklaf/icons/control/radioSelectedFocused.svg b/src/main/resources/com/weis/darklaf/icons/control/radioSelectedFocused.svg index fa9bdb13..586cf56a 100644 --- a/src/main/resources/com/weis/darklaf/icons/control/radioSelectedFocused.svg +++ b/src/main/resources/com/weis/darklaf/icons/control/radioSelectedFocused.svg @@ -18,12 +18,11 @@ - + + d="M9.5,17 C5.35786438,17 2,13.6421356 2,9.5 C2,5.35786438 5.35786438,2 9.5,2 C13.6421356,2 17,5.35786438 17,9.5 C17,13.6421356 13.6421356,17 9.5,17 Z M9.5,16 C13.0898509,16 16,13.0898509 16,9.5 C16,5.91014913 13.0898509,3 9.5,3 C5.91014913,3 3,5.91014913 3,9.5 C3,13.0898509 5.91014913,16 9.5,16 Z"/> diff --git a/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties b/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties index 490f56c3..af76b4ae 100644 --- a/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties +++ b/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties @@ -121,7 +121,7 @@ ####Misc#### %shadow = 808080 -%glowFocus = 97C3F3 +%glowFocus = 3d94f2 %glowFocusLine = 7B9FC7 %glowError = EBBCBC diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties new file mode 100644 index 00000000..643fe1b7 --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties @@ -0,0 +1,141 @@ +#MIT License +# +#Copyright (c) 2019 Jannis Weis +# +#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. +# suppress inspection "UnusedProperty" for whole file +####Background#### +%background = 0E3C4A +%backgroundAlternative = 174351 +%backgroundColorful = 11435A +%backgroundContainer = 0E3C4A + +%backgroundHeader = 194553 +%backgroundToolTip = 254C57 + +%backgroundHover = 0A2C37 +%backgroundSelected = 28515E +%backgroundHoverSecondary = 0C3642 +%backgroundSelectedSecondary = 092D3A +%backgroundHoverColorful = 0D3042 +%backgroundSelectedColorful = 144f6a + +%dropBackground = 08323D +%dropForeground = 999999 + +####Border#### +%border = 284E59 +%borderSecondary = 11333C +%borderTertiary = 5B5D5F +%borderFocus = 1D8AD1 +%gridLine = 093640 + +####Highlight#### +%hoverHighlight = 264F5B +%clickHighlight = 39626F + +%hoverHighlightColorful = 144F6A +%clickHighlightColorful = 175C7B + +%hoverHighlightDefault = 115D94 +%clickHighlightDefault = 1368A5 + +%hoverHighlightSecondary = 1C3A45 +%clickHighlightSecondary = 224653 + +%highlightFill = 00243C +%highlightFillFocus = 356AB0 +%highlightFillFocusSecondary = 3985C7 +%highlightFillMono = 577A88 + +####Widgets#### +%widgetBorder = 3C626C +%widgetBorderInactive = 42646D +%widgetBorderDefault = 2D6D90 +%widgetFill = 264F5B +%widgetFillSelected = 1B4854 +%widgetFillInactive = 0E3C4A +%widgetFillDefault = 0F5282 + +####Controls#### +%controlBorder = 42646D +%controlBorderDisabled = 3C626C +%controlBorderSelected = 42646D +%controlBorderFocus = 296996 +%controlBorderFocusSelected = 296996 +%controlBorderSecondary = 102F37 +%controlFill = ACBCC0 +%controlFillFocus = ACBCC0 +%controlFillSecondary = 8EA1A8 +%controlTrack = 628A9F +%controlFillDisabled = 60767D +%controlFillHighlight = 3985C7 +%controlFillHighlightDisabled = 00243C +%controlBackground = 2F535F +%controlFadeStart = 476971 +%controlFadeEnd = 67848C +%controlErrorFadeStart = DE4647 +%controlErrorFadeEnd = EFA0A0 +%controlPassedFadeStart = 008A4B +%controlPassedFadeEnd = 4FC392 + +####Text#### +%caret = A7B6BA +%textForeground = A7B6BA +%textForegroundDefault = A7B6BA +%textForegroundHighlight = EEE8D5 +%textForegroundInactive = 839496 +%textForegroundSecondary = 839496 +%acceleratorForeground = 527FBF + +%textSelectionForeground = ACBCC0 +%textSelectionForegroundInactive = A7B6BA +%textSelectionBackground = 356AB0 +#currentLineBackground +%textSelectionBackgroundSecondary = 08323D +%textBackground = 1B4854 +%textBackgroundInactive = 0E3C4A +%textBackgroundSecondary = 002B36 +#Editor number pane +%textBackgroundSecondaryInactive = 073642 + +%hyperlink = 589df6 + +####Misc#### +%shadow = 000000 +%glowFocus = 3c84c7 +%glowFocusLine = 296996 + +%glowError = 53515A +%glowErrorLine = 564755 + +%glowFocusError = 743D44 +%glowFocusErrorLine = 564755 + +%glowWarning = 9A7926 +%glowWarningLine = 93A16A + +#Arc +%arc = 5 +%arcFocus = 5 +%arcSecondary = 3 +%arcSecondaryFocus = 3 + +%borderThickness = 3 +%shadowHeight = 3 \ No newline at end of file diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css new file mode 100644 index 00000000..772fbaa0 --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css @@ -0,0 +1,337 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * 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 + * + * http://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. + */ +body { + font-size: 14pt; + font-family: Serif, serif; + font-weight: normal; + margin-left: 0; + margin-right: 0; + color: #bbbbbb; +} + +p { + margin-top: 15px; +} + +h1 { + font-size: x-large; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h2 { + font-size: large; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h3 { + font-size: medium; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h4 { + font-size: small; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h5 { + font-size: x-small; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h6 { + font-size: xx-small; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +li p { + margin-top: 0; + margin-bottom: 0; +} + +td p { + margin-top: 0; +} + +menu li p { + margin-top: 0; + margin-bottom: 0; +} + +menu li { + margin: 0; +} + +menu { + margin-left-ltr: 40px; + margin-right-rtl: 40px; + margin-top: 10px; + margin-bottom: 10px; +} + +dir li p { + margin-top: 0; + margin-bottom: 0; +} + +dir li { + margin: 0; +} + +dir { + margin-left-ltr: 40px; + margin-right-rtl: 40px; + margin-top: 10px; + margin-bottom: 10px; +} + +dd { + margin-left-ltr: 40px; + margin-right-rtl: 40px; + margin-top: 0; + margin-bottom: 0; +} + +dd p { + margin: 0; +} + +dt { + margin-top: 0; + margin-bottom: 0; +} + +dl { + margin-left: 0; + margin-top: 10px; + margin-bottom: 10px; +} + +ol li { + margin: 0; +} + +ol { + margin-top: 10px; + margin-bottom: 10px; + margin-left-ltr: 50px; + margin-right-rtl: 50px; + list-style-type: decimal; +} + +ol li p { + margin-top: 0; + margin-bottom: 0; +} + +ul li { + margin: 0; +} + +ul { + margin-top: 10px; + margin-bottom: 10px; + margin-left-ltr: 50px; + margin-right-rtl: 50px; + list-style-type: disc; + -bullet-gap: 10px; +} + +ul li ul li { + margin: 0; +} + +ul li ul { + list-style-type: circle; + margin-left-ltr: 25px; + margin-right-rtl: 25px; +} + +ul li ul li ul li { + margin: 0; +} + +ul li ul li ul { + list-style-type: square; + margin-left-ltr: 25px; + margin-right-rtl: 25px; +} + +ul li menu { + list-style-type: circle; + margin-left-ltr: 25px; + margin-right-rtl: 25px; +} + +ul li p { + margin-top: 0; + margin-bottom: 0; +} + +a { + color: #589df6; + text-decoration: underline; +} + +address { + color: #589df6; + font-style: italic; +} + +big { + font-size: x-large; +} + +small { + font-size: x-small; +} + +samp { + font-size: small; + font-family: Monospaced, monospace; +} + +cite { + font-style: italic; +} + +code { + font-size: small; + font-family: Monospaced, monospace; +} + +dfn { + font-style: italic; +} + +em { + font-style: italic; +} + +i { + font-style: italic; +} + +b { + font-weight: bold; +} + +kbd { + font-size: small; + font-family: Monospaced, monospace; +} + +s { + text-decoration: line-through; +} + +strike { + text-decoration: line-through; +} + +strong { + font-weight: bold; +} + +sub { + vertical-align: sub; +} + +sup { + vertical-align: sub; +} + +tt { + font-family: Monospaced, monospace; +} + +u { + text-decoration: underline; +} + +var { + font-weight: bold; + font-style: italic; +} + +table { + border-color: Gray; + border-style: outset; +} + +tr { + text-align: left; +} + +td { + border-color: Gray; + border-style: inset; + padding: 3px; +} + +th { + text-align: center; + font-weight: bold; + border-color: Gray; + border-style: inset; + padding: 3px; +} + +blockquote { + margin: 5px 35px; +} + +center { + text-align: center; +} + +pre { + margin-top: 5px; + margin-bottom: 5px; + font-family: Monospaced, monospace; +} + +pre p { + margin-top: 0; +} + +caption { + caption-side: top; + text-align: center; +} + +table { + border: none; +} + +td { + border: none; +} + +nobr { + white-space: nowrap; +} \ No newline at end of file diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties new file mode 100644 index 00000000..64668202 --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties @@ -0,0 +1,142 @@ +#MIT License +# +#Copyright (c) 2019 Jannis Weis +# +#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. +# suppress inspection "UnusedProperty" for whole file +####Background#### +%background = 3c3f41 +%backgroundAlternative = 414547 +%backgroundColorful = 3B4754 +%backgroundContainer = 3c3f41 + +%backgroundHeader = 45484a +%backgroundToolTip = 4b4d4d + +%backgroundHover = 27292a +%backgroundSelected = 4e5254 +%backgroundHoverSecondary = 353739 +%backgroundSelectedSecondary = 2d2f30 +%backgroundHoverColorful = 262D36 +%backgroundSelectedColorful = 313A45 + +%dropBackground = 4b4b4b +%dropForeground = 999999 + +####Border#### +%border = 555555 +%borderSecondary = 333638 +%borderTertiary = 5b5d5f +%borderFocus = 79c0ff +%gridLine = 4f5152 + +####Highlight#### +%hoverHighlight = 4c5052 +%clickHighlight = 5c6164 + +%hoverHighlightColorful = 2F3A45 +%clickHighlightColorful = 2B353F + +%hoverHighlightDefault = 406086 +%clickHighlightDefault = 4a688c + +%hoverHighlightSecondary = 333537 +%clickHighlightSecondary = 2a2b2d + +%highlightFill = 0d293e +%highlightFillFocus = 4b6eaf +%highlightFillFocusSecondary = 4A88C7 +%highlightFillMono = 747a80 + +####Widgets#### +%widgetBorder = 6b6b6b +%widgetBorderInactive = 535353 +%widgetBorderDefault = 4c708c +%widgetFill = 43494a +%widgetFillSelected = 43494a +%widgetFillInactive = 3c3f41 +%widgetFillDefault = 365880 + +####Controls#### +%controlBorder = 6b6b6b +%controlBorderDisabled = 545556 +%controlBorderSelected = 6B6B6B +%controlBorderFocus = 466D94 +%controlBorderFocusSelected = 466D94 +%controlBorderSecondary = 424242 +%controlFill = A0A0A0 +%controlFillFocus = A0A0A0 +%controlFillSecondary = A0A0A0 +%controlTrack = 636869 +%controlFillDisabled = 606060 +%controlFillHighlight = 5394ec +%controlFillHighlightDisabled = 475b81 +%controlBackground = 555555 +%controlFadeStart = 696969 +%controlFadeEnd = 838383 +%controlErrorFadeStart = e74848 +%controlErrorFadeEnd = f4a2a0 +%controlPassedFadeStart = 008f50 +%controlPassedFadeEnd = 5dc48f + +####Text#### +%caret = bbbbbb +%textForeground = bbbbbb +%textForegroundDefault = bbbbbb +%textForegroundHighlight = DDDDDD +%textForegroundInactive = 777777 +%textForegroundSecondary = 919191 +%acceleratorForeground = eeeeee + +%textSelectionForeground = bbbbbb +%textSelectionForegroundInactive = bbbbbb +%textSelectionBackground = 214283 +#currentLineBackground +%textSelectionBackgroundSecondary = 323232 +%textBackground = 45494a +%textBackgroundInactive = 3c3f41 +%textBackgroundSecondary = 2B2B2B +#Editor number pane +%textBackgroundSecondaryInactive = 313335 + +%hyperlink = 589df6 + +####Misc#### +#Todo Line Colors +%shadow = 000000 +%glowFocus = 3e84c9 +%glowFocusLine = 466D94 + +%glowError = cf6767 +%glowErrorLine = 73454B + +%glowFocusError = c2413c +%glowFocusErrorLine = 73454B + +%glowWarning = ac7920 +%glowWarningLine = 6e5324 + +#Arc +%arc = 5 +%arcFocus = 5 +%arcSecondary = 3 +%arcSecondaryFocus = 3 + +%borderThickness = 3 +%shadowHeight = 3 \ No newline at end of file diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css new file mode 100644 index 00000000..22d3ca82 --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css @@ -0,0 +1,345 @@ +/* + * MIT License + * + * Copyright (c) 2019 Jannis Weis + * + * 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. + */ +body { + font-size: 14pt; + font-family: Serif, serif; + font-weight: normal; + margin-left: 0; + margin-right: 0; + color: #000000; +} + +p { + margin-top: 15px; +} + +h1 { + font-size: x-large; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h2 { + font-size: large; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h3 { + font-size: medium; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h4 { + font-size: small; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h5 { + font-size: x-small; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +h6 { + font-size: xx-small; + font-weight: bold; + margin-top: 10px; + margin-bottom: 10px; +} + +li p { + margin-top: 0; + margin-bottom: 0; +} + +td p { + margin-top: 0; +} + +menu li p { + margin-top: 0; + margin-bottom: 0; +} + +menu li { + margin: 0; +} + +menu { + margin-left-ltr: 40px; + margin-right-rtl: 40px; + margin-top: 10px; + margin-bottom: 10px; +} + +dir li p { + margin-top: 0; + margin-bottom: 0; +} + +dir li { + margin: 0; +} + +dir { + margin-left-ltr: 40px; + margin-right-rtl: 40px; + margin-top: 10px; + margin-bottom: 10px; +} + +dd { + margin-left-ltr: 40px; + margin-right-rtl: 40px; + margin-top: 0; + margin-bottom: 0; +} + +dd p { + margin: 0; +} + +dt { + margin-top: 0; + margin-bottom: 0; +} + +dl { + margin-left: 0; + margin-top: 10px; + margin-bottom: 10px; +} + +ol li { + margin: 0; +} + +ol { + margin-top: 10px; + margin-bottom: 10px; + margin-left-ltr: 50px; + margin-right-rtl: 50px; + list-style-type: decimal; +} + +ol li p { + margin-top: 0; + margin-bottom: 0; +} + +ul li { + margin: 0; +} + +ul { + margin-top: 10px; + margin-bottom: 10px; + margin-left-ltr: 50px; + margin-right-rtl: 50px; + list-style-type: disc; + -bullet-gap: 10px; +} + +ul li ul li { + margin: 0; +} + +ul li ul { + list-style-type: circle; + margin-left-ltr: 25px; + margin-right-rtl: 25px; +} + +ul li ul li ul li { + margin: 0; +} + +ul li ul li ul { + list-style-type: square; + margin-left-ltr: 25px; + margin-right-rtl: 25px; +} + +ul li menu { + list-style-type: circle; + margin-left-ltr: 25px; + margin-right-rtl: 25px; +} + +ul li p { + margin-top: 0; + margin-bottom: 0; +} + +a { + color: #589df6; + text-decoration: underline; +} + +address { + color: #589df6; + font-style: italic; +} + +big { + font-size: x-large; +} + +small { + font-size: x-small; +} + +samp { + font-size: small; + font-family: Monospaced, monospace; +} + +cite { + font-style: italic; +} + +code { + font-size: small; + font-family: Monospaced, monospace; +} + +dfn { + font-style: italic; +} + +em { + font-style: italic; +} + +i { + font-style: italic; +} + +b { + font-weight: bold; +} + +kbd { + font-size: small; + font-family: Monospaced, monospace; +} + +s { + text-decoration: line-through; +} + +strike { + text-decoration: line-through; +} + +strong { + font-weight: bold; +} + +sub { + vertical-align: sub; +} + +sup { + vertical-align: sub; +} + +tt { + font-family: Monospaced, monospace; +} + +u { + text-decoration: underline; +} + +var { + font-weight: bold; + font-style: italic; +} + +table { + border-color: Gray; + border-style: outset; +} + +tr { + text-align: left; +} + +td { + border-color: Gray; + border-style: inset; + padding: 3px; +} + +th { + text-align: center; + font-weight: bold; + border-color: Gray; + border-style: inset; + padding: 3px; +} + +blockquote { + margin: 5px 35px; +} + +center { + text-align: center; +} + +pre { + margin-top: 5px; + margin-bottom: 5px; + font-family: Monospaced, monospace; +} + +pre p { + margin-top: 0; +} + +caption { + caption-side: top; + text-align: center; +} + +table { + border: none; +} + +td { + border: none; +} + +nobr { + white-space: nowrap; +} \ No newline at end of file diff --git a/src/main/resources/library/x64/jniplatform.dll b/src/main/resources/library/x64/jniplatform.dll index fd49bebf..005e4707 100644 Binary files a/src/main/resources/library/x64/jniplatform.dll and b/src/main/resources/library/x64/jniplatform.dll differ diff --git a/src/main/resources/library/x86/jniplatform.dll b/src/main/resources/library/x86/jniplatform.dll index 1696c284..80946325 100644 Binary files a/src/main/resources/library/x86/jniplatform.dll and b/src/main/resources/library/x86/jniplatform.dll differ