Skip to content

Commit 48c9237

Browse files
authored
Merge pull request #2354 from unraid/fix/share-settings-prev-next-btns
fix: clone-settings overlapping share prev/next btns
2 parents 2cc687c + ac5ca07 commit 48c9237

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

emhttp/plugins/dynamix/SecurityNFS.page

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $sec_nfs[$name]['hostList'] = str_replace(" ", "\n", $sec_nfs[$name]['hostList']
2222
:nfs_security_help:
2323

2424
<div markdown="1" class="relative">
25-
<div markdown="1" class="clone-settings clone-settings-less-padding shade">
25+
<div markdown="1" class="clone-settings shade">
2626
_(Read settings from)_ <i class="fa fa-arrow-left fa-fw"></i>
2727
: <span class="flex flex-row items-center gap-4">
2828
<select name="readnfs" onchange="toggleButton('readnfs',false)">

emhttp/plugins/dynamix/SecuritySMB.page

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ _(Security)_:
145145
:smb_secure_access_help:
146146

147147
<div markdown="1" class="relative">
148-
<div markdown="1" class="clone-settings clone-settings-less-padding shade">
148+
<div markdown="1" class="clone-settings shade">
149149
_(Read settings from)_ <i class="fa fa-arrow-left fa-fw"></i>
150150
: <span class="flex flex-row items-center gap-4">
151151
<select name="readusersmb" onchange="toggleButton('readusersmb',false)">
@@ -208,7 +208,7 @@ _(Write settings to)_ <i class="fa fa-arrow-right fa-fw"></i>
208208
:smb_private_access_help:
209209

210210
<div markdown="1" class="relative">
211-
<div markdown="1" class="clone-settings clone-settings-less-padding shade">
211+
<div markdown="1" class="clone-settings shade">
212212
_(Read settings from)_ <i class="fa fa-arrow-left fa-fw"></i>
213213
: <span class="flex flex-row items-center gap-4">
214214
<select name="readusersmb" onchange="toggleButton('readusersmb',false)">

emhttp/plugins/dynamix/ShareEdit.page

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ $filteredShares = array_filter($shares, function($list) use ($name) {
335335
:share_edit_global2_help:
336336
<?endif;?>
337337

338+
<div markdown="1" class="relative">
338339
<?if ($share['hasCfg']!='similar'):?>
339340
<?if (!empty($filteredShares)):?>
340341
<div markdown="1" class="clone-settings shade">
@@ -594,12 +595,13 @@ _(Mover action)_:
594595
<input type="submit" id="cmdEditShare" name="cmdEditShare" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply'; return handleDeleteClick(this)" disabled>
595596
<input type="button" value="_(Done)_" onclick="done()">
596597
<?if ($share['hasCfg']=='similar'):?>
597-
<span class="orange-text"><i class="fa fa-warning"></i> _(Case-insensitve Share name is not unique)_</span>
598+
<span class="orange-text"><i class="fa fa-warning"></i> _(Case-insensitive Share name is not unique)_</span>
598599
<?endif;?>
599600
</span>
600601
</div>
601602
<?endif;?>
602603
</form>
604+
</div>
603605

604606
<script>
605607
let form = document.share_edit;

emhttp/plugins/dynamix/sheets/ShareEdit.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,3 @@
1212
i.fa-info.i {
1313
margin-right: 10px;
1414
}
15-
16-
.Theme--black,
17-
.Theme--white {
18-
form[name="share_edit"] {
19-
margin-top: -20px;
20-
}
21-
}

emhttp/plugins/dynamix/styles/default-base.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,18 +2152,14 @@ span#wlan0 {
21522152
right: 0;
21532153
width: 40rem;
21542154
margin: 0;
2155-
padding: 3rem 1rem 0 0;
2155+
padding: 1rem;
21562156
background-color: transparent;
21572157

21582158
dl {
21592159
align-items: center;
21602160
gap: 1.5rem 1rem;
21612161
}
21622162
}
2163-
2164-
.clone-settings-less-padding {
2165-
padding-top: 1rem;
2166-
}
21672163
}
21682164

21692165
/* plugin overrides */

0 commit comments

Comments
 (0)