From 529e6e41e9f9861b01dc5ad78c45524511c4dd19 Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Thu, 13 May 2021 21:02:16 +0200
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9E=20fix(settings):=20fix=20UIcus?=
=?UTF-8?q?tomizer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fix settings tab height
---
octoprint_klipper/static/css/klipper.css | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css
index 9ed79cd..ddffef9 100644
--- a/octoprint_klipper/static/css/klipper.css
+++ b/octoprint_klipper/static/css/klipper.css
@@ -112,6 +112,14 @@ ul#klipper-settings {
height: 100%;
}
+/* UIcustomizer fix */
+body.UICResponsiveMode #settings_dialog_content {
+ height: calc(100% - 35px);
+ margin-right: -18px;
+ margin-top: 50px;
+ width: calc(100% - 15px);
+}
+
div#settings_plugin_klipper form {
margin: 0px;
height: 100%;
From 17ce0f77c2996987fb2e96ab1dfb3d8de83858c7 Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Thu, 13 May 2021 21:58:48 +0200
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=8C=88=20style(settings):=20less=20he?=
=?UTF-8?q?ight=20for=20settings=5Fdialog=5Fcontent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
set remaining space for settings tab content to get rid of scrollbar
---
octoprint_klipper/static/css/klipper.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css
index ddffef9..b7850b6 100644
--- a/octoprint_klipper/static/css/klipper.css
+++ b/octoprint_klipper/static/css/klipper.css
@@ -113,8 +113,9 @@ ul#klipper-settings {
}
/* UIcustomizer fix */
+
body.UICResponsiveMode #settings_dialog_content {
- height: calc(100% - 35px);
+ height: calc(100% - 40px);
margin-right: -18px;
margin-top: 50px;
width: calc(100% - 15px);
From fb94624189ef2819702408b671045768933a4ac2 Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Fri, 14 May 2021 15:10:09 +0200
Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=A8=20feat(settings):=20donate=20butt?=
=?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
octoprint_klipper/static/css/klipper.css | 11 ++++++++++-
octoprint_klipper/templates/klipper_settings.jinja2 | 5 +++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css
index 9ed79cd..06fbca9 100644
--- a/octoprint_klipper/static/css/klipper.css
+++ b/octoprint_klipper/static/css/klipper.css
@@ -118,10 +118,19 @@ div#settings_plugin_klipper form {
}
div#settings_plugin_klipper form .tab-content {
- height: calc(100% - 40px);
+ height: calc(100% - 60px);
overflow: auto;
}
+div#settings_plugin_klipper form .tab-footer {
+ height: 20px;
+ width: 100%;
+ top: 10px;
+ position: relative;
+ border-top: 1px solid #eee;
+ padding-top: 5px;
+}
+
div#settings_plugin_klipper div.tab-content div#conf.tab-pane {
height: 100%;
}
diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2
index 6d60d5a..d2e6864 100644
--- a/octoprint_klipper/templates/klipper_settings.jinja2
+++ b/octoprint_klipper/templates/klipper_settings.jinja2
@@ -228,4 +228,9 @@
+
From 2cc5761419f0ee675ca5edcd70f848fd0e896a44 Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Fri, 14 May 2021 22:09:15 +0200
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=8C=88=20style(settings):=20css=20foo?=
=?UTF-8?q?ter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
octoprint_klipper/static/css/klipper.css | 14 ++++++++------
octoprint_klipper/static/js/klipper_settings.js | 2 +-
.../templates/klipper_settings.jinja2 | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css
index 86aa5b6..ddf2596 100644
--- a/octoprint_klipper/static/css/klipper.css
+++ b/octoprint_klipper/static/css/klipper.css
@@ -110,12 +110,13 @@ ul#klipper-settings {
#settings_plugin_klipper {
height: 100%;
+ height: -webkit-fill-available;
}
/* UIcustomizer fix */
body.UICResponsiveMode #settings_dialog_content {
- height: calc(100% - 40px);
+ height: calc(100% - 60px);
margin-right: -18px;
margin-top: 50px;
width: calc(100% - 15px);
@@ -126,22 +127,23 @@ div#settings_plugin_klipper form {
height: 100%;
}
-div#settings_plugin_klipper form .tab-content {
- height: calc(100% - 60px);
+div#settings_plugin_klipper div.tab-content {
+ height: calc(100% - 58px);
overflow: auto;
}
-div#settings_plugin_klipper form .tab-footer {
+div#settings_plugin_klipper div.tab-footer {
height: 20px;
width: 100%;
top: 10px;
position: relative;
border-top: 1px solid #eee;
- padding-top: 5px;
+ padding-top: 3px;
}
div#settings_plugin_klipper div.tab-content div#conf.tab-pane {
height: 100%;
+ width: 100%;
}
div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group {
@@ -161,7 +163,7 @@ div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group
height: calc(100% - 28px);
width: 99%;
width: calc(100% - 4px);
- padding-top: 2px;
+ margin-top: 5px;
flex: 1 1;
overflow: auto;
}
diff --git a/octoprint_klipper/static/js/klipper_settings.js b/octoprint_klipper/static/js/klipper_settings.js
index 74b9de1..de5c542 100644
--- a/octoprint_klipper/static/js/klipper_settings.js
+++ b/octoprint_klipper/static/js/klipper_settings.js
@@ -194,7 +194,7 @@ $(function() {
vScrollBarAlwaysVisible: false,
autoScrollEditorIntoView: true,
showPrintMargin: false,
- maxLines: "Infinity"
+ //maxLines: "Infinity"
})
editor.session.on('change', function(delta) {
diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2
index d2e6864..7accd99 100644
--- a/octoprint_klipper/templates/klipper_settings.jinja2
+++ b/octoprint_klipper/templates/klipper_settings.jinja2
@@ -230,7 +230,7 @@