Skip to content

Commit 7141016

Browse files
authored
Mdfx css fixes (#87)
* Update `mdfx.css` to enhance styling consistency and align with JavaFX standard variables. * Add padding to `MarkdownView` and update imports in `MarkdownViewSample.java`. * Remove `markdown-code-block.css` and associated references in `MarkdownCodeBlock`
1 parent c90081b commit 7141016

4 files changed

Lines changed: 77 additions & 72 deletions

File tree

jpro-mdfx/example/src/main/java/one/jpro/platform/mdfx/example/MarkdownViewSample.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import javafx.application.Application;
44
import javafx.collections.FXCollections;
5+
import javafx.geometry.Insets;
56
import javafx.scene.Cursor;
67
import javafx.scene.Node;
78
import javafx.scene.Parent;
@@ -15,6 +16,7 @@
1516
import one.jpro.platform.mdfx.MarkdownView;
1617
import one.jpro.platform.mdfx.extensions.YoutubeExtension;
1718
import org.apache.commons.io.IOUtils;
19+
import org.scenicview.ScenicView;
1820
import org.slf4j.Logger;
1921
import org.slf4j.LoggerFactory;
2022

@@ -159,6 +161,7 @@ public Node generateImage(String url) {
159161
}
160162
}
161163
};
164+
markdownView.setPadding(new Insets(0, 10, 0, 10));
162165
markdownView.getStyleClass().add("markdown-view");
163166
markdownView.mdStringProperty().bind(mdTextArea.textProperty());
164167

jpro-mdfx/src/main/java/one/jpro/platform/mdfx/MarkdownCodeBlock.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
public class MarkdownCodeBlock extends Control {
1717

1818
private static final String DEFAULT_STYLE_CLASS = "markdown-code-block";
19-
private static final String USER_AGENT_STYLESHEET =
20-
MarkdownCodeBlock.class.getResource("markdown-code-block.css").toExternalForm();
2119

2220
private final StringProperty code = new SimpleStringProperty(this, "code", "");
2321
private final StringProperty language = new SimpleStringProperty(this, "language", "");
@@ -104,11 +102,6 @@ protected Skin<?> createDefaultSkin() {
104102
return new MarkdownCodeBlockSkin(this);
105103
}
106104

107-
@Override
108-
public String getUserAgentStylesheet() {
109-
return USER_AGENT_STYLESHEET;
110-
}
111-
112105
@Override
113106
public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
114107
return STYLEABLES;

jpro-mdfx/src/main/resources/one/jpro/platform/mdfx/markdown-code-block.css

Lines changed: 0 additions & 23 deletions
This file was deleted.

jpro-mdfx/src/main/resources/one/jpro/platform/mdfx/mdfx.css

Lines changed: 74 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
* {
2-
-mdfx-font-color: black;
3-
-mdfx-link-color: blue;
4-
-mdfx-border-color-1: #888;
1+
.markdown-view {
2+
-mdfx-font-color: -fx-text-base-color;
3+
-mdfx-link-color: -fx-accent;
4+
-mdfx-border-color-1: -fx-box-border;
55

6-
-mdfx-bg-color-1: #ccc;
7-
-mdfx-bg-color-2: #ddd;
8-
-mdfx-bg-color-3: #eee;
6+
-mdfx-bg-color-1: -fx-control-inner-background;
7+
-mdfx-bg-color-2: -fx-control-inner-background-alt;
8+
-mdfx-bg-color-3: -fx-color;
99

10-
-mdfx-bq-color-border: #4488cc;
11-
-mdfx-bq-color-background: #0000ff0c;
10+
-mdfx-bq-color-border: derive(-fx-accent, -50%);
11+
-mdfx-bq-color-background: -fx-accent;
12+
-mdfx-bq-text-fill: -fx-selection-bar-text;
13+
14+
-mdfx-code-block-border: -fx-box-border;
15+
-mdfx-code-block-background: -fx-control-inner-background;
1216
}
1317

1418
.markdown-text {
@@ -39,44 +43,44 @@
3943
}
4044

4145
.markdown-heading-1 {
42-
-fx-padding: 14;
46+
-fx-padding: 14px 0px;
4347
}
4448

4549
.markdown-heading-2 {
46-
-fx-padding: 10;
50+
-fx-padding: 10px 0px;
4751
}
4852

4953
.markdown-heading-3 {
50-
-fx-padding: 8;
54+
-fx-padding: 8px 0px;
5155
}
5256

5357
.markdown-heading-4 {
54-
-fx-padding: 6;
58+
-fx-padding: 6px 0px;
5559
}
5660

5761
.markdown-heading-5 {
58-
-fx-padding: 4;
62+
-fx-padding: 4px 0px;
5963
}
6064

6165
.markdown-heading-1 .markdown-text {
62-
-fx-font-size: 50;
66+
-fx-font-size: 50px;
6367
}
6468

6569
.markdown-heading-2 .markdown-text {
66-
-fx-font-size: 38;
70+
-fx-font-size: 38px;
6771
}
6872

6973

7074
.markdown-heading-3 .markdown-text {
71-
-fx-font-size: 28;
75+
-fx-font-size: 28px;
7276
}
7377

7478
.markdown-heading-4 .markdown-text {
75-
-fx-font-size: 24;
79+
-fx-font-size: 24px;
7680
}
7781

7882
.markdown-heading-5 .markdown-text {
79-
-fx-font-size: 20;
83+
-fx-font-size: 20px;
8084
}
8185

8286
.markdown-link {
@@ -89,17 +93,17 @@
8993
}
9094

9195
.markdown-paragraph-list {
92-
-fx-spacing: 15;
96+
-fx-spacing: 15px;
9397
}
9498

9599
.markdown-listitem-dot {
96-
-fx-font-size: 16;
100+
-fx-font-size: 16px;
97101
-fx-text-fill: -mdfx-font-color;
98102
}
99103

100104
.markdown-codeblock-box,
101105
.markdown-code {
102-
-fx-padding: 0 8 0 8;
106+
-fx-padding: 0px 8px;
103107
}
104108

105109
.markdown-code {
@@ -114,34 +118,33 @@
114118

115119
.markdown-codeblock-box,
116120
.markdown-code-background {
117-
-fx-padding: 8;
118-
-fx-border-radius: 8;
119-
-fx-border-color: -mdfx-border-color-1;
120-
-fx-border-width: 0.5;
121-
-fx-background-radius: 8;
122-
-fx-background-color: #00000009; /* -mdfx-bg-color-3*/
121+
-fx-padding: 8px;
122+
-fx-border-radius: 8px;
123+
-fx-border-color: -mdfx-code-block-border;
124+
-fx-border-width: 0.5px;
125+
-fx-background-radius: 8px;
126+
-fx-background-color: -mdfx-code-block-background;
123127
}
124128

125129
.markdown-code-background {
126-
-fx-border-width: 0;
127-
-fx-background-color: #0000AA10; /* -mdfx-bg-color-3*/
130+
-fx-border-width: 0px;
128131
}
129132

130133
.markdown-code-anti-padding {
131134
/*-fx-padding: -8;*/
132135
-fx-border-color: red;
133-
-fx-border-width: 1;
136+
-fx-border-width: 1px;
134137
}
135138

136139
.markdown-table-table {
137-
-fx-vgap: -1;
138-
-fx-hgap: -1;
140+
-fx-vgap: -1px;
141+
-fx-hgap: -1px;
139142
}
140143

141144
.markdown-table-cell {
142-
-fx-padding: 8;
145+
-fx-padding: 8px;
143146
-fx-border-color: -mdfx-border-color-1;
144-
-fx-border-width: 0;
147+
-fx-border-width: 0px;
145148
}
146149

147150
.markdown-table-even {
@@ -162,15 +165,44 @@
162165
}
163166

164167
.markdown-hbox1 {
165-
-fx-spacing: 0;
166-
-fx-padding: 8;
168+
-fx-spacing: 0px;
169+
-fx-padding: 8px;
167170
}
168171

172+
/* ---------- BLOCK QUOTE ---------- */
173+
169174
.markdown-normal-block-quote {
170-
-fx-background-color: -mdfx-bq-color-background;
171-
-fx-background-insets: 10;
175+
-fx-background: -mdfx-bq-color-background;
176+
-fx-background-color: -fx-background;
172177
-fx-border-color: -mdfx-bq-color-border;
173-
-fx-border-width: 0 0 0 3;
174-
-fx-border-insets: 10 10 10 10;
175-
-fx-padding: 10 10 10 10;
178+
-fx-border-width: 0px 0px 0px 3px;
179+
-fx-padding: 10px;
180+
}
181+
182+
.markdown-normal-block-quote .markdown-normal-flow .markdown-text {
183+
-fx-fill: -mdfx-bq-text-fill;
184+
}
185+
186+
/* ---------- CODE BLOCK ---------- */
187+
188+
.markdown-code-block {
189+
-fx-padding: 10px 0px;
190+
}
191+
192+
.markdown-code-block .code-text-flow {
193+
-fx-padding: 12px;
194+
-fx-border-radius: 8px;
195+
-fx-background-radius: 8px;
196+
-fx-border-color: -mdfx-code-block-border;
197+
-fx-border-width: 1px;
198+
-fx-background-color: -mdfx-code-block-background;
199+
-fx-line-spacing: 2px;
176200
}
201+
202+
.markdown-code-block .code-text-flow .text {
203+
-fx-font-family: "monospace";
204+
}
205+
206+
.markdown-code-block .code-plain-text {
207+
-fx-font-family: "monospace";
208+
}

0 commit comments

Comments
 (0)