ManuelW/octoprint-customControl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ManuelW:devel
Branches Tags
ManuelW:master
ManuelW:devel
ManuelW:0.2.2
ManuelW:0.2.1
ManuelW:0.2.0
ManuelW:0.1.0
..
compare: ManuelW:master
Branches Tags
ManuelW:devel
ManuelW:master
ManuelW:0.2.2
ManuelW:0.2.1
ManuelW:0.2.0
ManuelW:0.1.0

No commits in common. "devel" and "master" have entirely different histories.
devel ... master

5 changed files with 14 additions and 17 deletions
Show Stats Expand all files Collapse all files

2
octoprint_customControl/__init__.py
View File

@ -38,7 +38,7 @@ class CustomControlPlugin(octoprint.plugin.SettingsPlugin,
"js/customControl.js", "js/customControl.js",
"js/customControlDialog.js", "js/customControlDialog.js",
], ],
css=["css/customControls.min.css"], css=["css/customControls.css"],
less=["less/customControls.less"] less=["less/customControls.less"]
) )

22
octoprint_customControl/static/css/customControls.css
View File

@ -1,40 +1,40 @@
#settings_plugin_customControl .innerSortable { #customControls .innerSortable {
width: 100%; width: 100%;
min-height: 50px; min-height: 50px;
} }
.customControlEditor .custom_section_horizontal > .custom_control { #customControls .custom_section_horizontal > .custom_control {
display: inline-block; display: inline-block;
} }
.customControlEditor .custom_section_vertical > .custom_control { #customControls .custom_section_vertical > .custom_control {
display: block; display: block;
} }
.customControlEditor .custom_section_vertical_section { #customControls .custom_section_vertical_section {
min-width: 15px; min-width: 15px;
min-height: 15px; min-height: 15px;
border: 1px dashed #000000; border: 1px dashed #000000;
} }
.customControlEditor .slider.slider-disabled .slider-track { #customControls .slider.slider-disabled .slider-track {
cursor: default !important; cursor: default !important;
} }
.customControlEditor input[disabled] { #customControls input[disabled] {
background: #fff !important; background: #fff !important;
cursor: text !important; cursor: text !important;
} }
.customControlEditor .btn-group { #customControls .btn-group {
margin-bottom: 10px; margin-bottom: 10px;
} }
.customControlEditor .btn-group.distance > .btn { #customControls .btn-group.distance > .btn {
width: 43px; width: 43px;
padding: 3px 0; padding: 3px 0;
height: 30px; height: 30px;
} }
.customControlEditor .slider-handle { #customControls .slider-handle {
width: 14px; width: 14px;
height: 14px; height: 14px;
margin-left: -7px; margin-left: -7px;
margin-top: -3px; margin-top: -3px;
} }
.customControlEditor .custom_section h1 { #customControls .custom_section h1 {
cursor: pointer; cursor: pointer;
display: block; display: block;
width: 100%; width: 100%;
@ -47,7 +47,7 @@
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
font-weight: normal; font-weight: normal;
} }
.customControlEditor .custom_control .slider { #customControls .custom_control .slider {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 2px; margin-bottom: 2px;

1
octoprint_customControl/static/css/customControls.min.css vendored
View File

@ -1 +0,0 @@
#settings_plugin_customControl .innerSortable{width:100%;min-height:50px}.customControlEditor .custom_section_horizontal>.custom_control{display:inline-block}.customControlEditor .custom_section_vertical>.custom_control{display:block}.customControlEditor .custom_section_vertical_section{min-width:15px;min-height:15px;border:1px dashed #000}.customControlEditor .slider.slider-disabled .slider-track{cursor:default!important}.customControlEditor input[disabled]{background:#fff!important;cursor:text!important}.customControlEditor .btn-group{margin-bottom:10px}.customControlEditor .btn-group.distance>.btn{width:43px;padding:3px 0;height:30px}.customControlEditor .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}.customControlEditor .custom_section h1{cursor:pointer;display:block;width:100%;padding:0;margin-bottom:10px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #E5E5E5;font-weight:400}.customControlEditor .custom_control .slider{margin-left:10px;margin-right:10px;margin-bottom:2px}

4
octoprint_customControl/static/less/customControls.less
View File

@ -1,11 +1,9 @@
#settings_plugin_customControl { #customControls {
.innerSortable { .innerSortable {
width: 100%; width: 100%;
min-height: 50px; min-height: 50px;
} }
}
.customControlEditor {
.custom_section_horizontal > .custom_control { .custom_section_horizontal > .custom_control {
display:inline-block; display:inline-block;
} }

2
octoprint_customControl/templates/customControl_hookedsettings.jinja2
View File

@ -4,7 +4,7 @@
</div> </div>
<!-- "width: 588px" to be the same as teh real Control tab--> <!-- "width: 588px" to be the same as teh real Control tab-->
<div class="customControlEditor innerSortable" style="width: 588px; clear: both; display: none;" id="customControls" data-bind="visible: loginState.isUser, template: { name: $root.displayMode, foreach: controls }"></div> <div class="innerSortable" style="width: 588px; clear: both; display: none;" id="customControls" data-bind="visible: loginState.isUser, template: { name: $root.displayMode, foreach: controls }"></div>
<ul id="controlContextMenu" class="dropdown-menu" role="menu" style="display:block;position:fixed !important;margin-bottom:5px;"> <ul id="controlContextMenu" class="dropdown-menu" role="menu" style="display:block;position:fixed !important;margin-bottom:5px;">
<li> <li>