Merge cleanup

vincentwoo · May 4, 2012 · 4aaa1bb · 4aaa1bb
2 parents 9c73362 + 1e1d04b
commit 4aaa1bb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 34 deletions.
diff --git a/css/style.css b/css/style.css
@@ -73,20 +73,17 @@ body {
   }
 #frame {
   width: 635px;
-  height: 332px;
   position: absolute;
   margin-top: -175px;
   margin-left: -325px;
   top: 50%;
   left: 50%;
   z-index: 2;
-  overflow: hidden;
 }
   #left {
     position: absolute;
     left: 10px;
     top: 10px;
-    bottom: 10px;
     width: 50%;
     border: 1px solid #ACACAC;
     box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
@@ -125,9 +122,9 @@ body {
       padding: 10px 15px 5px 15px;
       border-bottom: 1px solid #ccc;
       box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
-      height: 85px;
       background: #F1F1F1;
       background-size: contain;
+      position: relative;
     }
       #cost {
         width: 55%;
@@ -150,9 +147,10 @@ body {
             line-height: 30px;
           }
       #cardchange {
-        float: right;
-        margin-top:15px;
-        font-size: 14px;
+        position: absolute;
+        top: 50%;
+        margin-top: -13px;
+        right: 15px;
       }
      .cardarrow_box {
         display: inline-block;
@@ -178,18 +176,18 @@ body {
   #right {
     position: absolute;
     left: 50%;
+    opacity: 1;
     top: 50px;
     width: 290px;
     z-index: 4;
     overflow: hidden;
     background: #eee url('../images/exclusive_paper.png');
-    border-top-right-radius: 15px;
-    border-bottom-right-radius: 15px;
+    border-radius: 15px;
     box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
     border: 1px solid #ACACAC;
     padding: 15px 15px 15px 25px;
     -webkit-transition-duration: 1s;
-    -webkit-transition-property: left;
+    -webkit-transition-property: left, opacity;
   }
     #email {
       position: absolute;

diff --git a/index.html b/index.html
@@ -24,6 +24,7 @@
   });
 
   $('#buybutton').click(function() {
+    slideIn();
     $('#basepanel').hide();
     $('#receipt_total').text($('#total_price').text());
     $('#receipt_seller').text('Rovio');
@@ -92,17 +93,13 @@
   }
 
   if ($('#total_price').text() == $('#subtotal_price').text()) {
-    $('#subtotal_label').hide();
-    $('#subtotal_price').hide();
+    $('#summary_items').hide();
     $('#taxes_label').hide();
     $('#taxes_price').hide();
-    $('#summary_items').height(14);
   } else {
-    $('#subtotal_label').show();
-    $('#subtotal_price').show();
+    $('#summary_items').show();
     $('#taxes_label').show();
     $('#taxes_price').show();
-    $('#summary_items').height(36);
   }
 
   if (state == 'notlogged') $('#notlogged').show();
@@ -129,22 +126,23 @@
     if (state != 'logged_one' && state != 'logged_multi') {
       slideOut();
       $('#buybutton').addClass('disabled');
+    }
+    if (state == 'logged_multi') {
+      var cloned = $('#big_list').clone(true);
+      $('#multi_instrument_list').append(cloned);
+      cloned.show();
+      $('#showinstruments_multi').show();
     } else {
-      if (state == 'logged_one') {
-        $('#showinstruments_one').show();
-        var cloned = $('#small_list').clone(true);
-        $('#multi_instrument_list').append(cloned);
-        cloned.show();
-        $('#right').css('height', '259px');
-      } else {
-        var cloned = $('#big_list').clone(true);
-        $('#multi_instrument_list').append(cloned);
-        cloned.show();
-        $('#showinstruments_multi').show();
-      }
-      $('#cardchange').show();
-      $('#buybutton').removeClass('disabled');
+      var cloned = $('#small_list').clone(true);
+      $('#multi_instrument_list').append(cloned);
+      cloned.show();
+    }
+    if (state == 'logged_one') {
+      $('#showinstruments_one').show();
     }
+    $('#cardchange').show();
+    $('#buybutton').removeClass('disabled');
+
   });
 }
 
@@ -155,11 +153,13 @@
 
 function slideIn() {
   $('#right').css('left', '8%');
+  $('#right').css('opacity', '.5');
   $('#email').css('right', '50%');
   $('#cardchange').removeClass('active');
 }
 function slideOut() {
   $('#right').css('left', '50%');
+  $('#right').css('opacity', '1');
   $('#email').css('right', '7%');
   $('#cardchange').addClass('active');
 }
@@ -168,7 +168,7 @@
   if ($('#showinstruments_one').is(':visible')) {
     scrollTo($('#showinstruments_one'), $('#showinstruments_multi'), appendInstrument);
   } else if ($('#newuser').is(':visible')) {
-    scrollTo($('#newuser'), $('#showinstruments_one'), appendInstrument);
+    scrollTo($('#newuser'), $('#showinstruments_one'));
     $('#buybutton').removeClass('disabled');
   } else {
     appendInstrument();
@@ -338,7 +338,7 @@
               <img id='cardarrow' src='images/disclosure_arrow_dk_grey.png' />
             </div>
           </div>
-
+          <div style="clear:both"></div>
         </div>
         <a id="buybutton" class="kd-button kd-button-submit">Buy Now</a>
       </div>
@@ -399,9 +399,9 @@ <h3>Security Check Required</h3>
           </div>
         </div>
         <p style="clear:both">
-          You currently have only one valid payment method stored in your Google Wallet.  To add another, click the button below.
+          This is the card that will be charged for this transaction. To add another, click the button below.
         </p>
-        <div class="kd-button addcardbutton" style="float:right; margin-bottom: 20px">
+        <div class="kd-button addcardbutton" style="float:right; margin-bottom: 15px">
           <div>
             Add card in a new window
           </div>