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

Merge pull request #2038 from jitendra-webkul/1.0 

Issue #1795 fixed
This commit is contained in:
Jitendra Singh 2020-01-13 13:18:25 +05:30 committed by GitHub
parent 1e18cebb00 3368eb5ba5
commit a42724d5f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/Webkul/Product/src/Database/Migrations/2020_01_13_131431_alter_float_value_column_type_in_product_attribute_values_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AlterFloatValueColumnTypeInProductAttributeValuesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('product_attribute_values', function (Blueprint $table) {
$table->decimal('float_value', 12, 4)->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('product_attribute_values', function (Blueprint $table) {
//
});
}
}

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=a334736d96c5c4f998c7",
"/css/shop.css": "/css/shop.css?id=8be949eb4e7bf4e5a55b"
"/css/shop.css": "/css/shop.css?id=6ded8c6338e6cf59a094"
}

6
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -214,6 +214,7 @@ input {
margin-bottom: 14px;
width: 100%;
font-weight: 600;
word-break: break-all;
.price-label {
font-size: 14px;
@ -1778,6 +1779,7 @@ section.product-detail {
.product-price {
margin-bottom: 14px;
word-break: break-all;
.sticker {
display: none;
@ -1806,6 +1808,7 @@ section.product-detail {
.product-price {
margin-bottom: 15px;
word-break: break-all;
.special-price {
font-size: 24px;
@ -1923,6 +1926,7 @@ section.product-detail {
margin-top: 5px;
margin-bottom: 0;
font-size: 14px;
word-break: break-all;
.special-price {
font-size: 16px;
@ -2974,6 +2978,7 @@ section.review {
.product-price {
margin-top: 10px;
word-break: break-all;
.pro-price {
color: $disc-price;
@ -3133,6 +3138,7 @@ section.review {
max-width: 280px;
margin-left: auto;
margin-right: auto;
word-break: break-all;
}
}