From 83a1bd89af0f97a3043778dc39d4cf3a63147d10 Mon Sep 17 00:00:00 2001
From: Kenneth  Jao <ksjdragon@gmail.com>
Date: Mon, 12 Jan 2015 16:51:10 -0500
Subject: [PATCH] more css cleanup/fixes

---
 chromebook-checkout-meteor/client/admin.html | 14 +++++---
 chromebook-checkout-meteor/client/main.css   | 35 +++++++++++++++++---
 chromebook-checkout-meteor/client/main.html  |  1 -
 chromebook-checkout-meteor/client/tabs.css   |  4 +--
 4 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/chromebook-checkout-meteor/client/admin.html b/chromebook-checkout-meteor/client/admin.html
index 11b37d5..31f0307 100755
--- a/chromebook-checkout-meteor/client/admin.html
+++ b/chromebook-checkout-meteor/client/admin.html
@@ -1,5 +1,5 @@
 <template name="admin">
-  <div id="main-center">
+  <div id="main-center-admin">
     <h5 class="titleadmin">Admin Panel</h5>
     <div class="content">
       
@@ -14,14 +14,16 @@
           <input type="submit" value="Submit" class="add" />
         </form>
       </div>
-      <div>
+      <div id="edit-admin">
         <h6>Edit Chromebooks</h6>
         {{#each chromebooks}}
-          <div class="row">
+          <div class="row-admin">
             {{> chromebook}}
             <i class="icons yield fa fa-exclamation-triangle fa-lg"></i>
+            <div id="overlap-fix">
             <i class="icons cross fa fa-times fa-lg"></i>
           </div>
+          </div>
         {{/each}}
       </div>
     </div>
@@ -32,15 +34,19 @@
           <input type="text" name="acnumber" placeholder="Cart Number (ex. B)"/>
           <input type="submit" value="Submit" class="addc" />
         </form>
+        <div id="edit-admin">
         <h6> Edit Carts</h6>
         {{#each carts}}
-        <div class="row">
+        <div class="row-admin">
           {{>cart}}
           <i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i>
+          <div id="overlap-fix">
           <i class="icons crossc fa fa-times fa-lg"></i>
+        </div>
         </div>
           {{/each}}
       </div>
+    </div>
         {{/teacherTabs}}
     </div>
   </div>
diff --git a/chromebook-checkout-meteor/client/main.css b/chromebook-checkout-meteor/client/main.css
index 48d1242..b2c79d9 100644
--- a/chromebook-checkout-meteor/client/main.css
+++ b/chromebook-checkout-meteor/client/main.css
@@ -72,6 +72,20 @@ a {
   padding-bottom:0;
   padding-top:0;
 }
+#main-center-admin {
+  background-color: #F7F7FF;
+  border-radius:15px;
+  margin-left:auto;
+  margin-right:auto;
+  margin-top:4%;
+  margin-bottom:0;
+  height:auto;
+  max-height:700px;
+  max-width:900px;
+  box-shadow: 0px 5px 10px #222222;
+  padding-bottom:0;
+  padding-top:0;
+}
 #chromebooks, #carts {
   overflow: auto;
   padding-top:.5%;
@@ -91,6 +105,16 @@ a {
   height: 10%;
   display: flex;
 }
+.row-admin {
+  height: 10%;
+  display: flex;
+  max-width:89%;
+}
+#overlap-fix {
+  margin-left:100px;
+  margin-top: 16px;
+}
+  
 .tabs {
   margin-top: 0;
   padding-top: 0;
@@ -107,7 +131,11 @@ a {
 .row {
   min-width: 80%;
 }
-
+#edit-admin {
+  max-height:350px;
+  overflow:auto;
+}
+//End of Admin Panel
 
 button {
 	 background: #d94158;
@@ -180,17 +208,16 @@ h3 {
 padding-bottom:10px;
 }
 h5{
-	margin-left:auto;
-  margin-right:auto;
   margin-top:0.3%;
   margin-bottom:0.3%;
   color:#777;
   font-weight:10;
   padding-top:3%;
+  text-align: center;
 }
 h6{
 	margin:0;
-	padding:4% 10% 0% 0%;
+	padding:1% 10% 0% 0%;
 	padding-left:3.6%;
 }
 @-webkit-keyframes neon1 {
diff --git a/chromebook-checkout-meteor/client/main.html b/chromebook-checkout-meteor/client/main.html
index 663547d..fb46411 100644
--- a/chromebook-checkout-meteor/client/main.html
+++ b/chromebook-checkout-meteor/client/main.html
@@ -1,7 +1,6 @@
 <head>
   <title>IA Chromebook Checkout</title>
   <link rel="icon" href="ico/favicon.png">
-  <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 </head>
 
 <body>
diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css
index 396bc28..d7a872a 100644
--- a/chromebook-checkout-meteor/client/tabs.css
+++ b/chromebook-checkout-meteor/client/tabs.css
@@ -18,11 +18,11 @@
   border: 1px solid #ddd;
   border-bottom: none;
   margin-bottom: -1px !important;
-  padding: 13px 23.03% 14px 23.03% !important;
+  padding: 13px 23.03% 14px 23.02% !important;
   background-color: #fff;
   color: #333;
 }
 .tabs-content-container {
-  padding: 12% 15px 15px 15px;
+  padding: 4.2% 15px 15px 15px;
 }
 
