Skip to content
Snippets Groups Projects
Commit 5da5e37e authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-fix-bad-linebreak-in-canvas-properties'

parents ac2d1922 84e810f2
No related branches found
No related tags found
No related merge requests found
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<legend data-i18n="canvas.prop.heading.data_scaling"></legend> <legend data-i18n="canvas.prop.heading.data_scaling"></legend>
<div style="display: inline-block; align: left;"> <div style="display: inline-block; align: left;">
<div class="x-scale prop hidden"> <div class="x-scale prop hidden">
<nobr>
<label class="no_gop_opt" data-i18n="[title]canvas.prop.x_scale_tt"> <label class="no_gop_opt" data-i18n="[title]canvas.prop.x_scale_tt">
<span data-i18n="canvas.prop.x_scale"></span> <span data-i18n="canvas.prop.x_scale"></span>
<input class="no_gop_opt" type="text" name="x-scale"> <input class="no_gop_opt" type="text" name="x-scale">
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
<span data-i18n="canvas.prop.y_scale"></span> <span data-i18n="canvas.prop.y_scale"></span>
<input class="no_gop_opt" type="text" name="y-scale"> <input class="no_gop_opt" type="text" name="y-scale">
</label> </label>
</nobr>
</div> </div>
<div class="gop-range"> <div class="gop-range">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment