Skip to content

Commit c76b679

Browse files
author
Till Brehm
committed
Merge branch 'fix-4066' into 'stable-3.1'
Backup list fixes (responsive) (fixes #4066) See merge request !394
2 parents f7e9ef7 + 39bb155 commit c76b679

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.DS_Store

interface/web/sites/templates/web_backup_list.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h3><tmpl_var name="list_head_txt"></h3>
99

1010
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
1111
<div class="table-wrapper marginTop15">
12-
<table class="table">
12+
<table class="table table-auto table-striped" style="padding: 5px;">
1313
<thead class="dark form-group-sm">
1414
<tr>
1515
<th data-column="date"><tmpl_var name="date_txt"></th>
@@ -26,7 +26,7 @@ <h3><tmpl_var name="list_head_txt"></h3>
2626
<td>{tmpl_var name="backup_type"}</td>
2727
<td>{tmpl_var name="filename"}</td>
2828
<td>{tmpl_var name="filesize"}</td>
29-
<td class="text-right">
29+
<td class="text-center">
3030
<div class="buttons">
3131
<button class="btn btn-default formbutton-default" type="button" onclick="ISPConfig.confirm_action('sites/web_vhost_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');">{tmpl_var name="restore_backup_txt"}</button>
3232
<tmpl_if name="download_available">

interface/web/themes/default/assets/stylesheets/ispconfig.css

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -217,23 +217,32 @@ body {
217217

218218
.table {
219219
table-layout: fixed;
220-
margin-bottom: 1px; }
221-
.table caption {
222-
padding: 5px 10px;
223-
text-align: left;
224-
font-weight: bold;
225-
font-size: 18px;
226-
border-bottom-style: solid;
227-
border-bottom-width: 1px; }
228-
.table tbody tr {
229-
border-top-style: solid;
230-
border-top-width: 1px;
231-
transition: background ease 500ms; }
232-
.table tbody tr:last-child {
233-
border-radius: 4px; }
234-
.table tbody tr td {
235-
text-overflow: ellipsis;
236-
overflow-x: hidden; }
220+
margin-bottom: 1px;
221+
}
222+
.table caption {
223+
padding: 5px 10px;
224+
text-align: left;
225+
font-weight: bold;
226+
font-size: 18px;
227+
border-bottom-style: solid;
228+
border-bottom-width: 1px;
229+
}
230+
.table tbody tr {
231+
border-top-style: solid;
232+
border-top-width: 1px;
233+
transition: background ease 500ms;
234+
}
235+
.table tbody tr:last-child {
236+
border-radius: 4px;
237+
}
238+
.table tbody tr td {
239+
text-overflow: ellipsis;
240+
overflow-x: hidden;
241+
}
242+
243+
.table-auto {
244+
table-layout: auto;
245+
}
237246

238247
.tfooter {
239248
margin-top: -1px;

interface/web/themes/default/assets/stylesheets/ispconfig.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)