From e096b7eb7c993dbbb6612fe350022c4175342057 Mon Sep 17 00:00:00 2001
From: ksjdragon <ksjdragon@gmail.com>
Date: Sun, 1 Feb 2015 12:58:18 -0500
Subject: [PATCH] fixed chromeicon css, fixed minor redirect bug

---
 chromebook-checkout-meteor/client/checkout.js | 19 -------------------
 chromebook-checkout-meteor/client/initial.css | 11 +++++++----
 chromebook-checkout-meteor/client/login.js    |  3 ---
 .../client/slide-fade.js                      | 18 +++++++++++++++---
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/chromebook-checkout-meteor/client/checkout.js b/chromebook-checkout-meteor/client/checkout.js
index 18a6a1e..1efbd4f 100644
--- a/chromebook-checkout-meteor/client/checkout.js
+++ b/chromebook-checkout-meteor/client/checkout.js
@@ -3,25 +3,6 @@ Template.checkout.helpers({
     return Chromebooks.find({}, {sort: {number: 1}});
   }
 });
-
-Template.checkout.events({
-  'click .edit': function() {
-    if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
-      Router.go('/admin');
-    }
-    else {
-      alert("Access Denied");
-    }
-  },
-  'click .teacher': function() {
-    if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) {
-      Router.go('/teacher');
-    }
-    else {
-      alert("Access Denied");
-    }
-  }
-});
 Template.checkout.rendered = function() {
 
     $(".chckChromebooks").mCustomScrollbar({
diff --git a/chromebook-checkout-meteor/client/initial.css b/chromebook-checkout-meteor/client/initial.css
index 3dd3c44..9da99be 100644
--- a/chromebook-checkout-meteor/client/initial.css
+++ b/chromebook-checkout-meteor/client/initial.css
@@ -28,17 +28,20 @@
 .chromeicon {
   height: 30px;
   width: 30px;
-  float: right;
-  margin-right: 37.3%;
-  margin-top: .6%;
+  margin-left: -2%;
 }
 p.bottom {
   padding-left:0px;
   padding-top:0%;
-  margin-left:37.5%;
+  margin-left: 2.5%;
   margin-right:auto;
   color:#f7f7f7;
   max-width:325px;
   font:27px 'Lato';
   display: inline;
+}
+div.bottom {
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 340px;
 }
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/login.js b/chromebook-checkout-meteor/client/login.js
index 22f8601..7dfe0aa 100644
--- a/chromebook-checkout-meteor/client/login.js
+++ b/chromebook-checkout-meteor/client/login.js
@@ -2,8 +2,5 @@ Template.login.events({
   'click .chromeicon': function() {
     var randomint = Math.floor(Math.random() * (links.length - 1));
     window.open(links[randomint], "_blank");
-  },
-  'click .submit': function() {
-    Router.go('/login');
   }
 })
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/slide-fade.js b/chromebook-checkout-meteor/client/slide-fade.js
index d8e3743..3f56736 100644
--- a/chromebook-checkout-meteor/client/slide-fade.js
+++ b/chromebook-checkout-meteor/client/slide-fade.js
@@ -26,8 +26,20 @@ Momentum.registerPlugin('slide-fade', function(options) {
       var $node = $(node);
 
       $node
-      .velocity('fadeOut');
+      .velocity('fadeOut')
+      .velocity('slideUp', {
+        easing: options.easing,
+        duration: options.duration,
+        complete: function() {
+          $node.remove();
+          done();
+        }
+      });
       
-}
-}
+    
+
+
+
+     }
+  } 
 });
\ No newline at end of file