Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
3b13cb3b2d
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
deployment:
|
deployment:
|
||||||
tasks:
|
tasks:
|
||||||
- export DEPLOYPATH=home3/venbaehn/public_html/nhance/devauto/
|
- export DEPLOYPATH=home/venbaehn/public_html/nhance/devauto
|
||||||
- /bin/cp -r home3/venbaehn/repositories/nhance_dev/* $DEPLOYPATH
|
- /bin/cp /home/venbaehn/repositories/nhance_dev/* $DEPLOYPATH -r
|
||||||
@ -2,7 +2,7 @@
|
|||||||
.switch {
|
.switch {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 60px;
|
width: 54px;
|
||||||
height: 34px;
|
height: 34px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ input:checked + .slider:before {
|
|||||||
<input id="is_download_btn" type="checkbox" name="is_download_btn" <?= (isset($client['is_download_btn']) && $client['is_download_btn'] == 1) ? 'checked' : '' ?>>
|
<input id="is_download_btn" type="checkbox" name="is_download_btn" <?= (isset($client['is_download_btn']) && $client['is_download_btn'] == 1) ? 'checked' : '' ?>>
|
||||||
<span class="slider round" style="height: 27px;"></span>
|
<span class="slider round" style="height: 27px;"></span>
|
||||||
</label>
|
</label>
|
||||||
<label for="is_download_btn">Enable Client Export Option</label>
|
<label for="is_download_btn" style=" position: relative;bottom: 5px;">Enable Client Export Option</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -129,7 +129,7 @@
|
|||||||
var fileExtension = fileName.split('.').pop().toLowerCase();
|
var fileExtension = fileName.split('.').pop().toLowerCase();
|
||||||
if (allowedExtensions.indexOf(fileExtension) === -1) {
|
if (allowedExtensions.indexOf(fileExtension) === -1) {
|
||||||
form.trigger('reset')
|
form.trigger('reset')
|
||||||
toastr.warning('File type not allowed: ' + fileName, 'Warning');
|
toastr.warning('File type not allowed: ' + fileName, 'Only Allowed pdf, png, jpg and jpeg');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -90,7 +90,7 @@
|
|||||||
<input id="is_addon" type="checkbox" name="is_addon" <?= (isset($client['is_addon']) && $client['is_addon'] == 1) ? 'checked' : '' ?>>
|
<input id="is_addon" type="checkbox" name="is_addon" <?= (isset($client['is_addon']) && $client['is_addon'] == 1) ? 'checked' : '' ?>>
|
||||||
<span class="slider round" style="height: 27px;"></span>
|
<span class="slider round" style="height: 27px;"></span>
|
||||||
</label>
|
</label>
|
||||||
<label for="is_addon">Is AddOn Policy</label>
|
<label for="is_addon" style=" position: relative;bottom: 5px;">Is AddOn Policy</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -52,14 +52,6 @@
|
|||||||
.jodit-status-bar{
|
.jodit-status-bar{
|
||||||
display:none;
|
display:none;
|
||||||
}
|
}
|
||||||
.jodit-container{
|
|
||||||
/* width: 690px !important; */
|
|
||||||
/* margin-top: 3px; */
|
|
||||||
/* margin-bottom: 3px; */
|
|
||||||
/* margin-left: 30px; */
|
|
||||||
/* height: 0px !important; */
|
|
||||||
/* min-height: 100px !important; */
|
|
||||||
}
|
|
||||||
.input-group {
|
.input-group {
|
||||||
width: 64.5% !important;
|
width: 64.5% !important;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user