Till Brehm
2016-07-21 d682d6652ac253e601b76f7a8f3cd38ba31ea73e
Merge branch 'fix-3986' into 'stable-3.1'

Backup delete button css mismatch (fixes: #3969 #3885 #3986)



See merge request !383
2 files modified
4 ■■■■ changed files
interface/web/sites/templates/web_backup_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/themes/default/assets/stylesheets/ispconfig.css 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/web_backup_list.htm
@@ -32,7 +32,7 @@
                                    <tmpl_if name="download_available">
                                        <button class="btn btn-default formbutton-default" type="button" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}">{tmpl_var name="download_backup_txt"}</button>
                                    </tmpl_if>
                                    <button class="button iconstxt icoDelete" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=delete&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='delete_confirm_txt'}');"><span>{tmpl_var name="delete_backup_txt"}</span></button>
                                    <button class="btn btn-default formbutton-default" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=delete&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='delete_confirm_txt'}');"><span>{tmpl_var name="delete_backup_txt"}</span></button>
                                </div>
                            </td>
                        </tr>
interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -31,7 +31,7 @@
    content: ":"; }
.formbutton-default {
  padding: 6px 30px;
  padding: 6px 10px;
  border-bottom-style: solid;
  border-bottom-width: 2px;
  font-size: 12px;