Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-02-22 10:48:33 +01:00
commit 3ec06ef3b2
6 changed files with 32 additions and 20 deletions

View File

@ -1,17 +1,25 @@
<div bind="wizardHeader" class="default-importing-wizard-header"><div class="grid-layout layout-tightest layout-full"><table><tr>
<td width="1%"><button bind="startOverButton" class="button"></button></td>
<td width="1%"><button bind="previousButton" class="button"></button></td>
<td width="98%" id="or-import-parsopt"></td>
<td style="text-align: right;" id="or-import-projname"></td>
<td width="1%"><input class="inline" type="text" size="30" bind="projectNameInput" /></td>
<td style="text-align: right;" id="or-import-projtags"></td>
<td width="1%">
<div bind="wizardHeader" class="default-importing-wizard-header">
<div class="grid-layout layout-tightest layout-full">
<table>
<tr>
<td width="1px"><button bind="startOverButton" class="button"></button></td>
<td width="1px"><button bind="previousButton" class="button"></button></td>
<td width="auto" id="or-import-parsopt"></td>
<td width="100px" style="text-align: right;" id="or-import-projname"></td>
<td width="200px">
<input class="inline" type="text" size="30" bind="projectNameInput" style="width: 200px;" />
</td>
<td width="35px" style="text-align: right;" id="or-import-projtags"></td>
<td width="200px">
<div id="project-tags-container" class="inline">
<input type="hidden" id="tagsInput" style="width: 300px;" />
<input type="hidden" id="tagsInput" style="width: 200px;" />
</div>
</td>
<td width="1%"><button bind="nextButton" class="button button-primary"></button></td>
</tr></table></div></div>
<td width="1px"><button bind="nextButton" class="button button-primary"></button></td>
</tr>
</table>
</div>
</div>
<div bind="dataPanel" class="default-importing-parsing-data-panel"></div>
<div bind="progressPanel" class="default-importing-progress-data-panel">

View File

@ -2,7 +2,7 @@
<tr>
<td><div class="grid-layout layout-tighter"><table>
<tr>
<td width="1%" id="or-import-encoding"></td>
<td width="50%" id="or-import-encoding"></td>
<td><input bind="encodingInput"></input></td>
</tr>
</table></div></td>

View File

@ -2,7 +2,7 @@
<tr>
<td><div class="grid-layout layout-tighter"><table>
<tr>
<td width="1%" id="or-import-encoding"></td>
<td width="50%" id="or-import-encoding"></td>
<td><input bind="encodingInput"></input></td>
</tr>
</table></div></td>

View File

@ -2,7 +2,7 @@
<tr>
<td><div class="grid-layout layout-tighter"><table>
<tr>
<td width="1%" id="or-import-encoding"></td>
<td width="50%" id="or-import-encoding"></td>
<td><input bind="encodingInput"></input></td>
</tr>
</table></div></td>

View File

@ -2,7 +2,7 @@
<tr>
<td><div class="grid-layout layout-tighter"><table>
<tr>
<td width="1%" id="or-import-encoding"></td>
<td width="50%" id="or-import-encoding"></td>
<td><input bind="encodingInput"></input></td>
</tr>
</table></div></td>

View File

@ -41,6 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.select-encoding-dialog-encoding-list > table > tbody > tr > th {
padding: @padding_tight;
}
.select-encoding-dialog-encoding-list > table > tbody > tr > td:first-child,
.select-encoding-dialog-encoding-list > table > tbody > tr > th:first-child {
width: 150px;
}
.select-encoding-dialog-encoding-list a {
white-space: pre;
}