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

fixed conflicts

This commit is contained in:
Deepak Singh Gusain 2022-01-25 17:35:39 +05:30
parent 38974dc6fd f689546d72
commit 99732c18c6
8 changed files with 192 additions and 168 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=94da304c8b02ad3ba649",
"/css/admin.css": "/css/admin.css?id=1e45b8579a76226c6015"
"/css/admin.css": "/css/admin.css?id=df6b15e0f1deaef7b05c"
}

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

@ -9,22 +9,22 @@ body {
background-color: $body-background;
}
.padding-container-navbar-not-expand{
padding-left:56px !important;
.padding-container-navbar-not-expand {
padding-left: 56px !important;
}
.padding-container-navbar-expand{
padding-left:200px !important;
.padding-container-navbar-expand {
padding-left: 200px !important;
}
.rtl{
.padding-container-navbar-not-expand{
padding-right:56px !important;
.rtl {
.padding-container-navbar-not-expand {
padding-right: 56px !important;
padding-left: 0px !important;
}
.padding-container-navbar-expand{
padding-right:200px !important;
.padding-container-navbar-expand {
padding-right: 200px !important;
padding-left: 0px !important;
}
}
@ -234,12 +234,12 @@ body {
display: none;
}
.arrow-icon-left{
.arrow-icon-left {
float: right;
}
.arrow-icon-right{
.arrow-icon-right {
float: left;
margin-left: 20px;
}
@ -495,7 +495,7 @@ body {
}
.rtl {
.navbar-left {
.navbar-left {
right: 0 !important;
ul.menubar {
@ -505,11 +505,11 @@ body {
ul.sub-menubar {
top: 0;
right: 56px !important;
}
}
}
}
}
&.open {
&.open {
ul.menubar {
@ -524,7 +524,7 @@ body {
padding-left: 0px;
}
}
}
}
}
}
}
@ -620,6 +620,15 @@ body {
width: 100%;
display: inline-block;
padding: 8px 16px;
.page-content-button {
float: right;
}
.page-content-datagrid {
display: block;
clear: both;
}
}
}
}
@ -778,8 +787,12 @@ body {
font-size: 18px;
}
.btn.btn-lg {
padding: 4px 6px;
.back-link {
margin-top: -2px !important;
}
.export-import {
margin-top: -15px;
}
.navbar-top {
@ -823,40 +836,35 @@ body {
.content {
.page-header {
.configuration {
.control-group {
width: 100% !important;
display: block;
margin-bottom: 0;
margin-left: 0px;
padding: 0px;
margin-top: 40px;
}
.page-header {
.page-title {
float: left;
width: 100%;
.control-group {
width: 100% !important;
display: block;
margin-bottom: 0;
margin-left: 0px;
padding: 0px;
margin-top: 40px;
}
.back-link {
.page-title {
float: left;
width: 100%;
.back-link {
margin-top: 0px;
margin-right: -1px;
height: 22px !important;
width: 22px !important;
}
}
.page-action {
position: absolute;
right: 10px;
margin-top: 0px;
margin-right: -1px;
height: 22px !important;
width: 22px !important;
}
}
.page-action {
position: absolute;
right: 10px;
margin-top: 0px;
.export-import {
margin-top: -15px;
}
* {
display: inline-block;
}
}
}
@ -884,57 +892,46 @@ body {
}
}
@media only screen and (max-width: 411px) {
@media only screen and (max-width: 414px) {
.content-container {
.content {
.page-header {
.control-group {
.page-title {
width: 100% !important;
display: block;
margin-bottom: 0;
margin-left: 0px;
padding: 0px;
margin-top: 40px;
.control-group {
margin-top: 10px !important;
width: 100% !important;
margin-left: 0px !important;
}
}
.page-action {
margin-top: 10px !important;
float: left;
a {
margin-left: 0px !important;
}
.export-import {
margin-top: 0px !important;
}
}
}
}
}
}
@media only screen and (max-width: 385px) {
.content-container {
.content {
.page-header {
.control-group {
width: 100% !important;
display: block;
margin-bottom: 0;
margin-left: 0px;
padding: 0px;
margin-top: 40px;
}
}
}
}
}
@media only screen and (max-width: 320px) {
@media only screen and (max-width: 400px) {
.content-container {
.content {
.page-header {
.control-group {
width: 100% !important;
display: block;
margin-bottom: 0;
margin-left: 0px;
padding: 0px;
margin-top: 40px;
.page-header {
.page-action {
a{
margin-top:10px;
}
}
}
}

33
packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php
View File

@ -11,28 +11,29 @@
<div class="page-header">
<div class="page-title">
<h1>{{ __('admin::app.catalog.categories.title') }}</h1>
<div class="control-group">
<select class="control" id="locale-switcher" name="locale"
onchange="reloadPage('locale', this.value)">
<option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-locales') }}
</option>
@foreach (core()->getAllLocales() as $localeModel)
<option
value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@endforeach
</select>
</div>
</div>
<div class="page-action">
<a href="{{ route('admin.catalog.categories.create') }}" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.categories.add-title') }}
</a>
</div>
<div class="control-group">
<select class="control" id="locale-switcher" name="locale"
onchange="reloadPage('locale', this.value)">
<option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-locales') }}
</option>
@foreach (core()->getAllLocales() as $localeModel)
<option
value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@endforeach
</select>
</div>
</div>
</div>
{!! view_render_event('bagisto.admin.catalog.categories.list.before') !!}

124
packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
View File

@ -27,80 +27,84 @@
$channelLocales = core()->getAllLocalesByRequestedChannel()['locales'];
@endphp
<form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="configuration">
<form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="page-header">
<div class="page-header">
<div class="page-title">
<h1>
{{ __('admin::app.configuration.title') }}
</h1>
<div class="page-title">
<h1>
{{ __('admin::app.configuration.title') }}
</h1>
<div class="control-group">
<select class="control" id="channel-switcher" name="channel">
@foreach (core()->getAllChannels() as $channelModel)
<div class="control-group">
<select class="control" id="channel-switcher" name="channel">
@foreach (core()->getAllChannels() as $channelModel)
<option value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
{{ core()->getChannelName($channelModel) }}
</option>
<option value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
{{ core()->getChannelName($channelModel) }}
</option>
@endforeach
</select>
@endforeach
</select>
</div>
<div class="control-group">
<select class="control" id="locale-switcher" name="locale">
@foreach ($channelLocales as $localeModel)
<option value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@endforeach
</select>
</div>
</div>
<div class="control-group">
<select class="control" id="locale-switcher" name="locale">
@foreach ($channelLocales as $localeModel)
<option value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@endforeach
</select>
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.configuration.save-btn-title') }}
</button>
</div>
</div>
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.configuration.save-btn-title') }}
</button>
<div class="page-content">
<div class="form-container">
@csrf()
@if ($groups = \Illuminate\Support\Arr::get($config->items, request()->route('slug') . '.children.' . request()->route('slug2') . '.children'))
@foreach ($groups as $key => $item)
<accordian title="{{ __($item['name']) }}" :active="true">
<div slot="body">
@foreach ($item['fields'] as $field)
@include ('admin::configuration.field-type')
@php ($hint = $field['title'] . '-hint')
@if ($hint !== __($hint))
{{ __($hint) }}
@endif
@endforeach
</div>
</accordian>
@endforeach
@endif
</div>
</div>
</div>
<div class="page-content">
<div class="form-container">
@csrf()
</form>
@if ($groups = \Illuminate\Support\Arr::get($config->items, request()->route('slug') . '.children.' . request()->route('slug2') . '.children'))
</div>
@foreach ($groups as $key => $item)
<accordian title="{{ __($item['name']) }}" :active="true">
<div slot="body">
@foreach ($item['fields'] as $field)
@include ('admin::configuration.field-type')
@php ($hint = $field['title'] . '-hint')
@if ($hint !== __($hint))
{{ __($hint) }}
@endif
@endforeach
</div>
</accordian>
@endforeach
@endif
</div>
</div>
</form>
</div>
@stop

4
packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
View File

@ -28,13 +28,13 @@
<tab name="{{ __('admin::app.customers.customers.addresses') }}" :selected="false">
<div class="page-content">
<div style="float: right;">
<div class="page-content-button">
<a href="{{ route('admin.customer.addresses.create', ['id' => $customer->id]) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.customers.addresses.create-btn-title') }}
</a>
</div>
<div class="mt-30">
<div class="page-content-datagrid">
<datagrid-plus src="{{ route('admin.customer.addresses.index', $customer->id) }}"></datagrid-plus>
</div>
</div>

20
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php
View File

@ -4,6 +4,26 @@
{{ __('admin::app.settings.tax-rates.title') }}
@stop
@push('css')
<style>
@media only screen and (max-width: 450px){
.content-container .content .page-header .page-title{
width: 100% !important;
}
.content-container .content .page-header .page-action {
margin-top: 0px !important;
float: left;
}
.export-import {
margin-top: 0px !important;
}
}
</style>
@endpush
@section('content')
<div class="content">
<div class="page-header">

6
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -13,7 +13,7 @@
@push('css')
<style>
@media only screen and (max-width: 768px){
@media only screen and (max-width: 680px){
.content-container .content .page-header .page-title {
float: left;
@ -24,11 +24,13 @@
.content-container .content .page-header .page-action button {
position: absolute;
right: 2px;
top: -124px !important;
top: 10px !important;
}
.content-container .content .page-header .control-group {
margin-top:16px !important;
width: 100% !important;
margin-left: 0px !important;
}
}
</style>