diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html
index ce4b2da4e..dc676ae46 100644
--- a/resources/web/flush/WipingDialog.html
+++ b/resources/web/flush/WipingDialog.html
@@ -112,6 +112,15 @@
margin: 0;
}
+ input[type="number"].multiplier-input {
+ width: 60px;
+ }
+ body.dark-mode input[type="number"].multiplier-input {
+ width: 60px;
+ background-color: #4c4c55;
+ color: white;
+ }
+
.warning-text {
color: red;
font-size: 12px;
@@ -155,6 +164,12 @@
background-color: #eeeeee;
}
+ body.dark-mode button.btn-cancel {
+ background-color: #2d2d31;
+ color: #e0e0e0;
+ border: 1px solid #e0e0e0;
+ }
+
select {
padding: 6px 9px;
border: 1px solid #dbdbdb;
@@ -210,6 +225,17 @@
border-color: #4c4c55;
}
+ body.dark-mode input[type="number"].table-input {
+ width: 30px;
+ height: 20px;
+ text-align: center;
+ -moz-appearance: textfield;
+ appearance: textfield;
+ border: none;
+ color: #e0e0e0;
+ background-color: inherit;
+ }
+
body.dark-mode th, body.dark-mode td {
background: inherit;
border-color: #555;
@@ -326,7 +352,7 @@
type="number"
step="0.1"
id="multiplierInput"
- style="width:70px;"
+ class="multiplier-input"
value="1.00"
oninput="onMultiplierChange()"
/>
@@ -626,7 +652,7 @@
input.style.color = "red";
hasException = true;
} else {
- input.style.color = "black";
+ input.style.removeProperty("color");
}
}
}
diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp
index e36e2d0fa..74daa6adf 100644
--- a/src/slic3r/GUI/FilamentMapDialog.cpp
+++ b/src/slic3r/GUI/FilamentMapDialog.cpp
@@ -246,7 +246,7 @@ FilamentMapDialog::FilamentMapDialog(wxWindow *parent,
Fit();
CenterOnParent();
- GUI::wxGetApp().UpdateDarkUIWin(this);
+ wxGetApp().UpdateDlgDarkUI(this);
}
FilamentMapMode FilamentMapDialog::get_mode()
diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
index 8df5203e1..619922d7d 100644
--- a/src/slic3r/GUI/WipeTowerDialog.cpp
+++ b/src/slic3r/GUI/WipeTowerDialog.cpp
@@ -147,6 +147,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector>
main_sizer->SetSizeHints(this);
main_sizer->Fit(this);
CenterOnParent();
+ wxGetApp().UpdateDlgDarkUI(this);
//m_webview->Bind(wxEVT_WEBVIEW_NAVIGATED, [this](auto& evt) {
// auto table_obj_str = BuildTableObjStr();