From 383f8001a0458ab8392638bd91de0a19b22e46c6 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 15 Jan 2015 17:16:51 -0300
Subject: [PATCH] fix layout for IE

---
 css/src/main.css         |  1 -
 css/src/mobile.css       | 25 ++++++++++++++++++++-----
 index.html               |  4 +++-
 views/add.html           |  3 ++-
 views/copayers.html      |  3 ++-
 views/create.html        |  1 +
 views/createProfile.html |  1 +
 views/errors/404.html    |  2 +-
 views/history.html       |  3 ++-
 views/homeWallet.html    |  3 ++-
 views/import.html        |  1 +
 views/includes/head.html | 37 ++++++++++++++++---------------------
 views/join.html          |  1 +
 views/more.html          |  1 +
 views/profile.html       |  5 +++--
 views/receive.html       |  3 ++-
 views/send.html          |  9 +++++----
 17 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index 670a37b2c..e09b87dea 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -688,7 +688,6 @@ a.button-setup {
 
 .locked {
   font-size: 11px;
-  margin-top: 0.2rem;
   color: #7A8C9E;
 }
 
diff --git a/css/src/mobile.css b/css/src/mobile.css
index 068992531..3e9f49239 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -19,15 +19,30 @@
   }
 
   .page, .main {
-    height: auto;
+    height: 100%;
   }
 
   .main {
-    height: 92%;
-    margin-top: 30px;
     margin-left: 0;
-    margin-bottom: -30px;
-    padding: 20px 0 80px 0;
+    padding: 60px 0 80px 0;
+  }
+
+  /* Fix IE */
+  .extra-margin-bottom {
+    display: block
+    height: 75px
+    overflow: hidden
+    clear: both
+  }
+
+  /* Fix Firefox */
+  @-moz-document url-prefix() {
+    .extra-margin-bottom {
+      display: block;
+      height: 75px;
+      overflow: hidden;
+      clear: both;
+    }
   }
 
   .tab-bar {
diff --git a/index.html b/index.html
index a6278c10a..3cad5e0e6 100644
--- a/index.html
+++ b/index.html
@@ -121,7 +121,9 @@
           ng-class="{'dni':$root.hideNavigation || $root.wpInputFocused}"
         ></div>
 
-        <section ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation  && !$root.wpInputFocused}" ng-view></section> 
+        <section 
+          ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation  && !$root.wpInputFocused}" 
+          ng-view></section> 
 
         <a class="exit-off-canvas"></a>
 
diff --git a/views/add.html b/views/add.html
index 6b2ffec64..e9ebc3c3c 100644
--- a/views/add.html
+++ b/views/add.html
@@ -18,4 +18,5 @@
 			<span>Import wallet</span>
 		</a>
 	</div>
-</div>
\ No newline at end of file
+</div>
+<div class="extra-margin-bottom"></div>
diff --git a/views/copayers.html b/views/copayers.html
index d77e5b95c..9ca0fdcd3 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -1,7 +1,7 @@
 <div ng-controller="CopayersController" ng-init="init()">
   <div class="row">
     <div class="large-12 medium-12 small-12 columns">
-      <h1 class="hide-for-large-up size-18">{{$root.title}}</h1> 
+      <h1>Share this secret with your copayers</h1> 
     </div>
   </div>
 
@@ -50,4 +50,5 @@
   </div>
   <!-- end of row -->
 </div>
+<div class="extra-margin-bottom"></div>
 
diff --git a/views/create.html b/views/create.html
index c5b5b38d9..58150b70a 100644
--- a/views/create.html
+++ b/views/create.html
@@ -87,3 +87,4 @@
   </form>
   </div>
 </div>
+<div class="extra-margin-bottom"></div>
diff --git a/views/createProfile.html b/views/createProfile.html
index 29badbf47..4652f1f3b 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -241,4 +241,5 @@
   </div>
 </div>
 
+<div class="extra-margin-bottom"></div>
 
diff --git a/views/errors/404.html b/views/errors/404.html
index 3610e89b2..a9d8759ec 100644
--- a/views/errors/404.html
+++ b/views/errors/404.html
@@ -8,4 +8,4 @@
   <h3 translate class="text-center" ng-class="{'text-white': !$root.wallet}">Page not found</h3>
   <p class="text-center"><a href="#!/">&laquo; <span translate>Back</span></a></p>
 </div>
-
+<div class="extra-margin-bottom"></div>
diff --git a/views/history.html b/views/history.html
index c1923cd07..daecbf5c4 100644
--- a/views/history.html
+++ b/views/history.html
@@ -47,7 +47,7 @@
     </div>
     </div>
   </div>
-  <div class="m50b" ng-show="blockchain_txs[0].txid">
+  <div class="m10b" ng-show="blockchain_txs[0].txid">
     <div class="row">
       <div class="large-9 columns">
         <pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
@@ -67,3 +67,4 @@
     </div>
   </div>
 </div>
+<div class="extra-margin-bottom"></div>
diff --git a/views/homeWallet.html b/views/homeWallet.html
index 1ac98ce42..f724f1297 100644
--- a/views/homeWallet.html
+++ b/views/homeWallet.html
@@ -85,9 +85,10 @@
     </div>
   </div>
 
-  <div class="row m50b" ng-show="isMobile">
+  <div class="row" ng-show="isMobile">
     <div class="large-12 columns text-right size-12">
       <a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
     </div>
   </div>
 </div>
+<div class="extra-margin-bottom"></div>
diff --git a/views/import.html b/views/import.html
index 8d998afc4..495e9fda0 100644
--- a/views/import.html
+++ b/views/import.html
@@ -97,3 +97,4 @@
   </div>
 </div>
 
+<div class="extra-margin-bottom"></div>
diff --git a/views/includes/head.html b/views/includes/head.html
index 01643ffa6..934f342f5 100644
--- a/views/includes/head.html
+++ b/views/includes/head.html
@@ -1,26 +1,21 @@
-<div class="founds">
-  <span ng-if="!$root.wallet.isComplete()">Waiting for copayers...</span>
-  <div ng-if="$root.wallet.isComplete()">
-    <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
-    <div ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
-      <small class="db text-light">Balance:</small>
-      <b class="m5r">{{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}}</b>
-      <span ng-if="$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
-      <span ng-if="!$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">N/A</span>
-      <small ng-if="$root.wallet">
-        <a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance">
-          <i class="fi-refresh"></i>
-        </a>
-        <span ng-if="$root.updatingBalance">
-          <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-        </span>
-      </small>
-    </div> 
-  </div>
+<div class="founds" ng-if="$root.wallet.isComplete()">
+  <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
+  <div ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
+    <small class="db text-light">Balance:</small>
+    <b class="m5r">{{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}}</b>
+    <span ng-if="$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
+    <span ng-if="!$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">N/A</span>
+    <small ng-if="$root.wallet">
+      <a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance">
+        <i class="fi-refresh"></i>
+      </a>
+      <span ng-if="$root.updatingBalance">
+        <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+      </span>
+    </small>
+  </div> 
 </div>
 
-
-
 <div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()" ng-init="init()" ng-click="hoverMenu = !hoverMenu">
   <a class="dropdown ellipsis text-gray pr" ng-class="{'hover': hoverMenu}">
     <div class="photo-container">
diff --git a/views/join.html b/views/join.html
index c77a9c9d6..15355fbb4 100644
--- a/views/join.html
+++ b/views/join.html
@@ -76,4 +76,5 @@
   <!-- End !loading -->
 </div>
 
+<div class="extra-margin-bottom"></div>
 
diff --git a/views/more.html b/views/more.html
index d035c9bb5..c5e401438 100644
--- a/views/more.html
+++ b/views/more.html
@@ -102,3 +102,4 @@
   </div>
 
 </div>
+<div class="extra-margin-bottom"></div>
diff --git a/views/profile.html b/views/profile.html
index 1a368ba1c..e3e83cede 100644
--- a/views/profile.html
+++ b/views/profile.html
@@ -103,7 +103,7 @@
 
   <div class="line-dashed-h m20b"></div>
   
-  <div class="m50b row oh">
+  <div class="row oh">
     <div class="large-12 columns">
       <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
         <i class="fi-widget m3r"></i>
@@ -116,7 +116,7 @@
     </div>
   </div>
 
-  <div ng-hide="hideAdv" class="row m50b">
+  <div ng-hide="hideAdv" class="row">
     <div class="large-12 columns">
       <div class="panel">
         <h2><i class="fi-minus-circle m10r"></i> 
@@ -142,3 +142,4 @@
     </div>
   </div>
 </div>
+<div class="extra-margin-bottom"></div>
diff --git a/views/receive.html b/views/receive.html
index 1873467fc..d76f3387d 100644
--- a/views/receive.html
+++ b/views/receive.html
@@ -22,7 +22,7 @@
       </div>
     </div>
   </div>
-  <div class="row m50b">
+  <div class="row">
     <div class="large-12 columns" ng-if="showAll">
       <div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
         <div class="panel">
@@ -64,3 +64,4 @@
   </div>
 </div>
 
+<div class="extra-margin-bottom"></div>
diff --git a/views/send.html b/views/send.html
index f00652b4f..d42af2f2e 100644
--- a/views/send.html
+++ b/views/send.html
@@ -164,19 +164,20 @@
           </div>
         </div>
       </form>
-      <div class="locked" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
+      <div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
+        <i class="fi-lock"></i>
         <span>
-           {{'Locked'|translate}} &nbsp;
+          {{'Locked'|translate}} &nbsp;
         </span>
         <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
         <span ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance">
           <b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b> 
           - {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
-       </span>
-       <a href="#" class="has-tip" tooltip-placement="left" tooltip="More info"><i class="fi-info"></i></a>
+        </span>
       </div>
     </div>
   </div>
   <!--  end of row -->
 </div>
 
+<div class="extra-margin-bottom"></div>