Merge pull request #1821 from bitshares/develop

Include Exchange redesign
bitshares · Sep 6, 2018 · 1d694ac · 1d694ac
2 parents e019742 + 8b96c9e
commit 1d694ac
Show file tree

Hide file tree

Showing 36 changed files with 2,170 additions and 1,469 deletions.
diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Platzieren Sie Kaufaufträge über dieses Formular.",
         "buy_orders": "Sehen Sie alle Kaufaufträge für diesen Markt an.",

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -1,5 +1,7 @@
 {
     "account": {
+        "history_error":
+            "Failed to download the account history, please try again",
         "accounts": "Accounts",
         "activity": "Activity",
         "advanced": "Advanced",
@@ -101,7 +103,7 @@
             "premium_name_warning": "This is a premium name which is more expensive than a name containing a dash (-) or a number."
         },
         "new_user": "New user?",
-        "no_orders": "No open orders",
+        "no_orders": "No orders",
         "no_price": "--",
         "open_orders": "Open Orders",
         "optional": {
@@ -453,7 +455,10 @@
         "borrow": "Borrow",
         "borrow_short": "Borrow",
         "buy": "Buy",
-        "buy_description": "Buy %(baseAsset)s %(baseName)s for %(quoteAsset)s %(quoteName)s",
+        "buy_sell": "Buy/Sell",
+        "buy_quick": "Quick Buy",
+        "buy_description":
+            "Buy %(baseAsset)s %(baseName)s for %(quoteAsset)s %(quoteName)s",
         "buy_min": "Buy at least",
         "buysell_formatter": "{direction} {asset}",
         "call": "Call Price",
@@ -484,6 +489,14 @@
         "invalid_price": "Invalid price",
         "invert": "Invert the price",
         "latest": "Latest",
+        "layout": {
+            "title": "Layout",
+            "1": "Horizontal Orderbook Left",
+            "2": "Horizontal Orderbook Right",
+            "3": "Vertical Orderbook, Combined Details",
+            "4": "Vertical Orderbook, Separated Details",
+            "5": "Vertical Orderbook, Original Layout"
+        },
         "lowest_ask": "Lowest ask",
         "maintenance": "Maintenance Call Price",
         "market": "Market",
@@ -515,6 +528,7 @@
         "no_bids": "No bids",
         "no_data": "No data",
         "no_orders": "No orders",
+        "order_book": "Order Book",
         "order_depth": "Market Depth",
         "others": "Others",
         "overbought": "Overbought",
@@ -533,12 +547,12 @@
         "search": "Search for more markets here",
         "sell": "Sell",
         "sell_description": "Sell %(baseAsset)s %(baseName)s for %(quoteAsset)s %(quoteName)s",
-        "settings": "Chart options",
+        "settings": "Settings",
         "settle": "Settlement",
         "settle_orders": "Settle orders",
         "short": "Short",
-        "show_asks": "Show all asks",
-        "show_bids": "Show all bids",
+        "show_asks": "Show all %(ordercount)s asks",
+        "show_bids": "Show all %(ordercount)s bids",
         "show_only_liquid": "Show liquid markets only",
         "show_only_star_formatter": "Show {star_icon} only",
         "sma": "Simple Moving Average",
@@ -909,6 +923,7 @@
         "your_account": "Your account"
     },
     "global": {
+        "close": "Close",
         "cancel": "Cancel",
         "confirm": "Confirm",
         "help": "Help",
@@ -1654,6 +1669,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Place buy orders using this form.",
         "buy_orders": "View all buy orders for this market.",

diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Coloque las órdenes de compra usando este formulario.",
         "buy_orders": "Ver todas las órdenes de compra para este mercado.",

diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Placez les ordres d'achat en utilisant ce formulaire.",
         "buy_orders": "Voir toutes les commandes d'achat pour ce marché.",

diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Inserisci ordini di acquisto utilizzando questo modulo.",
         "buy_orders": "Visualizza tutti gli ordini di acquisto per questo mercato.",

diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "このフォームを使用して買い注文を出します。",
         "buy_orders": "この市場のすべての買い注文を表示する。",

diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "이 양식을 사용하여 구매 주문을하십시오.",
         "buy_orders": "이 시장에 대한 모든 구매 주문을보십시오.",

diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
@@ -1653,6 +1653,11 @@
         "total_x_markets": "Всего %(count)s рынков",
         "total_x_operations": "Всего %(count)s операций"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Разместить заявки на покупку, используя эту форму.",
         "buy_orders": "Просмотреть все заявки на покупку для этого рынка.",

diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json
@@ -1652,6 +1652,11 @@
         "total_x_markets": "Total of %(count)s markets",
         "total_x_operations": "Total of %(count)s operations"
     },
+    "utility": {
+        "total_x_assets": "Total of %(count)s assets",
+        "total_x_items": "Total of %(count)s items",
+        "total_x_operations": "Total of %(count)s operations"
+    },
     "walkthrough": {
         "buy_form": "Bu formu kullanarak satın alma siparişleri verin.",
         "buy_orders": "Bu pazar için tüm satınalma siparişlerini görüntüleyin.",

diff --git a/app/assets/stylesheets/components/_exchange.scss b/app/assets/stylesheets/components/_exchange.scss
@@ -3,8 +3,33 @@ div#CenterContent {
 }
 
 .market-layout {
-    > .grid-block {
-        // padding: 0.25rem 0.25rem 0.25rem 0.25rem !important;
+    .column-header {
+        width: 100%;
+        padding-right: 10px;
+
+        > ul {
+            list-style-type: none;
+            margin-left: 0px;
+            width: 100%;
+            margin-bottom: 0px;
+
+            > li {
+                font-size: 80%;
+                cursor: pointer;
+                display: inline-block;
+                margin-right: 15px;
+                text-transform: uppercase;
+            }
+
+            > li.last {
+                margin-right: 0px;
+            }
+
+            li.active {
+                cursor: default;
+            }
+        }
+
     }
 
     > .left-column {
@@ -55,13 +80,17 @@ div#CenterContent {
     > thead > tr > th {
         font-size: 14px;
         padding: 5px 5px;
-        text-align: right;
+        text-align: right !important;
     }
 
     > tbody > tr > td {
         font-size: 12px;
         padding-bottom: 4px;
     }
+
+    .sticky-table-container  {
+        width: 100%;
+    }
 }
 
 .my-orders {
@@ -138,7 +167,7 @@ form.order-form {
     .transition-container {
         display: table-row-group;
     }
-    > .table-container {
+    .table-container {
         flex-grow: 1;
         width: 100%;
         position: relative;
@@ -195,16 +224,16 @@ form.order-form {
             }
         }
     }
-    .bottom-header {
+    .column {
         width: 100%;
-        height: 2rem;
+        height: 3rem;
         .button.outline {
             border-left: none;
         }
     }
     .order-table-container {
         width: 100%;
-        height: calc(100% - 32px);
+        height: calc(100% - 6rem);
     }
     .top-header {
         text-align: right;
@@ -378,6 +407,8 @@ div.bucket-option {
     font-size: 90%;
     line-height: 1.75rem;
     height: 1.75rem;
+    white-space: nowrap;
+    z-index: 100; // Make sure unwrapped content isn't hidden under companion input
 }
 
 .buy-sell-input {
@@ -463,7 +494,9 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 .market-right-padding-only {
-    padding: 0 0.6rem 0 0 !important;
+    table td:nth-last-child(1), table th:nth-last-child(1) {
+        padding: 0 0.6rem 0 0 !important;
+    }
 }
 
 .mymarkets-header {
@@ -482,7 +515,7 @@ input[type="number"]::-webkit-outer-spin-button {
     font-size: 1rem;
     font-weight: 500;
     text-transform: uppercase;
-    padding: 6px 10px;
+    padding: 10px 0px 20px 20px;
     overflow: hidden;
 }
 
@@ -510,6 +543,12 @@ table thead tr th.mymarkets-header {
     padding-bottom: 9px !important;
 }
 
+.table-no-padding {
+    tr, td { 
+        padding: 0px !important;
+    }
+}
+
 .title-star {
     width: 1.25rem;
     height: 1.25rem;
@@ -566,6 +605,11 @@ table thead tr th.mymarkets-header {
         display: none !important;
     }
 }
+@media (max-width: 1340px) {
+    .hide-order-6 {
+        display: none !important;
+    }
+}
 
 .no-data {
     position: relative;
@@ -695,13 +739,25 @@ tbody.orderbook > tr.my-order > td {
     font-weight: bold;
 }
 
+.vertical-panel {
+    .vp__header {
+        border-bottom: 1px solid white;
+        margin: 10px;
+        padding-bottom: 10px;
+
+        > span {
+            padding-bottom: 2px;
+            margin-right: 10px;
+        }
+
+        > span.selected,
+        > span:hover {
+            border-bottom: 5px solid cyan;
+        }
+    }
+}
+
 .marketPicker {
-    border: 1px solid black;
-    position: absolute;
-    z-index: 100;
-    width: 400px;
-    min-height: 300px;
-    padding: 10px;
 
     .marketPicker__header {
         padding: 0 5px;
@@ -752,3 +808,9 @@ tbody.orderbook > tr.my-order > td {
         }
     }
 }
+
+// DatePicker Layer Issues
+.tether-element {
+    z-index: 100;
+}
+
diff --git a/app/assets/stylesheets/components/_modal.scss b/app/assets/stylesheets/components/_modal.scss
@@ -1,5 +1,12 @@
 // Modals with specific width
 
+#marketPicker.modal, #settingsModal.modal {
+    position: absolute;
+    max-width: 400px;
+    padding: 0px;
+    border-radius: 0px;
+}
+
 .modal#send_modal_header,
 .modal#send_modal_portfolio,
 .modal#simple_bridge_modal,
@@ -135,9 +142,3 @@
     text-transform: none !important;
 }
 
-// Ant Overrides
-label.ant-checkbox-wrapper {
-    > span {
-        text-transform: none;
-    }
-}
diff --git a/app/assets/stylesheets/layout/_all.scss b/app/assets/stylesheets/layout/_all.scss
@@ -1 +1,2 @@
-@import "page_layout";
+@import "page_layout";
+@import "antd";