Skip to content

Commit bd1cdbb

Browse files
JavaSaBrJavaSaBr
committed
updated dialogs and fonts
1 parent c00a36d commit bd1cdbb

30 files changed

Lines changed: 163 additions & 332 deletions

‎resources/ui/css/base.bss‎

248 Bytes
Binary file not shown.

‎resources/ui/css/base.css‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929

3030
-var-dialog-button-height: 32;
3131
-var-dialog-button-width: 150;
32+
33+
-var-default-label-height: 26px;
34+
-var-default-field-height: 26px;
3235
}
3336

3437
/* Make popups transparent */
@@ -46,6 +49,7 @@
4649
-fx-font-family: "Ubuntu Condensed";
4750
-fx-font-size: 14px;
4851
-fx-text-fill: -var-font-color;
52+
-fx-max-height: -var-default-label-height;
4953
}
5054

5155
/*******************************************************************************
@@ -151,6 +155,11 @@
151155
-fx-border-color: transparent;
152156
}
153157

158+
.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-label {
159+
-fx-font-family: "Ubuntu Condensed";
160+
-fx-font-size: 15px;
161+
}
162+
154163
.tab-pane > .tab-header-area > .headers-region > .tab:hover {
155164
-fx-background: -var-tab-hover-background-color;
156165
-fx-border-color: -var-border-color;
@@ -350,6 +359,7 @@
350359
-fx-border-radius: 1px;
351360
-fx-padding: 0px 0px 0px 0px;
352361
-fx-text-fill: -var-font-color;
362+
-fx-min-height: -var-default-field-height;
353363
}
354364

355365
.combo-box-base:hover {
@@ -414,6 +424,8 @@
414424
-fx-text-fill: -var-font-color;
415425
-fx-padding: 0 0 0 4px;
416426
-fx-cell-size: -1;
427+
-fx-font-family: "Ubuntu Condensed";
428+
-fx-font-size: 14px;
417429
}
418430

419431
.combo-box-popup > .list-view {
@@ -1053,6 +1065,9 @@
10531065
-fx-padding: 0px 0px 0px 4px;
10541066
-fx-text-fill: -var-font-color;
10551067
-fx-cursor: text;
1068+
-fx-min-height: -var-default-field-height;
1069+
-fx-font-family: "Ubuntu Condensed";
1070+
-fx-font-size: 14px;
10561071
}
10571072

10581073
.text-field:focused {
@@ -1126,13 +1141,13 @@
11261141
-fx-background-insets: 0;
11271142
-fx-text-fill: -var-font-hover-color;
11281143
}
1144+
11291145
.tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:hover {
11301146
-fx-background-color: -var-tree-cell-hover-color;
11311147
-fx-background-insets: 0;
11321148
-fx-text-fill: -var-font-hover-color;
11331149
}
11341150

1135-
11361151
.tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:focused {
11371152
-fx-background-color: transparent;
11381153
-fx-background-insets: 0;
@@ -1256,16 +1271,17 @@
12561271
-fx-background-radius: 10px;
12571272
-fx-padding: 3px;
12581273
}
1274+
12591275
.slider:vertical .track {
1260-
-fx-background-color:
1261-
-fx-shadow-highlight-color,
1262-
-fx-text-box-border,
1263-
linear-gradient(to right,
1276+
-fx-background-color: -fx-shadow-highlight-color,
1277+
-fx-text-box-border,
1278+
linear-gradient(to right,
12641279
derive(-fx-control-inner-background, -9%),
12651280
-fx-control-inner-background,
12661281
derive(-fx-control-inner-background, -9%)
1267-
);
1282+
);
12681283
}
1284+
12691285
.slider .axis {
12701286
-fx-tick-label-fill: derive(-fx-text-background-color, 30%);
12711287
-fx-tick-length: 5px;
@@ -1357,10 +1373,9 @@
13571373
-fx-padding: 0px;
13581374
}
13591375

1360-
13611376
/* ------- CUSTOM COLOR DIALOG ------- */
13621377

1363-
.custom-color-dialog {
1378+
.custom-color-dialog {
13641379
-fx-background-color: -var-background-color;
13651380
-fx-padding: 10px 15px 10px 15px;
13661381
-fx-spacing: 0px;
@@ -1444,10 +1459,12 @@
14441459
-fx-background: transparent;
14451460
-fx-text-fill: -var-font-focused-color;
14461461
}
1462+
14471463
.custom-color-dialog .controls-pane .toggle-button:selected {
14481464
-fx-background: -fx-focus-color;
14491465
-fx-text-fill: -var-font-focused-color;
14501466
}
1467+
14511468
.custom-color-dialog .controls-pane .toggle-button:selected:focused {
14521469
-fx-background: -fx-focus-color;
14531470
-fx-text-fill: -var-font-focused-color;
@@ -1463,22 +1480,26 @@
14631480
-fx-border-radius: 1px 0px 1px 0px;
14641481
-fx-padding: 4px;
14651482
}
1483+
14661484
.custom-color-dialog .controls-pane .left-pill:hover {
14671485
-fx-background-color: -var-button-hover-background-color;
14681486
-fx-border-color: -var-button-hover-border-color;
14691487
}
1488+
14701489
.custom-color-dialog .controls-pane .left-pill:focused {
14711490
-fx-background-color: -fx-focus-color;
14721491
-fx-background-radius: 2px 0px 0px 2px;
14731492
-fx-background-insets: 0px;
14741493
-fx-border-color: -var-border-color;
14751494
-fx-padding: 4px;
14761495
}
1496+
14771497
.custom-color-dialog .controls-pane .left-pill:selected, .controls-pane .left-pill:selected:focused {
14781498
-fx-background-radius: 2px 0px 0px 2px;
14791499
-fx-border-color: -var-border-color;
14801500
-fx-padding: 4px;
14811501
}
1502+
14821503
.custom-color-dialog .controls-pane .center-pill {
14831504
-fx-background-color: -var-button-background-color;
14841505
-fx-background-radius: 0px;
@@ -1488,22 +1509,26 @@
14881509
-fx-border-width: 1px 0px 1px 0px;
14891510
-fx-padding: 4px;
14901511
}
1512+
14911513
.custom-color-dialog .controls-pane .center-pill:hover {
14921514
-fx-background-color: -var-button-hover-background-color;
14931515
-fx-border-color: -var-button-hover-border-color;
14941516
}
1517+
14951518
.custom-color-dialog .controls-pane .center-pill:focused {
14961519
-fx-background-color: -fx-focus-color;
14971520
-fx-background-radius: 0px;
14981521
-fx-background-insets: 0px;
14991522
-fx-border-color: -var-border-color;
15001523
-fx-padding: 4px;
15011524
}
1525+
15021526
.custom-color-dialog .controls-pane .center-pill:selected, .controls-pane .center-pill:selected:focused {
15031527
-fx-background-insets: 0px;
15041528
-fx-border-color: -var-border-color;
15051529
-fx-padding: 4px;
15061530
}
1531+
15071532
.custom-color-dialog .controls-pane .right-pill {
15081533
-fx-background-color: -var-button-background-color;
15091534
-fx-background-radius: 0px 2px 2px 0px;
@@ -1514,22 +1539,26 @@
15141539
-fx-border-width: 1px 1px 1px 0px;
15151540
-fx-padding: 4px;
15161541
}
1542+
15171543
.custom-color-dialog .controls-pane .right-pill:hover {
15181544
-fx-background-color: -var-button-hover-background-color;
15191545
-fx-border-color: -var-button-hover-border-color;
15201546
}
1547+
15211548
.custom-color-dialog .controls-pane .right-pill:focused {
15221549
-fx-background-color: -fx-focus-color;
15231550
-fx-background-radius: 0px 2px 2px 0px;
15241551
-fx-background-insets: 0;
15251552
-fx-border-color: -var-border-color;
15261553
-fx-padding: 4px;
15271554
}
1555+
15281556
.custom-color-dialog .controls-pane .right-pill:selected, .controls-pane .right-pill:selected:focused {
15291557
-fx-background-insets: 0;
15301558
-fx-border-color: -var-border-color;
15311559
-fx-padding: 4px;
15321560
}
1561+
15331562
.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
15341563
-fx-border-color: -var-border-color;
15351564
-fx-border-width: 1px;

‎resources/ui/css/custom_classes.bss‎

527 Bytes
Binary file not shown.

‎resources/ui/css/custom_classes.css‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,45 @@
113113
-fx-alignment: center;
114114
}
115115

116+
.dialog-button {
117+
-fx-min-height: -var-dialog-button-height;
118+
-fx-pref-height: -fx-min-height;
119+
-fx-max-height: -fx-min-height;
120+
-fx-min-width: -var-dialog-button-width;
121+
-fx-pref-width: -fx-min-width;
122+
-fx-max-width: -fx-min-width;
123+
-fx-font-size: 16px;
124+
-fx-focus-traversable: true;
125+
}
126+
127+
.dialog-label-warning {
128+
-fx-alignment: center;
129+
-fx-text-alignment: center;
130+
-fx-min-height: 28px;
131+
-fx-pref-height: -fx-min-height;
132+
-fx-max-height: -fx-min-height;
133+
-fx-min-width: 800px;
134+
-fx-pref-width: -fx-min-width;
135+
-fx-max-width: -fx-min-width;
136+
-fx-font-size: 15px;
137+
-fx-font-weight: bold;
138+
}
139+
140+
.dialog-dynamic-label {
141+
-fx-alignment: center-right;
142+
-fx-text-alignment: right;
143+
-fx-min-width: 150;
144+
-fx-pref-width: -fx-min-width;
145+
-fx-padding: 0px 6px 0px 0px;
146+
}
147+
148+
.dialog-field {
149+
-fx-pref-height: -fx-min-height;
150+
-fx-max-height: -fx-min-height;
151+
-fx-min-width: 20;
152+
}
153+
154+
116155
/*******************************************************************************
117156
* *
118157
* Audio Editor *
@@ -124,19 +163,15 @@
124163
-fx-min-width: 200px;
125164
-fx-pref-width: -fx-min-width;
126165
-fx-max-width: -fx-min-width;
127-
-fx-min-height: 26px;
128-
-fx-pref-height: -fx-min-height;
129-
-fx-max-height: -fx-min-height;
166+
-fx-font-size: 16px;
130167
-fx-padding: 0px 6px 0px 0px;
131168
}
132169

133170
.audio-viewer-editor-param-value {
134-
-fx-min-height: 26px;
135-
-fx-pref-height: -fx-min-height;
136-
-fx-max-height: -fx-min-height;
137171
-fx-min-width: 200px;
138172
-fx-pref-width: -fx-min-width;
139173
-fx-max-width: -fx-min-width;
174+
-fx-font-size: 16px;
140175
}
141176

142177
.audio-viewer-editor-button {
@@ -481,6 +516,7 @@
481516
-fx-min-width: 20px;
482517
}
483518

519+
484520
/* transparent list view */
485521

486522
.transparent-list-view {

‎resources/ui/css/custom_ids.bss‎

-752 Bytes
Binary file not shown.

‎resources/ui/css/custom_ids.css‎

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -95,65 +95,6 @@
9595
#TextEditorTextArea {
9696
}
9797

98-
#EditorDialogButtonOk {
99-
-fx-min-height: 32;
100-
-fx-pref-height: -fx-min-height;
101-
-fx-max-height: -fx-min-height;
102-
-fx-min-width: 150;
103-
-fx-pref-width: -fx-min-width;
104-
-fx-max-width: -fx-min-width;
105-
}
106-
107-
#EditorDialogButtonCancel {
108-
-fx-min-height: 32;
109-
-fx-pref-height: -fx-min-height;
110-
-fx-max-height: -fx-min-height;
111-
-fx-min-width: 150;
112-
-fx-pref-width: -fx-min-width;
113-
-fx-max-width: -fx-min-width;
114-
}
115-
116-
#EditorDialogLabelWarning {
117-
-fx-alignment: center;
118-
-fx-text-alignment: center;
119-
-fx-min-height: 28;
120-
-fx-pref-height: -fx-min-height;
121-
-fx-max-height: -fx-min-height;
122-
-fx-min-width: 800;
123-
-fx-pref-width: -fx-min-width;
124-
-fx-max-width: -fx-min-width;
125-
}
126-
127-
#EditorDialogShortLabel {
128-
-fx-alignment: center-right;
129-
-fx-text-alignment: right;
130-
-fx-min-width: 150;
131-
-fx-pref-width: -fx-min-width;
132-
-fx-max-width: -fx-min-width;
133-
-fx-min-height: 25;
134-
-fx-pref-height: -fx-min-height;
135-
-fx-max-height: -fx-min-height;
136-
-fx-padding: 0 6 0 0;
137-
}
138-
139-
#EditorDialogDynamicLabel {
140-
-fx-alignment: center-right;
141-
-fx-text-alignment: right;
142-
-fx-min-width: 150;
143-
-fx-pref-width: -fx-min-width;
144-
-fx-min-height: 25;
145-
-fx-pref-height: -fx-min-height;
146-
-fx-max-height: -fx-min-height;
147-
-fx-padding: 0 6 0 0;
148-
}
149-
150-
#EditorDialogField {
151-
-fx-min-height: 25;
152-
-fx-pref-height: -fx-min-height;
153-
-fx-max-height: -fx-min-height;
154-
-fx-min-width: 20;
155-
}
156-
15798
#AssetEditorDialogButtonContainer {
15899
-fx-alignment: center-right;
159100
-fx-padding: 0 0 0 0;
@@ -285,6 +226,7 @@
285226
-fx-fill: red;
286227
-fx-text-fill: red;
287228
-fx-wrap-text: true;
229+
-fx-font-size: 15px;
288230
}
289231

290232
#ModelNodeTreeCell {

‎resources/ui/css/external.bss‎

192 Bytes
Binary file not shown.

‎resources/ui/css/external.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
.code-area {
33
-fx-background-color: transparent;
44
-fx-stroke: -var-font-color;
5+
-fx-font-family: "Ubuntu Mono";
6+
-fx-font-size: 13px;
57
}
68

79
.code-area .caret {

‎src/com/ss/editor/ui/component/creator/impl/AbstractFileCreator.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,20 +250,18 @@ protected TextField getFileNameField() {
250250
protected void createSettings(@NotNull final GridPane root) {
251251

252252
final Label fileNameLabel = new Label(getFileNameLabelText() + ":");
253-
fileNameLabel.setId(CSSIds.EDITOR_DIALOG_DYNAMIC_LABEL);
254253
fileNameLabel.prefWidthProperty().bind(root.widthProperty().multiply(DEFAULT_LABEL_W_PERCENT));
255254

256255
fileNameField = new TextField();
257-
fileNameField.setId(CSSIds.EDITOR_DIALOG_FIELD);
258256
fileNameField.prefWidthProperty().bind(root.widthProperty());
259257
fileNameField.textProperty().addListener((observable, oldValue, newValue) -> validateFileName());
260258
fileNameField.prefWidthProperty().bind(root.widthProperty().multiply(DEFAULT_FIELD_W_PERCENT));
261259

262260
root.add(fileNameLabel, 0, 0);
263261
root.add(fileNameField, 1, 0);
264262

265-
FXUtils.addClassTo(fileNameLabel, CSSClasses.SPECIAL_FONT_14);
266-
FXUtils.addClassTo(fileNameField, CSSClasses.SPECIAL_FONT_14);
263+
FXUtils.addClassTo(fileNameLabel, CSSClasses.DIALOG_DYNAMIC_LABEL);
264+
FXUtils.addClassTo(fileNameField, CSSClasses.DIALOG_FIELD);
267265
}
268266

269267
/**

0 commit comments

Comments
 (0)