Merge pull request #1346 from prateek-webkul/master

#1338 issue fixed
This commit is contained in:
Jitendra Singh 2019-08-23 13:38:45 +05:30 committed by GitHub
commit 6169d7cc8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 88 additions and 77 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{ {
"/js/admin.js": "/js/admin.js?id=d27aed3da0c62eb237be", "/js/admin.js": "/js/admin.js?id=d4f31671591cde63824d",
"/css/admin.css": "/css/admin.css?id=96d341f257529071e8e7" "/css/admin.css": "/css/admin.css?id=e9178754dd7096a8f7a0"
} }

View File

@ -27,7 +27,7 @@ body {
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 10px; border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
} }
.navbar-top { .navbar-top {
@ -211,8 +211,12 @@ body {
.page-header { .page-header {
display: inline-block; display: inline-block;
margin-bottom: 20px;
width: 100%; width: 100%;
padding: 15px 0px 15px 0px;
position: sticky;
top: 60px;
background-color: #ffffff;
z-index: 3;
.page-title { .page-title {
float: left; float: left;
@ -274,7 +278,7 @@ body {
.control { .control {
background: #fff; background: #fff;
border: 2px solid #C7C7C7; border: 2px solid #c7c7c7;
@include border-radius(3px); @include border-radius(3px);
width: 150px; width: 150px;
height: 36px; height: 36px;
@ -285,7 +289,7 @@ body {
font-size: 15px; font-size: 15px;
&:focus { &:focus {
border-color: #0041FF; border-color: #0041ff;
} }
} }
@ -315,7 +319,7 @@ body {
.locale { .locale {
float: right; float: right;
color: #8E8E8E; color: #8e8e8e;
} }
} }
@ -325,10 +329,8 @@ body {
} }
} }
// admin dashboard css // admin dashboard css
.dashboard { .dashboard {
.page-header { .page-header {
margin-bottom: 0 !important; margin-bottom: 0 !important;
padding-bottom: 15px; padding-bottom: 15px;
@ -341,16 +343,16 @@ body {
.card { .card {
height: 445px; height: 445px;
background: #FFFFFF; background: #ffffff;
border: 1px solid #E7E7E7; border: 1px solid #e7e7e7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); box-shadow: 0 5px 10px 2px rgba(0, 0, 0, 0.08);
border-radius: 2px; border-radius: 2px;
padding: 20px 0px 0px 20px; padding: 20px 0px 0px 20px;
overflow: auto; overflow: auto;
.card-title { .card-title {
font-size: 14px; font-size: 14px;
color: #A2A2A2; color: #a2a2a2;
letter-spacing: -0.26px; letter-spacing: -0.26px;
text-transform: uppercase; text-transform: uppercase;
} }
@ -378,7 +380,7 @@ body {
margin-right: 15px; margin-right: 15px;
&.product { &.product {
background: #F2F2F2; background: #f2f2f2;
} }
img { img {
@ -390,11 +392,11 @@ body {
margin-top: 10px; margin-top: 10px;
.name { .name {
color: #0041FF; color: #0041ff;
} }
.info { .info {
color: #3A3A3A; color: #3a3a3a;
margin-top: 5px; margin-top: 5px;
} }
} }
@ -417,7 +419,7 @@ body {
p { p {
margin: 0; margin: 0;
color: #A2A2A2; color: #a2a2a2;
} }
} }
} }
@ -432,28 +434,27 @@ body {
.dashboard-card { .dashboard-card {
height: 100px; height: 100px;
background: #FFFFFF; background: #ffffff;
border: 1px solid #E7E7E7; border: 1px solid #e7e7e7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); box-shadow: 0 5px 10px 2px rgba(0, 0, 0, 0.08);
border-radius: 5px; border-radius: 5px;
position: relative; position: relative;
padding: 15px; padding: 15px;
.title { .title {
font-size: 14px; font-size: 14px;
color: #A2A2A2; color: #a2a2a2;
text-transform: uppercase; text-transform: uppercase;
} }
.data { .data {
padding-top: 13px; padding-top: 13px;
font-size: 32px; font-size: 32px;
color: #0041FF; color: #0041ff;
.progress { .progress {
font-size: 14px; font-size: 14px;
color: #8E8E8E; color: #8e8e8e;
float: right; float: right;
margin-top: -2px; margin-top: -2px;
@ -503,7 +504,7 @@ body {
.secton-title { .secton-title {
font-size: 18px; font-size: 18px;
color: #8E8E8E; color: #8e8e8e;
padding: 15px 0; padding: 15px 0;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
} }
@ -553,7 +554,6 @@ body {
float: right; float: right;
tr { tr {
td { td {
padding: 5px 8px; padding: 5px 8px;
} }
@ -584,7 +584,8 @@ body {
.export-import { .export-import {
cursor: pointer; cursor: pointer;
.export-icon, .import-icon { .export-icon,
.import-icon {
position: relative; position: relative;
top: 10px; top: 10px;
} }
@ -619,7 +620,8 @@ body {
padding-top: 15px; padding-top: 15px;
border-top: 1px solid rgba(162, 162, 162, 0.2); border-top: 1px solid rgba(162, 162, 162, 0.2);
.close-icon, .open-icon { .close-icon,
.open-icon {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
left: 45%; left: 45%;
@ -762,7 +764,7 @@ body {
// ui // ui
.grid-container { .grid-container {
.filter-row-one .search-filter { .filter-row-one .search-filter {
border: 2px solid #C7C7C7; border: 2px solid #c7c7c7;
border-radius: 2px; border-radius: 2px;
.control { .control {
@ -774,13 +776,14 @@ body {
border: none; border: none;
padding-top: 2px; padding-top: 2px;
padding-right: 5px; padding-right: 5px;
border-right: 2px solid #C7C7C7; border-right: 2px solid #c7c7c7;
border-radius: 0px; border-radius: 0px;
} }
} }
.filter-row-two .filter-tag { .filter-row-two .filter-tag {
.wrapper, .icon.cross-icon { .wrapper,
.icon.cross-icon {
margin-right: 10px; margin-right: 10px;
margin-left: 0px; margin-left: 0px;
} }
@ -792,8 +795,15 @@ body {
} }
} }
.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header span { .grid-container
padding-right: 5px; .filter-wrapper
.filter-row-one
.dropdown-filters
.more-filters
.dropdown-toggle
.dropdown-header
span {
padding-right: 5px;
} }
.grid-container .table tbody td.action a:first-child { .grid-container .table tbody td.action a:first-child {
@ -830,13 +840,14 @@ body {
.tree-container .tree-item { .tree-container .tree-item {
padding-right: 30px; padding-right: 30px;
.expand-icon ,.folder-icon { .expand-icon,
.folder-icon {
margin-left: 10px; margin-left: 10px;
margin-right: 0px; margin-right: 0px;
} }
} }
.tree-container >.tree-item { .tree-container > .tree-item {
padding-right: 0px; padding-right: 0px;
} }
@ -855,7 +866,7 @@ body {
.control-group label.required::before { .control-group label.required::before {
content: "*"; content: "*";
color: #FC6868; color: #fc6868;
font-weight: 700; font-weight: 700;
} }
@ -898,4 +909,4 @@ body {
.pagination { .pagination {
margin-top: 30px; margin-top: 30px;
} }

View File

@ -14,7 +14,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submi t" class="btn btn-lg btn-primary"> <button type="submi t" class="btn btn-lg btn-primary">
{{ __('admin::app.account.save-btn-title') }} {{ __('admin::app.account.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.attributes.save-btn-title') }} {{ __('admin::app.catalog.attributes.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.attributes.save-btn-title') }} {{ __('admin::app.catalog.attributes.save-btn-title') }}
</button> </button>

View File

@ -18,7 +18,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.categories.save-btn-title') }} {{ __('admin::app.catalog.categories.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.families.save-btn-title') }} {{ __('admin::app.catalog.families.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.families.save-btn-title') }} {{ __('admin::app.catalog.families.save-btn-title') }}
</button> </button>

View File

@ -32,7 +32,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.products.save-btn-title') }} {{ __('admin::app.catalog.products.save-btn-title') }}
</button> </button>

View File

@ -47,7 +47,7 @@
</div> </div>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.products.save-btn-title') }} {{ __('admin::app.catalog.products.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.cms.pages.create-btn-title') }} {{ __('admin::app.cms.pages.create-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button id="preview" class="btn btn-lg btn-primary"> <button id="preview" class="btn btn-lg btn-primary">
{{ __('admin::app.cms.pages.preview') }} {{ __('admin::app.cms.pages.preview') }}
</button> </button>

View File

@ -19,7 +19,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.customers.customers.save-btn-title') }} {{ __('admin::app.customers.customers.save-btn-title') }}
</button> </button>

View File

@ -19,7 +19,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.customers.customers.save-btn-title') }} {{ __('admin::app.customers.customers.save-btn-title') }}
</button> </button>

View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save-btn-title') }} {{ __('admin::app.promotion.save-btn-title') }}
</button> </button>

View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save') }} {{ __('admin::app.promotion.save') }}
</button> </button>

View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save-btn-title') }} {{ __('admin::app.promotion.save-btn-title') }}
</button> </button>

View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.edit-btn-title') }} {{ __('admin::app.promotion.edit-btn-title') }}
</button> </button>

View File

@ -18,7 +18,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.invoices.save-btn-title') }} {{ __('admin::app.sales.invoices.save-btn-title') }}
</button> </button>

View File

@ -18,7 +18,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.shipments.save-btn-title') }} {{ __('admin::app.sales.shipments.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.channels.save-btn-title') }} {{ __('admin::app.settings.channels.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.channels.save-btn-title') }} {{ __('admin::app.settings.channels.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.currencies.save-btn-title') }} {{ __('admin::app.settings.currencies.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.currencies.save-btn-title') }} {{ __('admin::app.settings.currencies.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.exchange_rates.save-btn-title') }} {{ __('admin::app.settings.exchange_rates.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.exchange_rates.save-btn-title') }} {{ __('admin::app.settings.exchange_rates.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.inventory_sources.save-btn-title') }} {{ __('admin::app.settings.inventory_sources.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.inventory_sources.save-btn-title') }} {{ __('admin::app.settings.inventory_sources.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.locales.save-btn-title') }} {{ __('admin::app.settings.locales.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.locales.save-btn-title') }} {{ __('admin::app.settings.locales.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.sliders.save-btn-title') }} {{ __('admin::app.settings.sliders.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.sliders.save-btn-title') }} {{ __('admin::app.settings.sliders.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-categories.save-btn-title') }} {{ __('admin::app.settings.tax-categories.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-categories.save-btn-title') }} {{ __('admin::app.settings.tax-categories.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-rates.save-btn-title') }} {{ __('admin::app.settings.tax-rates.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-rates.edit-title') }} {{ __('admin::app.settings.tax-rates.edit-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.roles.save-btn-title') }} {{ __('admin::app.users.roles.save-btn-title') }}
</button> </button>

View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.roles.save-btn-title') }} {{ __('admin::app.users.roles.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.users.save-btn-title') }} {{ __('admin::app.users.users.save-btn-title') }}
</button> </button>

View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.users.save-btn-title') }} {{ __('admin::app.users.users.save-btn-title') }}
</button> </button>