From 1bdaf75e3c5db64ba0feefe1c0483efface35f91 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@ksjtech.(none)>
Date: Sun, 18 Jan 2015 17:30:26 -0500
Subject: [PATCH] fixed carts/all css (in theory)

---
 chromebook-checkout-meteor/client/admin.css    | 10 +++-------
 chromebook-checkout-meteor/client/admin.html   |  2 +-
 chromebook-checkout-meteor/client/checkout.css |  2 +-
 chromebook-checkout-meteor/client/initial.css  |  4 ++--
 chromebook-checkout-meteor/client/initial.html |  2 ++
 chromebook-checkout-meteor/client/login.css    |  4 ++--
 chromebook-checkout-meteor/client/login.html   |  8 +++++---
 chromebook-checkout-meteor/client/tabs.css     |  6 +++---
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/chromebook-checkout-meteor/client/admin.css b/chromebook-checkout-meteor/client/admin.css
index 3857fd4..00d2e57 100644
--- a/chromebook-checkout-meteor/client/admin.css
+++ b/chromebook-checkout-meteor/client/admin.css
@@ -15,7 +15,7 @@
   margin-top: 0%;
   font-size: 14pt;
 }
-.add {
+.add, .addc {
   background: #d94158;
   background-image: -webkit-linear-gradient(top, #d94158, #ad3838);
   background-image: -moz-linear-gradient(top, #d94158, #ad3838);
@@ -31,7 +31,7 @@
   width: 97%;
   font-size: 18pt;
 }
-.add:hover {
+.add:hover, .addc:hover {
   background: #db6b6b;
   background-image: -webkit-linear-gradient(top, #db6b6b, #d64949);
   background-image: -moz-linear-gradient(top, #db6b6b, #d64949);
@@ -56,8 +56,4 @@
 
 .row {
   min-width: 80%;
-}
-#edit-admin {
-  max-height:350px;
-  overflow:auto;
-}
+}
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/admin.html b/chromebook-checkout-meteor/client/admin.html
index d249bf8..d7b9427 100644
--- a/chromebook-checkout-meteor/client/admin.html
+++ b/chromebook-checkout-meteor/client/admin.html
@@ -42,7 +42,7 @@
       <h6>Add a Cart</h6> <!-- Adding Carts -->
         <form class="new-task">
           <input type="text" name="acnumber" placeholder="Cart Number (ex. A)" class="submission"/>
-          <input type="submit" value="Submit" class="add addc" />
+          <input type="submit" value="Submit" class="add, addc" />
         </form>
     </div>
     </div>
diff --git a/chromebook-checkout-meteor/client/checkout.css b/chromebook-checkout-meteor/client/checkout.css
index 455a7c5..f0b489c 100644
--- a/chromebook-checkout-meteor/client/checkout.css
+++ b/chromebook-checkout-meteor/client/checkout.css
@@ -1,5 +1,5 @@
  .chckChromebooks {
-   max-height:600px;
+   max-height:500px;
  }
  .chckBorder {
  	padding: 1% 15px 15px 15px;
diff --git a/chromebook-checkout-meteor/client/initial.css b/chromebook-checkout-meteor/client/initial.css
index 5589146..3dd3c44 100644
--- a/chromebook-checkout-meteor/client/initial.css
+++ b/chromebook-checkout-meteor/client/initial.css
@@ -29,8 +29,8 @@
   height: 30px;
   width: 30px;
   float: right;
-  margin-right: 37%;
-  margin-top: 0.75%;
+  margin-right: 37.3%;
+  margin-top: .6%;
 }
 p.bottom {
   padding-left:0px;
diff --git a/chromebook-checkout-meteor/client/initial.html b/chromebook-checkout-meteor/client/initial.html
index e0b0b79..3981bae 100644
--- a/chromebook-checkout-meteor/client/initial.html
+++ b/chromebook-checkout-meteor/client/initial.html
@@ -3,6 +3,8 @@
       <h5>Chromebook Checkout</h5>
       <button class="submit">Checkout!</button>
     </div>
+    <div class="bottom">
     <p class="bottom">Checkout a chromebook.</p>
       <img class="chromeicon" src="ico/chrico.png">
+    </div>  
 </template> 
diff --git a/chromebook-checkout-meteor/client/login.css b/chromebook-checkout-meteor/client/login.css
index 432a614..1affb38 100644
--- a/chromebook-checkout-meteor/client/login.css
+++ b/chromebook-checkout-meteor/client/login.css
@@ -1,6 +1,6 @@
 #login-buttons {
   margin: 0 auto;
   padding-left: 26.5%;
-  padding-bottom: 5%;
-  padding-top: 5%;
+  padding-bottom: 4%;
+  padding-top: 4%;
 }
diff --git a/chromebook-checkout-meteor/client/login.html b/chromebook-checkout-meteor/client/login.html
index 3ede111..7904ef1 100644
--- a/chromebook-checkout-meteor/client/login.html
+++ b/chromebook-checkout-meteor/client/login.html
@@ -1,8 +1,10 @@
 <template name="login">
-<div id="main-center">
+<div class="initial">
       <h5>Chromebook Checkout</h5>
-      <div id="chromebooks">
       {{> loginButtons}}
-      </div>
+  </div>
+  <div class="bottom">
+  <p class="bottom">Checkout a chromebook.</p>
+      <img class="chromeicon" src="ico/chrico.png">
   </div>
 </template>
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css
index 9b0d57a..e7d554a 100644
--- a/chromebook-checkout-meteor/client/tabs.css
+++ b/chromebook-checkout-meteor/client/tabs.css
@@ -27,7 +27,7 @@
   padding: 4.2% 15px 15px 15px;
 }
 .tabs-content {
-overflow: scroll;
-min-width: 500px;
-max-height: 500px;
+overflow-y: scroll;
+min-height: 425px;
+max-height: 425px;
 }
\ No newline at end of file