3diy
/
OctoprintKlipperPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

css

This commit is contained in:
thelastWallE 2021-04-11 22:27:04 +02:00
parent 58c26ca9ae
commit db68bee497
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
octoprint_klipper/static/css/klipper.css
View File

@ -1,5 +1,5 @@
.plugin-klipper-log { .plugin-klipper-log {
padding: 3px; padding: 0px;
overflow-y: scroll; overflow-y: scroll;
height: 400px; height: 400px;
border: 1px solid #eee; border: 1px solid #eee;
@ -10,7 +10,7 @@
margin: 3px auto 0 auto; margin: 3px auto 0 auto;
border: 1px solid #ddd; border: 1px solid #ddd;
border-radius: 3px; border-radius: 3px;
background-color: #eeeeef; background-color: #efefef;
color: #333; color: #333;
} }
@ -57,26 +57,30 @@ ul#klipper-settings {
#tab_plugin_klipper_main .row-fluid { #tab_plugin_klipper_main .row-fluid {
display: flex; display: flex;
flex-direction: row; flex: row wrap;
flex-wrap: wrap; align-items: stretch;
} }
#tab_plugin_klipper_main .span8 { @media all and (max-width: 940px) {
flex-grow: 8; #tab_plugin_klipper_main .row-fluid {
float: left; /* On small screens, we are no longer using row direction but column */
box-sizing: border-box; flex-direction: column;
}
}
#tab_plugin_klipper_main #left-side {
flex: 3 1;
padding-right: 10px;
} }
#tab_plugin_klipper_main .span8 label { #tab_plugin_klipper_main .span8 label {
float: left; float: left;
} }
#tab_plugin_klipper_main .span4 { #tab_plugin_klipper_main #right-side {
flex-grow: 0; flex: 1 1;
flex-shrink: 1; max-width: 200px;
/* max-width: 13%; */ min-width: 100px;
float: left;
box-sizing: border-box;
} }
#settings_plugin_klipper { #settings_plugin_klipper {
@ -94,7 +98,7 @@ ul#klipper-settings {
} }
#settings_plugin_klipper form .tab-content .tab-pane { #settings_plugin_klipper form .tab-content .tab-pane {
height: calc(100% - 35px); height: 100%;
} }
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group { div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group {
@ -102,13 +106,19 @@ div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content
height: 100%; 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 { 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: 100%; height: calc(100% - 28px);
width: 100%; width: 100%;
padding-top: 2px;
} }
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 { 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: absolute; position: relative;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;

24
octoprint_klipper/templates/klipper_settings.jinja2
View File

@ -206,17 +206,19 @@
<script src="plugin/klipper/static/js/lib/ace/ace.min.js" type="text/javascript" charset="utf-8"></script> <script src="plugin/klipper/static/js/lib/ace/ace.min.js" type="text/javascript" charset="utf-8"></script>
<script src="plugin/klipper/static/js/lib/ace/theme-monokai.min.js" type="text/javascript" charset="utf-8"></script> <script src="plugin/klipper/static/js/lib/ace/theme-monokai.min.js" type="text/javascript" charset="utf-8"></script>
<script src="plugin/klipper/static/js/lib/ace/mode-klipper_config.js" type="text/javascript"></script> <script src="plugin/klipper/static/js/lib/ace/mode-klipper_config.js" type="text/javascript"></script>
<button class="btn btn-small" data-bind="click: loadLastSession" <div class="editor-controls">
title="Reloads the last changes"> <button class="btn btn-small" data-bind="click: loadLastSession"
<i class="fas fa-redo"></i> {{ _('Reload last changes') }} title="Reloads the last changes">
</button> <i class="fas fa-redo"></i> {{ _('Reload last changes') }}
<button class="btn btn-small" data-bind='click: reloadFromFile'> </button>
<i class="fas fa-upload"></i> {{ _('Reload from file') }} <button class="btn btn-small" data-bind='click: reloadFromFile'>
</button> <i class="fas fa-upload"></i> {{ _('Reload from file') }}
<label class="inline"><input class="inline-checkbox" type="checkbox" data-bind="checked: settings.settings.plugins.klipper.configuration.parse_check"> {{ _('Check parsing on save') }}</label> </button>
&nbsp;&nbsp; <label class="inline"><input class="inline-checkbox" type="checkbox" data-bind="checked: settings.settings.plugins.klipper.configuration.parse_check"> {{ _('Check parsing on save') }}</label>
<a href='#' data-bind="click: minusFontsize" class="fas fa-search-minus"></a> &nbsp;&nbsp;
<a href='#' data-bind="click: plusFontsize" class="fas fa-search-plus"></a> <a href='#' data-bind="click: minusFontsize" class="fas fa-search-minus"></a>
<a href='#' data-bind="click: plusFontsize" class="fas fa-search-plus"></a>
</div>
<div class="conf-editor"> <div class="conf-editor">
<input id="hdnLoadKlipperConfig" type="hidden" data-bind="value: configBound(settings.settings.plugins.klipper.config)" /> <input id="hdnLoadKlipperConfig" type="hidden" data-bind="value: configBound(settings.settings.plugins.klipper.config)" />
<div id="plugin-klipper-config"></div> <div id="plugin-klipper-config"></div>

4
octoprint_klipper/templates/klipper_tab_main.jinja2
View File

@ -1,5 +1,5 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div id="left-side">
<label> <i class="icon-tasks"></i> {{ _("Messages") }} </label> <label> <i class="icon-tasks"></i> {{ _("Messages") }} </label>
<div class="plugin-klipper-log" data-bind="foreach: logMessages"> <div class="plugin-klipper-log" data-bind="foreach: logMessages">
<div class="log-item" data-bind="css: type"> <div class="log-item" data-bind="css: type">
@ -16,7 +16,7 @@
<i class="fa fa-trash"></i> {{ _("Clear") }} <i class="fa fa-trash"></i> {{ _("Clear") }}
</button> </button>
</div> </div>
<div class="span4"> <div id="right-side">
<div class="control-group"> <div class="control-group">
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">