merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6045 from jitendra-webkul/master 

Form control locale-chanel label alignment fixed
This commit is contained in:
Jitendra Singh 2022-03-16 16:31:17 +05:30 committed by GitHub
parent 172492d80f 42855c6769
commit c974d58b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=7d73f64f6f160ecd8a23",
"/css/admin.css": "/css/admin.css?id=517088acc4e4577fd849"
"/css/admin.css": "/css/admin.css?id=de6e952e15f6f3e5dca3"
}

10
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -447,6 +447,16 @@ body {
.locale {
float: right;
color: $role-text-color;
position: relative;
right: 30%;
}
}
&.have-wysiwyg {
label {
.locale {
position: unset;
}
}
}

2
packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss vendored
View File

@ -201,6 +201,8 @@
.control-group label .locale {
float: left;
right: unset;
left: 30%;
}
.multiselect {

2
packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
View File

@ -132,7 +132,7 @@
@if (view()->exists($typeView = 'admin::catalog.products.field-types.' . $attribute->type))
<div class="control-group {{ $attribute->type }}"
<div class="control-group {{ $attribute->type }} {{ $attribute->enable_wysiwyg ? 'have-wysiwyg' : '' }}"
@if ($attribute->type == 'multiselect') :class="[errors.has('{{ $attribute->code }}[]') ? 'has-error' : '']"
@else :class="[errors.has('{{ $attribute->code }}') ? 'has-error' : '']" @endif>