From 06d9939ddbfce52ee681b2c6b74938fa8b974f64 Mon Sep 17 00:00:00 2001 From: sovanna Date: Mon, 2 Mar 2020 22:27:31 +0900 Subject: [PATCH] fix(issue21): Adds precision + BP adapter and updates styles --- sass/css/_shop.scss | 10 ++++++---- static/css/order-hardware.css | 17 +++++++++++++++++ static/js/shop.jsx | 2 +- static/js/shop_data.js | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sass/css/_shop.scss b/sass/css/_shop.scss index 23d77c1..6b4de1c 100644 --- a/sass/css/_shop.scss +++ b/sass/css/_shop.scss @@ -156,11 +156,12 @@ button { margin: 2rem 0; > .summary-price { - flex: 1; + /*flex: 1;*/ font-size: .8rem; + width: 50%; table { - max-width: 450px; + /*max-width: 450px;*/ } .summary-remove-all { @@ -237,7 +238,8 @@ button { } > .summary-form { - flex: 1; + /*flex: 1;*/ + width: 50%; display: flex; flex-direction: column; align-items: flex-end; @@ -245,7 +247,7 @@ button { form { display: flex; flex-direction: column; - width: 80%; + width: 90%; input:not([type="submit"]), textarea { diff --git a/static/css/order-hardware.css b/static/css/order-hardware.css index 472942b..1799148 100644 --- a/static/css/order-hardware.css +++ b/static/css/order-hardware.css @@ -105,6 +105,11 @@ display: flex !important; justify-content: space-between; } + + #root-shop .panel .summary>.summary-price, + #root-shop .panel .summary>.summary-form { + width: 100%; + } } /* ##Device = Tablets, Ipads (landscape) @@ -169,6 +174,10 @@ #root-shop .panel .summary>.summary-form form input[type="submit"] { margin-bottom: 1em; } + #root-shop .panel .summary>.summary-price, + #root-shop .panel .summary>.summary-form { + width: 100%; + } } /* ##Device = Low Resolution Tablets, Mobiles (Landscape) @@ -366,6 +375,10 @@ overflow-y: scroll; height: 100%; } + #root-shop .panel .summary>.summary-price, + #root-shop .panel .summary>.summary-form { + width: 100%; + } } /* ##Device = Most of the Smartphones Mobiles (Portrait) @@ -559,4 +572,8 @@ overflow-y: scroll; height: 100%; } + #root-shop .panel .summary>.summary-price, + #root-shop .panel .summary>.summary-form { + width: 100%; + } } \ No newline at end of file diff --git a/static/js/shop.jsx b/static/js/shop.jsx index 27f5f92..825a7b4 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -993,7 +993,7 @@ class OrderSumary extends React.PureComponent { onMouseLeave={this.handleOnMouseLeaveItem}> -
{`${item.name_number} ${item.name}`}
+
{`${item.name_number} ${item.name} ${item.name_codename}`}
diff --git a/static/js/shop_data.js b/static/js/shop_data.js index cf224a6..f484c2b 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -99,7 +99,7 @@ const shop_data = { id: 'kasli-backplane', name: 'Processor', name_number: '1123', - name_codename: 'Kasli', + name_codename: 'Kasli + BP adapter', price: 3830, image: '/shop/graphic-03_kasli-with-backplane.svg', specs: [