Merge pull request #496 from ahslr/web-2.0

Web 2.0
hollaex · Jan 25, 2021 · e042445 · e042445
2 parents db95a05 + 0ba8692
commit e042445
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 25 deletions.
diff --git a/web/src/containers/OperatorControls/components/AddTheme.js b/web/src/containers/OperatorControls/components/AddTheme.js
@@ -220,15 +220,15 @@ class AddTheme extends Component {
 						<Radio value={false}>
 							<Tooltip
 								overlayStyle={{ zIndex: 10001 }}
-								title="Separated base theme definition"
+								title="Edit multiple colors in the theme separately"
 							>
 								Use separated base
 							</Tooltip>
 						</Radio>
 						<Radio value={true}>
 							<Tooltip
 								overlayStyle={{ zIndex: 10001 }}
-								title="single base theme definition"
+								title="Easily edit the whole theme through a single base background color"
 							>
 								Use single base
 							</Tooltip>

diff --git a/web/src/containers/Trade/_Trade.scss b/web/src/containers/Trade/_Trade.scss
@@ -36,7 +36,13 @@ $order_entry-column--width-lg: 20rem;
 	color: $trade-bids-color-font;
 }
 
+.trade_history-row-wrapper {
+	margin: 1px 0;
+}
+
 .trade_history-row {
+	height: 100%;
+
 	.trade_history-icon {
 		width: 1rem;
 		margin-right: 3px;

diff --git a/web/src/containers/Trade/components/TradeHistory.js b/web/src/containers/Trade/components/TradeHistory.js
@@ -163,7 +163,11 @@ class TradeHistory extends Component {
 		const { data } = this.state;
 		return (
 			<div className="apply_rtl trade_history-wrapper">
-				<DisplayTable headers={this.state.headers} data={data} />
+				<DisplayTable
+					headers={this.state.headers}
+					data={data}
+					rowClassName="trade_history-row-wrapper"
+				/>
 			</div>
 		);
 	}

diff --git a/web/src/containers/Trade/components/_Orderbook.scss b/web/src/containers/Trade/components/_Orderbook.scss
@@ -1,5 +1,5 @@
 .trade_orderbook-wrapper {
-	height: 100vh;
+	height: 84vh;
 	.trade_orderbook-cell {
 		padding: 0 0.25rem;
 		.ant-select-arrow {

diff --git a/web/src/containers/Trade/components/_TradeBlock.scss b/web/src/containers/Trade/components/_TradeBlock.scss
@@ -138,7 +138,7 @@ $tabs-title--margin: 2rem;
 }
 
 .trade_history-wrapper {
-	height: 100vh;
+	height: 84vh;
 
 	.display_table-wrapper {
 		.display_table-header {

diff --git a/web/src/index.css b/web/src/index.css
@@ -1711,7 +1711,7 @@ table th {
   margin-left: 2rem; }
 
 .trade_history-wrapper {
-  height: 100vh; }
+  height: 84vh; }
   .trade_history-wrapper .display_table-wrapper .display_table-header :nth-child(2) {
     text-align: center; }
   .trade_history-wrapper .display_table-wrapper .display_table-body .display_table-cell :nth-child(2),
@@ -1895,7 +1895,7 @@ table th {
   margin: auto; }
 
 .trade_orderbook-wrapper {
-  height: 100vh; }
+  height: 84vh; }
   .trade_orderbook-wrapper .trade_orderbook-cell {
     padding: 0 0.25rem; }
     .trade_orderbook-wrapper .trade_orderbook-cell .ant-select-arrow {
@@ -1998,25 +1998,28 @@ table th {
 .sell {
   color: var(--trading_buying-related-elements); }
 
-.trade_history-row .trade_history-icon {
-  width: 1rem;
-  margin-right: 3px; }
+.trade_history-row-wrapper {
+  margin: 1px 0; }
 
-.trade_history-row.sell {
-  color: var(--trading_selling-related-elements); }
-  .trade_history-row.sell .trade_history-icon svg .up-icon,
-  .trade_history-row.sell .trade_history-icon svg .down-icon {
-    fill: var(--trading_selling-related-elements); }
-  .trade_history-row.sell .trade_history-icon svg polygon {
-    fill: var(--calculated_trading_selling-related-text); }
-
-.trade_history-row.buy {
-  color: var(--trading_buying-related-elements); }
-  .trade_history-row.buy .trade_history-icon svg .up-icon,
-  .trade_history-row.buy .trade_history-icon svg .down-icon {
-    fill: var(--trading_buying-related-elements); }
-  .trade_history-row.buy .trade_history-icon svg polygon {
-    fill: var(--calculated_trading_buying-related-text); }
+.trade_history-row {
+  height: 100%; }
+  .trade_history-row .trade_history-icon {
+    width: 1rem;
+    margin-right: 3px; }
+  .trade_history-row.sell {
+    color: var(--trading_selling-related-elements); }
+    .trade_history-row.sell .trade_history-icon svg .up-icon,
+    .trade_history-row.sell .trade_history-icon svg .down-icon {
+      fill: var(--trading_selling-related-elements); }
+    .trade_history-row.sell .trade_history-icon svg polygon {
+      fill: var(--calculated_trading_selling-related-text); }
+  .trade_history-row.buy {
+    color: var(--trading_buying-related-elements); }
+    .trade_history-row.buy .trade_history-icon svg .up-icon,
+    .trade_history-row.buy .trade_history-icon svg .down-icon {
+      fill: var(--trading_buying-related-elements); }
+    .trade_history-row.buy .trade_history-icon svg polygon {
+      fill: var(--calculated_trading_buying-related-text); }
 
 .layout-mobile .trade_active_orders-wrapper {
   max-height: 35vh !important;