Skip to content

Commit 6b2dfd0

Browse files
authored
Merge pull request #272 from mikeller/more_spacing_fixes
Fixed more spacing issues on the PID tab.
2 parents 762352e + b495a7d commit 6b2dfd0

File tree

2 files changed

+40
-21
lines changed

2 files changed

+40
-21
lines changed

tabs/pid_tuning.css

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@
243243
text-align: left;
244244
border-right: 1px solid #ccc;
245245
width: 12.5%;
246-
247246
}
248247

249248
.tab-pid_tuning .pid_titlebar th:first-child {
@@ -264,6 +263,36 @@
264263
border-right: 0px solid #ccc;
265264
}
266265

266+
.tab-pid_tuning #pid_optional table th {
267+
width: 25%;
268+
}
269+
270+
.tab-pid_tuning #pid_optional table td {
271+
width: 25%;
272+
}
273+
274+
.tab-pid_tuning #pid_accel table th {
275+
width: 33%;
276+
}
277+
278+
.tab-pid_tuning #pid_accel table td {
279+
width: 33%;
280+
}
281+
282+
.tab-pid_tuning table.compensation td {
283+
width: 60%;
284+
padding-left: 5px;
285+
padding-right: 5px;
286+
}
287+
288+
.tab-pid_tuning table.compensation td:first-child {
289+
width: 10%;
290+
}
291+
292+
.tab-pid_tuning table.compensation td:last-child {
293+
width: 30%;
294+
}
295+
267296
.tab-pid_tuning .pidTuningFeatures td {
268297
padding: 5px;
269298
}
@@ -288,6 +317,7 @@
288317

289318
.tab-pid_tuning table td {
290319
padding: 1px;
320+
padding-left: 5px;
291321
width: 12.5%;
292322
border-right: 1px solid #ccc;
293323
}
@@ -708,18 +738,6 @@ width: 40%;
708738
margin-bottom: 10px;
709739
}
710740

711-
.tab-pid_tuning #pid_level th:first-child {
712-
width: 7%;
713-
}
714-
715-
.tab-pid_tuning #pid_level td:first-child {
716-
width: 7%;
717-
}
718-
719-
.tab-pid_tuning .slider {
720-
width: 40% !important;
721-
}
722-
723741
.tabarea {
724742
float: left;
725743
width: calc(100% - 22px);

tabs/pid_tuning.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
<div id="pid_accel" class="gui_box grey topspacer pid_tuning">
213213
<table class="pid_titlebar">
214214
<tr>
215-
<th class="third" i18n="pidTuningName" style="width: 19%;"></th>
215+
<th class="third" i18n="pidTuningName"></th>
216216
<th class="third" i18n="pidTuningStrength" style="width: 33%;"></th>
217217
<th class="third" i18n="pidTuningTransition" style="width: 33%;"></th>
218218
</tr>
@@ -266,7 +266,7 @@
266266
<option value="1" i18n="pidTuningDeltaMeasurement"/>
267267
</select>
268268
</td>
269-
<td colspan=2>
269+
<td>
270270
<div>
271271
<label for="delta-select">
272272
<span i18n="pidTuningDelta"></span>
@@ -278,19 +278,19 @@
278278
<tr class="ptermSetpoint">
279279
<td><input type="number" name="ptermSetpoint-number" step="0.01" min="0.00" max="1.00"/></td>
280280
<td class="slider"><input type="range" name="ptermSetpoint-range" step="0.01" min="0.00" max="1.00"/></td>
281-
<td colspan=2>
281+
<td>
282282
<div>
283283
<label>
284284
<span i18n="pidTuningPtermSetpoint"></span>
285285
</label>
286286
<div class="helpicon cf_tip" i18n_title="pidTuningPtermSetpointHelp"></div>
287-
</div>
288-
</td>
287+
</div>
288+
</td>
289289
</tr>
290290
<tr class="dtermSetpoint">
291291
<td><input type="number" name="dtermSetpoint-number" step="0.01" min="0.00" max="2.55"/></td>
292292
<td class="slider"><input type="range" name="dtermSetpoint-range" step="0.01" min="0.00" max="2.55"/></td>
293-
<td colspan=2>
293+
<td>
294294
<div>
295295
<label>
296296
<span i18n="pidTuningDtermSetpoint"></span>
@@ -299,8 +299,9 @@
299299
</div>
300300
</td>
301301
</tr>
302-
<td><input type="checkbox" id="vbatpidcompensation" class="toggle" /></td>
303-
<td colspan=2>
302+
<tr>
303+
<td><input type="checkbox" id="vbatpidcompensation" class="toggle" /></td>
304+
<td>
304305
<div>
305306
<label for="vbatpidcompensation">
306307
<span i18n="pidTuningVbatPidCompensation"></span>

0 commit comments

Comments
 (0)