From bf5b7cd0a818aad69c29cfcd6a35e9b6c673eea4 Mon Sep 17 00:00:00 2001
From: Yaman <ybq987@gmail.com>
Date: Mon, 12 Jan 2015 17:56:27 -0500
Subject: [PATCH 1/2] began organization of css

---
 chromebook-checkout-meteor/client/admin.css | 15 +++++++++++
 chromebook-checkout-meteor/client/main.css  | 29 +++------------------
 2 files changed, 19 insertions(+), 25 deletions(-)
 create mode 100644 chromebook-checkout-meteor/client/admin.css

diff --git a/chromebook-checkout-meteor/client/admin.css b/chromebook-checkout-meteor/client/admin.css
new file mode 100644
index 0000000..a3ec895
--- /dev/null
+++ b/chromebook-checkout-meteor/client/admin.css
@@ -0,0 +1,15 @@
+.remove {
+  margin-bottom: 4%;
+}
+
+.yield:hover {
+  color: #E14C2B;
+}
+
+.row {
+  min-width: 80%;
+}
+#edit-admin {
+  max-height:350px;
+  overflow:auto;
+}
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/main.css b/chromebook-checkout-meteor/client/main.css
index 77dd459..a76c4d0 100644
--- a/chromebook-checkout-meteor/client/main.css
+++ b/chromebook-checkout-meteor/client/main.css
@@ -113,28 +113,23 @@ button {
   background-image: linear-gradient(to bottom, #db6b6b, #d64949);
   text-decoration: none;
 }
-#chromebooks, #carts {
+#chromebooks, #carts, #tchromebooks {
   overflow: auto;
   padding-top:.5%;
   padding-bottom:.5%;
   max-height:600px;
 }
 #tchromebooks {
-  overflow: auto;
-  padding-top:.5%;
-  padding-bottom:.5%;
   max-height:500px;
 }
 #border {
   padding: 0 15px 15px 15px;
 }
-.row {
+.row, .row-admin {
   height: 10%;
   display: flex;
 }
 .row-admin {
-  height: 10%;
-  display: flex;
   max-width:89%;
 }
 #overlap-fix {
@@ -146,24 +141,6 @@ button {
   margin-top: 0;
   padding-top: 0;
 }
-//Admin Panel
-.remove {
-  margin-bottom: 4%;
-}
-
-.yield:hover {
-  color: #E14C2B;
-}
-
-.row {
-  min-width: 80%;
-}
-#edit-admin {
-  max-height:350px;
-  overflow:auto;
-}
-//End of Admin Panel
-
 
 input {
 	margin-left:5%;
@@ -178,6 +155,7 @@ input {
   right:1%;
  
 }
+
 //Paragraphs
 p {
   padding-left:0px;
@@ -198,6 +176,7 @@ p.bottom {
 p.footer {
 	color:#f7f7f7
 }
+
 //Headers
 h1 {
   font-size:28px;

From 9e773c1cd0e92d904ace3dd1fb80c9156a5d919f Mon Sep 17 00:00:00 2001
From: Yaman <ybq987@gmail.com>
Date: Mon, 12 Jan 2015 18:18:32 -0500
Subject: [PATCH 2/2] fixed more css for /teacher and /admin

---
 chromebook-checkout-meteor/client/admin.html   | 2 +-
 chromebook-checkout-meteor/client/main.css     | 6 ++++--
 chromebook-checkout-meteor/client/tabs.css     | 5 +++++
 chromebook-checkout-meteor/client/teacher.html | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/chromebook-checkout-meteor/client/admin.html b/chromebook-checkout-meteor/client/admin.html
index 31f0307..91df076 100755
--- a/chromebook-checkout-meteor/client/admin.html
+++ b/chromebook-checkout-meteor/client/admin.html
@@ -14,7 +14,7 @@
           <input type="submit" value="Submit" class="add" />
         </form>
       </div>
-      <div id="edit-admin">
+      <div>
         <h6>Edit Chromebooks</h6>
         {{#each chromebooks}}
           <div class="row-admin">
diff --git a/chromebook-checkout-meteor/client/main.css b/chromebook-checkout-meteor/client/main.css
index a76c4d0..df07cfb 100644
--- a/chromebook-checkout-meteor/client/main.css
+++ b/chromebook-checkout-meteor/client/main.css
@@ -113,13 +113,15 @@ button {
   background-image: linear-gradient(to bottom, #db6b6b, #d64949);
   text-decoration: none;
 }
-#chromebooks, #carts, #tchromebooks {
+#chromebooks, #carts, .tchromebooks {
   overflow: auto;
   padding-top:.5%;
   padding-bottom:.5%;
+}
+#chromebooks, #carts {
   max-height:600px;
 }
-#tchromebooks {
+.tchromebooks {
   max-height:500px;
 }
 #border {
diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css
index d7a872a..f37a383 100644
--- a/chromebook-checkout-meteor/client/tabs.css
+++ b/chromebook-checkout-meteor/client/tabs.css
@@ -26,3 +26,8 @@
   padding: 4.2% 15px 15px 15px;
 }
 
+.tabs-content {
+overflow: scroll;
+min-width: 500px;
+max-height: 500px;
+}
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/teacher.html b/chromebook-checkout-meteor/client/teacher.html
index df3530b..c628797 100644
--- a/chromebook-checkout-meteor/client/teacher.html
+++ b/chromebook-checkout-meteor/client/teacher.html
@@ -4,7 +4,7 @@
           <div>
               {{#teacherTabs tabs=tabs}}
           <!-- Single -->
-           <div id="tchromebooks">
+           <div>
               {{#each chromebooks}}
                 <div class="row">
                   {{> chromebook}}