From 84600d88484dbbc26abfbc828142b9ab1b45621e Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Tue, 11 May 2021 20:21:50 +0200 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=90=9E=20fix(css):=20safari=20compati?= =?UTF-8?q?bility?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- octoprint_klipper/static/css/klipper.css | 26 ++++++++++++++---------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css index 0c20850..39e25f5 100644 --- a/octoprint_klipper/static/css/klipper.css +++ b/octoprint_klipper/static/css/klipper.css @@ -80,11 +80,6 @@ ul#klipper-settings { margin: 5px; } -#plugin-klipper-config { - height: 100%; - font-family: monospace; -} - #tab_plugin_klipper_main .row-fluid { display: flex; flex: row wrap; @@ -117,36 +112,45 @@ ul#klipper-settings { height: 100%; } -#settings_plugin_klipper form { +div#settings_plugin_klipper form { margin: 0px; height: 100%; } -#settings_plugin_klipper form .tab-content { +div#settings_plugin_klipper form .tab-content { height: calc(100% - 40px); overflow: auto; } -#settings_plugin_klipper form .tab-content .tab-pane { +div#settings_plugin_klipper div.tab-content div#conf.tab-pane { height: 100%; } -div.tab-content div#conf.tab-pane.active div.control-group { +div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group { height: 100%; margin: 0; + display: flex; + flex-direction: column; } -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active .editor-controls{ +div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div.editor-controls{ margin-bottom: 0px; height: 26px; } -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.conf-editor { +div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div.conf-editor { height: 95%; height: calc(100% - 28px); width: 99%; width: calc(100% - 4px); padding-top: 2px; + flex: 1 1; + overflow: auto; +} + +div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div.conf-editor div#plugin-klipper-config { + font-family: monospace; + overflow: auto; } div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active button.btn.btn-small { From c9debf65c9a4c8fd9ad623c6c658eca5335d6076 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Tue, 11 May 2021 22:22:37 +0200 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=8C=88=20style(less):=20remove=20less?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- octoprint_klipper/__init__.py | 3 +- octoprint_klipper/static/css/klipper.css | 1 + octoprint_klipper/static/less/klipper.less | 254 --------------------- 3 files changed, 2 insertions(+), 256 deletions(-) delete mode 100644 octoprint_klipper/static/less/klipper.less diff --git a/octoprint_klipper/__init__.py b/octoprint_klipper/__init__.py index 21c6b8a..47ea17d 100644 --- a/octoprint_klipper/__init__.py +++ b/octoprint_klipper/__init__.py @@ -354,8 +354,7 @@ class KlipperPlugin( "js/klipper_param_macro.js", "js/klipper_graph.js" ], - css=["css/klipper.css"], - less=["css/klipper.less"] + css=["css/klipper.css"] ) # -- Event Handler Plugin diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css index 39e25f5..c4ecbdb 100644 --- a/octoprint_klipper/static/css/klipper.css +++ b/octoprint_klipper/static/css/klipper.css @@ -151,6 +151,7 @@ div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div.conf-editor div#plugin-klipper-config { font-family: monospace; overflow: auto; + height: -webkit-fill-available } div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active button.btn.btn-small { diff --git a/octoprint_klipper/static/less/klipper.less b/octoprint_klipper/static/less/klipper.less deleted file mode 100644 index e591c9b..0000000 --- a/octoprint_klipper/static/less/klipper.less +++ /dev/null @@ -1,254 +0,0 @@ -.plugin-klipper-sidebar { - padding: 1px; - height: auto; - border: 1px solid #aaa; - width: 98%; - text-align: center; - word-break: break-all; - margin: auto; -} - -li#navbar_plugin_klipper { - cursor: pointer; - max-width:360px; - max-height:80px; - word-break: break-all; -} - -.plugin-klipper-sidebar a { - padding: 2px 2px; - text-align: center; - text-decoration: none; - display: inline-block; - cursor: pointer; -} - -.plugin-klipper-sidebar a:hover, .plugin-klipper-sidebar a:active { - cursor: pointer; - } - -.plugin-klipper-log { - padding: 0px; - overflow-y: scroll; - height: 400px; - border: 1px solid #eee; - width: 100%; - word-break: break-all; -} - -.plugin-klipper-log .log-item { - margin: 3px auto 0 auto; - border: 1px solid #ddd; - border-radius: 3px; - background-color: #efefef; - color: #333; -} - -.plugin-klipper-log .error { - background-color: #eebabb; -} - -.plugin-klipper-log .log-item .ts { - display: inline-block; - width: 13%; - height: 100%; - vertical-align: top; - font-size: 0.8em; - padding: 0 0 0 5px; -} - -.plugin-klipper-log .log-item .msg { - display: inline-block; - width: 84%; - height: 100%; -} - -.clear-btn { - margin-top: 6px; - margin-bottom: 6px; -} - -#level .controls { - padding: 1px; -} - -ul#klipper-settings { - margin: 0; -} - -#klipper-settings a{ - margin: 5px; -} - -#plugin-klipper-config { - height: 100%; - font-family: monospace; -} - -#tab_plugin_klipper_main .row-fluid { - display: flex; - flex: row wrap; - align-items: stretch; -} - -@media all and (max-width: 940px) { - #tab_plugin_klipper_main .row-fluid { - /* On small screens, we are no longer using row direction but column */ - flex-direction: column; - } - } - -#tab_plugin_klipper_main #left-side { - flex: 3 1; - padding-right: 10px; -} - -#tab_plugin_klipper_main .span8 label { - float: left; -} - -#tab_plugin_klipper_main #right-side { - flex: 1 1; - max-width: 200px; - min-width: 100px; -} - -#settings_plugin_klipper { - height: 100%; -} - -#settings_plugin_klipper form { - margin: 0px; - height: 100%; -} - -#settings_plugin_klipper form .tab-content { - height: calc(100% - 40px); - overflow: auto; -} - -#settings_plugin_klipper form .tab-content .tab-pane { - height: 100%; -} - -/*conf editor*/ -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group { - margin-bottom: 0px; - height: 100%; -} - -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group .editor-controls{ - margin-bottom: 0px; - height: 26px; -} - -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor { - height: 95%; - height: calc(100% - 28px); - width: 100%; - padding-top: 2px; -} - -/*UIcustomizer fix for responsiveMode*/ -body.UICResponsiveMode #settings_dialog_content { - width: 100%; - width: calc(100% - 30px); - height: 97%; - height: calc(100% - 35px); - margin-right: -18px; - margin-top: 50px; -} - -body.UICResponsiveMode div#settings_plugin_klipper form.form-horizontal div.tab-content div.tab-pane div.control-group.row-fluid.UICRemoveFluidRow { - height: auto; -} - -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor div#plugin-klipper-config { - position: relative; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group button.btn.btn-small { - width: 30%; - display: inline-block; - margin: 0px 2px 2px 2px; -} - -/*checkboxes*/ -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div.tab-pane.active div.control-group input.inline-checkbox { - vertical-align: -0.2em; -} - -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div.tab-pane.active div.control-group label.inline { - display: inline; -} - -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div.tab-pane.active div.control-group div.controls input.controls-checkbox { - margin-top: 8px; -} - -/*macros*/ -div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#macros.tab-pane.active div div#item.control-group label.control-label { - width: 80px; -} - -#macros #item.control-group { - margin-bottom: 2px; - border: 2px solid #ccc; - border-radius: 3px; - background-color: #eeeeee; - color: #333; - padding-bottom: 2px; - padding-top: 2px; -} - -#klipper_graph_dialog { - width: 1050px; -} - -#klipper_graph_dialog .full-sized-box{ - width: 1000px; - margin: 0 auto; -} - -#klipper_graph_dialog form { - margin: 0; -} - -#klipper_graph_dialog select { - width: auto; -} - -#klipper_graph_dialog .graph-footer { - bottom:0; -} - -#klipper_graph_dialog input { - display: inline-block; -} - -#klipper_graph_dialog .status-label { - display: block; - position: absolute; - margin: 5px 0 0 10px; -} - -#klipper_graph_dialog .fill-checkbox { - display: block; - position: absolute; - top: 0%; - left: 50%; -} - -#klipper_graph_dialog .help-inline { - display: block; - position: absolute; - top: 0px; -} - -#klipper_graph_canvas { - margin-top: 15px; -} From 1f385fb5421b8d462ff7f7ff06196b89052305f8 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Wed, 12 May 2021 10:30:38 +0200 Subject: [PATCH 3/6] bump for 0.3.8.1 hotfix for safari compatibility. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6154b1d..ba966f7 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ plugin_package = "octoprint_klipper" plugin_name = "OctoKlipper" -plugin_version = "0.3.8" +plugin_version = "0.3.8.1" plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software.""" From 8c076f607f6aa885aa31bca7a028ff23772e53d8 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Wed, 12 May 2021 12:51:05 +0200 Subject: [PATCH 4/6] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9ce5bfa..cb7f60b 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ Click on the wrench icon in the titlebar to open OctoPrints settings dialog. Sel Also for the moment this plugin does what I wanted it to do, it is far from finished, pull requests are welcome. If you want to get started, the OctoPrint Plugin API is quite well documented here: [docs.octoprint.org/en/master/plugins](http://docs.octoprint.org/en/master/plugins). - The [devel](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/devel) branch is the branch to merge new features and bugfixes to. - The [rc](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/rc) branch is for Release Candidates and bugfixing them. - The [master](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/master) branch is for Stable Releases. +* The [devel](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/devel) branch is the branch to merge new features and bugfixes to. +* The [rc](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/rc) branch is for Release Candidates and bugfixing them. +* The [master](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/master) branch is for Stable Releases. ## Screenshots From dd494e64604b392a29043bd258bf3f9c504377e6 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Wed, 12 May 2021 13:00:46 +0200 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=90=9E=20fix(aceEditor):=20fix=20for?= =?UTF-8?q?=20editor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit height for editor div was not set --- octoprint_klipper/static/css/klipper.css | 3 ++- octoprint_klipper/static/js/klipper_settings.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css index c4ecbdb..9ed79cd 100644 --- a/octoprint_klipper/static/css/klipper.css +++ b/octoprint_klipper/static/css/klipper.css @@ -151,7 +151,8 @@ div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div#settings_plugin_klipper div.tab-content div#conf.tab-pane div.control-group div.conf-editor div#plugin-klipper-config { font-family: monospace; overflow: auto; - height: -webkit-fill-available + height: 100%; + height: -webkit-fill-available; } div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active button.btn.btn-small { diff --git a/octoprint_klipper/static/js/klipper_settings.js b/octoprint_klipper/static/js/klipper_settings.js index 8df7784..5e6e238 100644 --- a/octoprint_klipper/static/js/klipper_settings.js +++ b/octoprint_klipper/static/js/klipper_settings.js @@ -193,6 +193,7 @@ $(function() { hScrollBarAlwaysVisible: false, vScrollBarAlwaysVisible: true, autoScrollEditorIntoView: true, + showPrintMargin: false, //maxLines: "Infinity" }) From 55e81655f4e8980c0dde634e4e2a515eff209be8 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Wed, 12 May 2021 13:18:05 +0200 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=90=9E=20fix(aceEditor):=20fix=20for?= =?UTF-8?q?=20browsers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- octoprint_klipper/static/js/klipper_settings.js | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/octoprint_klipper/static/js/klipper_settings.js b/octoprint_klipper/static/js/klipper_settings.js index 5e6e238..74b9de1 100644 --- a/octoprint_klipper/static/js/klipper_settings.js +++ b/octoprint_klipper/static/js/klipper_settings.js @@ -191,10 +191,10 @@ $(function() { editor.session.setMode("ace/mode/klipper_config"); editor.setOptions({ hScrollBarAlwaysVisible: false, - vScrollBarAlwaysVisible: true, + vScrollBarAlwaysVisible: false, autoScrollEditorIntoView: true, showPrintMargin: false, - //maxLines: "Infinity" + maxLines: "Infinity" }) editor.session.on('change', function(delta) { diff --git a/setup.py b/setup.py index ba966f7..cf3a836 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ plugin_package = "octoprint_klipper" plugin_name = "OctoKlipper" -plugin_version = "0.3.8.1" +plugin_version = "0.3.8.2" plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software."""