CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-05-12 08:12:56 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
crschnick 2024-04-22 17:38:33 +00:00
parent 363f79f8ad
commit 188e41e1ba
11 changed files with 46 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java
View file

@ -178,12 +178,12 @@ public class StoreSectionComp extends Comp<CompStructure<VBox>> {
newList.removeIf(s -> Arrays.stream(DataStoreColor.values())
.anyMatch(
dataStoreColor -> dataStoreColor.getId().equals(s)));
newList.remove("none");
newList.remove("gray");
newList.add("color-box");
if (val != null) {
newList.add(val.getId());
} else {
newList.add("none");
newList.add("gray");
}
struc.get().getStyleClass().setAll(newList);
});

4
app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java
View file

@ -176,12 +176,12 @@ public class StoreSectionMiniComp extends Comp<CompStructure<VBox>> {
struc.get().getStyleClass().removeIf(s -> Arrays.stream(DataStoreColor.values())
.anyMatch(dataStoreColor ->
dataStoreColor.getId().equals(s)));
struc.get().getStyleClass().remove("none");
struc.get().getStyleClass().remove("gray");
struc.get().getStyleClass().add("color-box");
if (val != null) {
struc.get().getStyleClass().add(val.getId());
} else {
struc.get().getStyleClass().add("none");
struc.get().getStyleClass().add("gray");
}
});
}

23
app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java
View file

@ -14,17 +14,22 @@ public class StoreSidebarComp extends SimpleComp {
@Override
protected Region createSimple() {
var sideBar = new VerticalComp(List.of(
new StoreEntryListStatusComp().styleClass("color-box").styleClass("gray"),
new StoreCategoryListComp(StoreViewState.get().getAllConnectionsCategory())
.styleClass("color-box")
.styleClass("gray"),
new StoreCategoryListComp(StoreViewState.get().getAllScriptsCategory())
.styleClass("color-box")
.styleClass("gray"),
Comp.of(() -> new Region())
.styleClass("bar")
new StoreEntryListStatusComp()
.styleClass("color-box")
.styleClass("gray")
.styleClass("bar"),
new StoreCategoryListComp(StoreViewState.get().getAllConnectionsCategory())
.styleClass("color-box")
.styleClass("gray")
.styleClass("bar"),
new StoreCategoryListComp(StoreViewState.get().getAllScriptsCategory())
.styleClass("color-box")
.styleClass("gray")
.styleClass("bar"),
Comp.of(() -> new Region())
.styleClass("color-box")
.styleClass("gray")
.styleClass("bar")
.styleClass("filler-bar")
.vgrow()));
sideBar.apply(struc -> struc.get().setFillWidth(true));

4
app/src/main/resources/io/xpipe/app/resources/style/browser.css
View file

@ -47,6 +47,7 @@
.browser .overview {
-fx-spacing: 1.5em;
-fx-padding: 1.5em;
-fx-background-color: -color-bg-default;
}
.selected-file-list {
@ -133,13 +134,14 @@
}
.browser .overview-file-list {
-fx-border-width: 1px;
-fx-border-width: 0;
}
.browser .overview-file-list .button {
-fx-border-width: 0;
-fx-background-radius: 0;
-fx-background-insets: 0;
-fx-effect: none;
}
.browser .tab-pane {

8
app/src/main/resources/io/xpipe/app/resources/style/color-box.css
View file

@ -30,12 +30,12 @@
}
.root:pretty:light .color-box.gray {
-fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -5%) 40%, derive(-color-bg-default, -3%) 50%, derive(-color-bg-default, -5%) 100%);
-fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -2%) 40%, derive(-color-bg-default, 0%) 50%, derive(-color-bg-default, -3%) 100%);
-fx-border-color: derive(-color-border-default, -10%);
}
.root:performance:light .color-box.gray {
-fx-background-color: derive(-color-bg-default, -5%);
-fx-background-color: derive(-color-bg-default, -2%);
-fx-border-color: derive(-color-border-default, -10%);
}
@ -45,12 +45,12 @@
.root:pretty:light .color-box.blue {
-fx-background-color: linear-gradient(from 100% 0% to 0% 100%, rgb(130, 130, 250, 0.2) 40%, rgb(57, 57, 200, 0.2) 50%, rgb(137, 137, 250, 0.2) 100%);
-fx-background-color: linear-gradient(from 100% 0% to 0% 100%, rgb(130, 130, 250, 0.15) 40%, rgb(57, 57, 200, 0.15) 50%, rgb(137, 137, 250, 0.15) 100%);
-fx-border-color: rgba(80, 100, 150, 0.3);
}
.root:performance:light .color-box.blue {
-fx-background-color: rgb(130, 130, 250, 0.2);
-fx-background-color: rgb(130, 130, 250, 0.15);
-fx-border-color: rgba(80, 100, 150, 0.3);
}

37
app/src/main/resources/io/xpipe/app/resources/style/header-bars.css
View file

@ -1,12 +1,10 @@
.bar {
-fx-padding: 0.8em 1.0em 0.8em 1.0em;
-fx-background-color: -color-bg-subtle;
-fx-border-color: -color-border-default;
}
.root:pretty .bar {
-fx-effect: dropshadow(three-pass-box, -color-shadow-default, 3px, 0.5, 0, 1);
-fx-effect: dropshadow(three-pass-box, -color-shadow-default, 3, 0.5, 1, 1);
}
.store-header-bar {
@ -88,8 +86,6 @@
.store-category-bar {
-fx-padding: 0.8em 0.5em 0.8em 0.5em;
-fx-background-color: -color-bg-subtle;
-fx-border-color: -color-border-default;
}
.store-sort-bar {
@ -110,47 +106,30 @@
-fx-background-color: transparent;
}
.bar .button-comp {
.store-header-bar .button-comp {
-fx-padding: 0.2em 0em 0.2em 0em;
}
.collections-bar {
-fx-background-radius: 0 0 4px 0;
-fx-border-radius: 0 0 4px 0;
-fx-border-width: 0 4px 4px 0;
}
.entry-bar {
-fx-background-radius: 0 0 4px 4px;
-fx-border-radius: 0 0 4px 4px;
-fx-border-width: 0 4px 4px 4px;
-fx-background-color: -color-neutral-muted;
}
.entry-bar .horizontal-comp {
-fx-spacing: 5px;
}
.bar .icon-button-comp {
.store-header-bar .icon-button-comp {
-fx-text-fill: -color-fg-default;
}
.bar .name {
.store-header-bar .name {
-fx-font-weight: BOLD;
-fx-text-fill: -color-fg-default;
}
.bar .count-comp {
.store-header-bar .count-comp {
-fx-font-weight: BOLD;
-fx-padding: 0.0em 0em 0.0em 0.4em;
-fx-text-fill: -color-fg-muted;
}
.bar .filter-bar .text-field {
.store-header-bar .filter-bar .text-field {
-fx-text-fill: -color-fg-default;
}
.bar .filter-bar {
.store-header-bar .filter-bar {
-fx-background-radius: 3px;
-fx-background-color: -color-bg-default;
-fx-border-color: -color-fg-default;
@ -159,7 +138,7 @@
}
.bar .filter-bar .filter-background {
.store-header-bar .filter-bar .filter-background {
-fx-opacity: 0.7;
}

2
app/src/main/resources/io/xpipe/app/resources/style/prefs.css
View file

@ -27,7 +27,7 @@
}
.prefs {
-fx-background-color: transparent;
-fx-background-color: -color-bg-default;
}
.prefs .sidebar {

14
app/src/main/resources/io/xpipe/app/resources/style/third-party.css
View file

@ -1,11 +1,11 @@
.third-party-dependency-list-comp {
}
.third-party-dependency-list-comp .titled-pane {
.third-party-dependency-list-comp .titled-pane .content * {
-fx-background-color: transparent;
}
.titled-pane .content {
-fx-padding: 0em;
.titled-pane {
-fx-background-radius: 5;
}
.titled-pane .content {
-fx-padding: 4;
}

2
core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java
View file

@ -4,6 +4,8 @@ import java.util.List;
public interface ShellLaunchCommand {
String inlineCdCommand(String cd);
List<String> localCommand();
default String loginCommand() {

2
dist/licenses/graalvm.properties vendored
View file

@ -1,4 +1,4 @@
name=GraalVM Community
version=21.0.2
version=21.0.1
license=GPL2 with the Classpath Exception
link=https://www.graalvm.org/

4
setup.sh
View file

@ -10,5 +10,5 @@ if [ $? -ne 0 ]; then
. "$HOME/.sdkman/bin/sdkman-init.sh"
fi;
sdk install java 21.0.2-graalce
sdk default java 21.0.2-graalce
sdk install java 21.0.1-graalce
sdk default java 21.0.1-graalce