summaryrefslogtreecommitdiff
path: root/templates/import_resolve.tpl
diff options
context:
space:
mode:
Diffstat (limited to 'templates/import_resolve.tpl')
-rw-r--r--templates/import_resolve.tpl8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/import_resolve.tpl b/templates/import_resolve.tpl
index a176ad4..eed936c 100644
--- a/templates/import_resolve.tpl
+++ b/templates/import_resolve.tpl
@@ -13,21 +13,21 @@
{foreach from=$impConflicts key=lang item=langConflicts}
<h2>{tr}Conflicts{/tr}: {$impLanguages.$lang.translated_name}</h2>
{foreach from=$langConflicts key=sourceHash item=conflict}
- <div class="control-group">
+ <div class="control-group column-group gutters">
{formlabel label="Master String"}
{forminput}
{$conflict.master|escape|nl2br}
{/forminput}
</div>
- <div class="control-group">
+ <div class="control-group column-group gutters">
{formlabel label="Existing"}
{forminput}
<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="" checked="checked" /> {$conflict.existing|escape|nl2br}</label>
{/forminput}
</div>
- <div class="control-group">
+ <div class="control-group column-group gutters">
{formlabel label="Imported"}
{forminput}
<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="{$conflict.import}" /> {$conflict.import|escape|nl2br}</label>
@@ -38,7 +38,7 @@
{/foreach}
<div class="control-group submit">
- <input type="submit" class="btn btn-default" name="resolve" value="{tr}Import{/tr}" />
+ <input type="submit" class="ink-button" name="resolve" value="{tr}Import{/tr}" />
</div>
{/form}
</div><!-- end .body -->