fix(scrollbars): Attempt to re-establish the previous state on scroll…

…able areas.
beregovoy68 · Nov 23, 2016 · 5f67d50 · 5f67d50
1 parent f2d2f7d
commit 5f67d50
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/css/style.css b/src/css/style.css
@@ -1041,6 +1041,11 @@ span.tabs-radio img.selected {
     padding-top: 1rem;
 }
 
+#wallet-transaction-history {
+
+    overflow-y: scroll !important;
+}
+
 #wB-butSend-WAV {
     padding-bottom: 2rem;
 }
@@ -1163,6 +1168,10 @@ span.tabs-radio img.selected {
     opacity: .6;
 }
 
+#latestBlocks {
+    overflow-y: scroll !important;
+}
+
 .wavesTable-txUnc {
     -webkit-animation: opacity_change 1s infinite alternate ease-in-out;
     animation: opacity_change 1s infinite alternate ease-in-out;
@@ -1602,8 +1611,8 @@ span.tabs-radio img.selected {
     text-align: center;
 }
 
-#mBB-history .wavesTable {
-    /*    border: 1px solid red;*/
+#full-transaction-history {
+    overflow-y: scroll;
 }
 
 .wavesDD {

diff --git a/src/index.html b/src/index.html
@@ -387,8 +387,8 @@ <h2 class="sectionHeader">SEND PAYMENT</h2>
                                     on-withdraw="wallet.withdraw(currency)" on-trade="wallet.trade(currency)"></wallet-box>
                     </div>
                     <div id="wallet-transaction-history" class="wavesTable">
+                        <h2 class="sectionHeader">LATEST TRANSACTIONS</h2>
                         <table>
-                            <h2 class="sectionHeader">LATEST TRANSACTIONS</h2>
                             <thead>
                             <tr>
                                 <td>DATE</td>
@@ -597,10 +597,10 @@ <h2 class="sectionHeader">ASSET REISSUE</h2>
                                 </form>
                             </div>
                             <div id="asset-reissue-confirm-dialog" waves-dialog ok-button-caption="CONFIRM" ok-button-enabled="!reissue.confirm.reissuePending" on-dialog-ok="reissue.broadcastTransaction()">
-                                <p>You are issuing additional amount of <span class="confirmation-value">{{reissue.confirm.amount.value}}</span> tokens <br/>
+                                <p>You are issuing an additional amount of <span class="confirmation-value">{{reissue.confirm.amount.value}}</span> tokens <br/>
                                     to the asset <span class="confirmation-value">{{reissue.confirm.amount.currency}}</span>
-                                    with <span class="confirmation-value">{{reissue.confirm.fee.value}}</span>
-                                    <span class="confirmation-value">{{reissue.confirm.fee.currency}}</span> fee
+                                    with a fee of <span class="confirmation-value">{{reissue.confirm.fee.value}}</span>
+                                    <span class="confirmation-value">{{reissue.confirm.fee.currency}}</span>
                                 </p>
                                 <p>Please <span class="fontBold"> CONFIRM </span>to execute or <span class="fontBold"> CANCEL </span> to discard.</p>
                             </div>
@@ -642,7 +642,7 @@ <h1>DECENTRALIZED VOTING</h1>
                 <!-- HISTORY TAB -->
                 <div id="mBB-history" class="mBB-content" ng-switch-when="history" ng-controller="historyController as history">
 
-                    <div id="full-transaction-history" class="wavesTable" >
+                    <div id="full-transaction-history" class="wavesTable wScroll" >
                         <h2 class="sectionHeader">LATEST TRANSACTIONS</h2>
                         <table>
                             <thead>