From 3b2118a7b92748f2cdad266152ddf81010287f04 Mon Sep 17 00:00:00 2001 From: MikunoNaka Date: Mon, 26 Apr 2021 20:03:02 +0530 Subject: modified the colorscheme now it looks pog --- src/components/Display/Display.css | 4 ++++ src/components/Display/Display.scss | 5 +++++ src/components/Display/SummaryDisplay.js | 18 +++++++++--------- src/components/Form/Form.css | 4 ++-- src/components/Form/Form.scss | 2 +- src/styles/_theme.scss | 2 +- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/components/Display/Display.css b/src/components/Display/Display.css index 21a9815..c5917e3 100644 --- a/src/components/Display/Display.css +++ b/src/components/Display/Display.css @@ -59,3 +59,7 @@ $defShadow: 0px 0px 4px #232627; .SummaryDisplay td { font-size: 1.25rem; padding: 0.2rem 0; } + +.SummaryDisplay .grandTotal td { + font-size: 2rem; + color: #FF79C6; } diff --git a/src/components/Display/Display.scss b/src/components/Display/Display.scss index 3c49b7e..7754eb5 100644 --- a/src/components/Display/Display.scss +++ b/src/components/Display/Display.scss @@ -60,3 +60,8 @@ font-size: 1.25rem; padding: 0.2rem 0; } + +.SummaryDisplay .grandTotal td { + font-size: 2rem; + color: $altFG; +} diff --git a/src/components/Display/SummaryDisplay.js b/src/components/Display/SummaryDisplay.js index d823713..2515df8 100644 --- a/src/components/Display/SummaryDisplay.js +++ b/src/components/Display/SummaryDisplay.js @@ -36,12 +36,12 @@ const getFullSummary = (items) => { const totalRoundedOff = Math.abs(totalPriceAfterTax - Math.round(totalPriceAfterTax)); return ( { - "TotalRawPrice": totalRawPrice.toFixed(2), - "TotalDiscountPrice": totalDiscount.toFixed(2), - "TotalPriceAfterDiscount": (totalRawPrice - totalDiscount).toFixed(2), - "TotalTaxAmount": totalTax.toFixed(2), - "TotalPriceAfterTax": totalPriceAfterTax.toFixed(2), - "RoundedOff": totalRoundedOff.toFixed(2), + "TotalRawPrice": parseFloat(totalRawPrice.toFixed(2)), + "TotalDiscountPrice": parseFloat(totalDiscount.toFixed(2)), + "TotalPriceAfterDiscount": parseFloat((totalRawPrice - totalDiscount).toFixed(2)), + "TotalTaxAmount": parseFloat(totalTax.toFixed(2)), + "TotalPriceAfterTax": parseFloat(totalPriceAfterTax.toFixed(2)), + "RoundedOff": parseFloat(totalRoundedOff.toFixed(2)), "TotalPrice": Math.round(totalPriceAfterTax) } ); @@ -76,7 +76,7 @@ const SummaryDisplay = (props) => { {summary.TotalRawPrice} - {true &&// summary.TotalDiscountPrice !== 0 && + {summary.TotalDiscountPrice !== 0.00 && After Discount {summary.TotalPriceAfterDiscount} @@ -90,14 +90,14 @@ const SummaryDisplay = (props) => { (+{summary.TotalTaxAmount}) - {true && //summary.RoundedOff !== 0 && + {summary.RoundedOff !== 0.00 && Rounded Off {summary.RoundedOff} } - + Grand Total {summary.TotalPrice} diff --git a/src/components/Form/Form.css b/src/components/Form/Form.css index af1baa6..def42e5 100644 --- a/src/components/Form/Form.css +++ b/src/components/Form/Form.css @@ -32,7 +32,7 @@ label { .addNewItemForm .textInputs, .addNewItemForm .numericInputs { - border: 1px dashed #FF79C6; + border: 1px solid pink; width: 30%; justify-content: space-around; } @@ -40,7 +40,7 @@ label { width: 5.5rem; } .addNewItemForm .menuButtons { - border: 1px dashed #FF79C6; + border: 1px solid pink; width: 15%; justify-content: space-around; } diff --git a/src/components/Form/Form.scss b/src/components/Form/Form.scss index 9d4a688..c9cb19c 100644 --- a/src/components/Form/Form.scss +++ b/src/components/Form/Form.scss @@ -1,6 +1,6 @@ @import "../../styles/theme"; -$inputBorders: 1px dashed $altFG; +$inputBorders: 1px solid $altBorderColor; .formContainer { /*border: 1px solid pink;*/ diff --git a/src/styles/_theme.scss b/src/styles/_theme.scss index ef6863f..6a37dab 100644 --- a/src/styles/_theme.scss +++ b/src/styles/_theme.scss @@ -23,7 +23,7 @@ $altFG: #FF79C6; $defLink: $defFG; $altLink: $altFG; $defBorderColor: lightgreen; -$altBorderColor: #FF79C6; +$altBorderColor: pink; $tableDefBorderColor: lightblue; $tableAltBorderColor: #FF79C6; -- cgit v1.2.3