Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ public Node generateImage(String url) {
}
};
markdownView.setPadding(new Insets(0, 10, 0, 10));
markdownView.getStyleClass().add("markdown-view");
markdownView.mdStringProperty().bind(mdTextArea.textProperty());

final var scrollPane = new ScrollPane(markdownView);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

public class MarkdownView extends VBox {

private static final String USER_AGENT_STYLESHEET =
MarkdownView.class.getResource("mdfx.css").toExternalForm();
private static final String USER_AGENT_STYLESHEET = Objects.requireNonNull(MarkdownView.class.getResource("mdfx.css")).toExternalForm();

private List<ImageExtension> extensions = new ArrayList<>();
private final List<ImageExtension> extensions;

private final SimpleStringProperty mdString = new SimpleStringProperty("");

Expand All @@ -32,6 +32,8 @@ public MarkdownView(String mdString, List<ImageExtension> extensions) {
throw new IllegalArgumentException("Only one extension can have a scheme of null");
}

getStyleClass().add("markdown-view");

this.extensions = extensions;
this.mdString.set(mdString);
this.mdString.addListener((p,o,n) -> updateContent());
Expand Down
18 changes: 6 additions & 12 deletions jpro-mdfx/src/main/resources/one/jpro/platform/mdfx/mdfx.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
}

.markdown-text {
-fx-font-family: ARIAL;
-fx-font-size: 16;
-fx-fill: -mdfx-font-color;
}

Expand Down Expand Up @@ -63,24 +61,23 @@
}

.markdown-heading-1 .markdown-text {
-fx-font-size: 50px;
-fx-font-size: 2em;
}

.markdown-heading-2 .markdown-text {
-fx-font-size: 38px;
-fx-font-size: 1.75em;
}


.markdown-heading-3 .markdown-text {
-fx-font-size: 28px;
-fx-font-size: 1.5em;
}

.markdown-heading-4 .markdown-text {
-fx-font-size: 24px;
-fx-font-size: 1.25em;
}

.markdown-heading-5 .markdown-text {
-fx-font-size: 20px;
-fx-font-size: 1em;
}

.markdown-link {
Expand All @@ -97,7 +94,6 @@
}

.markdown-listitem-dot {
-fx-font-size: 16px;
-fx-text-fill: -mdfx-font-color;
}

Expand All @@ -113,7 +109,6 @@
.markdown-code,
.markdown-codeblock {
-fx-wrap-text: true;
-fx-font-size: 16;
}

.markdown-codeblock-box,
Expand Down Expand Up @@ -166,7 +161,7 @@

.markdown-hbox1 {
-fx-spacing: 0px;
-fx-padding: 8px;
-fx-padding: 2px;
}

/* ---------- BLOCK QUOTE ---------- */
Expand All @@ -186,7 +181,6 @@
/* ---------- CODE BLOCK ---------- */

.markdown-code-block {
-fx-padding: 10px 0px;
}

.markdown-code-block .code-text-flow {
Expand Down
Loading