angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 06:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into branch 'custom-window-decorations'

Browse Source 
# Conflicts:
#	flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java
This commit is contained in:
Karl Tauber
2020-06-02 16:13:35 +02:00
parent 16d2e27d05 6a8bf2acc5
commit 8500781cd5
23 changed files with 205 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json
View File

@@ -46,21 +46,21 @@
"license": "MIT",
"licenseFile": "Gradianto.LICENSE.txt",
"sourceCodeUrl": "https://github.com/thvardhan/Gradianto",
"sourceCodePath": "blob/master/resources/Gradianto_dark_fuchsia.theme.json"
"sourceCodePath": "blob/master/src/main/resources/Gradianto_dark_fuchsia.theme.json"
},
"Gradianto_deep_ocean.theme.json": {
"name": "Gradianto Deep Ocean",
"license": "MIT",
"licenseFile": "Gradianto.LICENSE.txt",
"sourceCodeUrl": "https://github.com/thvardhan/Gradianto",
"sourceCodePath": "blob/master/resources/Gradianto_deep_ocean.theme.json"
"sourceCodePath": "blob/master/src/main/resources/Gradianto_deep_ocean.theme.json"
},
"Gradianto_midnight_blue.theme.json": {
"name": "Gradianto Midnight Blue",
"license": "MIT",
"licenseFile": "Gradianto.LICENSE.txt",
"sourceCodeUrl": "https://github.com/thvardhan/Gradianto",
"sourceCodePath": "blob/master/resources/Gradianto_midnight_blue.theme.json"
"sourceCodePath": "blob/master/src/main/resources/Gradianto_midnight_blue.theme.json"
},
"Gray.theme.json": {
"name": "Gray",