merge fix

chromebook-checkout-meteor/client/admin.css

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .overlap-fix {
   margin-left:100px;
   margin-top: 16px;
@@ -47,7 +46,6 @@
   max-height:550px;
   min-width:700px;
  }
-=======
 .remove {
   margin-bottom: 4%;
 }
@@ -63,4 +61,3 @@
   max-height:350px;
   overflow:auto;
 }
->>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733

chromebook-checkout-meteor/client/admin.html

@@ -8,20 +8,7 @@
           <!-- Single -->
       <div class="border">
       <div>
-<<<<<<< HEAD
         <h6>Edit Chromebooks</h6> <!-- Edit Chromebooks -->
-=======
-      <div class="Adding">
-        <h6>Add a Chromebook</h6>
-        <form class="new-task">
-          <input type="text" name="anumber" placeholder="Chromebook Number (eg. B1)" />
-          <input type="text" name="aserial" placeholder="Serial Number (eg. ABCD1234)" />
-          <input type="submit" value="Submit" class="add" />
-        </form>
-      </div>
-      <div>
-        <h6>Edit Chromebooks</h6>
->>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
         {{#each chromebooks}}
           <div class="row-admin">
             {{> chromebook}}
@@ -60,6 +47,5 @@
     </div>
     </div>
         {{/teacherTabs}}
-    
   </div>
 </template> 

chromebook-checkout-meteor/client/main.css

@@ -56,7 +56,6 @@ h6 {
 .main-center {
   max-width:825px;
 }
-<<<<<<< HEAD
 .main-center-admin {
   max-width:900px;
 }
@@ -67,115 +66,9 @@ h6 {
   overflow: auto;
   padding-top:.5%;
   padding-bottom:.5%;
-=======
-#chromebooks, #carts, .tchromebooks {
-  overflow: auto;
-  padding-top:.5%;
-  padding-bottom:.5%;
-}
-#chromebooks, #carts {
-  max-height:600px;
-}
-.tchromebooks {
-  max-height:500px;
-}
-#border {
-  padding: 0 15px 15px 15px;
->>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
 }
 .row, .row-admin {
   height: 10%;
   display: flex;
 }
-<<<<<<< HEAD
-/* End */
-=======
-.row-admin {
-  max-width:89%;
-}
-#overlap-fix {
-  margin-left:100px;
-  margin-top: 16px;
-}
-  
-.tabs {
-  margin-top: 0;
-  padding-top: 0;
-}
-
-input {
-	margin-left:5%;
-	height:3%;
-	width:89%;
-	font:20px/1.5 'Lato';
-	margin-top:0%
-}
-#footer {
-  position:absolute;
-	bottom:0%;
-  right:1%;
- 
-}
-
-//Paragraphs
-p {
-  padding-left:0px;
-}
-p.bottom {
-	padding-top:0%;
-  margin-left:37.5%;
-  margin-right:auto;
-	color:#f7f7f7;
-  max-width:325px;
-  font:27px 'Lato';
-}
-
-.bottom {
-  display: inline;
-}
-
-p.footer {
-	color:#f7f7f7
-}
-
-//Headers
-h1 {
-  font-size:28px;
-}
-h2 {
-  color:#393939;
-}
-h3 {
-padding-bottom:10px;
-}
-h5{
-  margin-top:0.3%;
-  margin-bottom:0.3%;
-  color:#777;
-  font-weight:10;
-  padding-top:3%;
-  text-align: center;
-}
-h6{
-	margin:0;
-	padding:1% 10% 0% 0%;
-	padding-left:3.6%;
-}
-@-webkit-keyframes neon1 {
-  from {
-    text-shadow: 0 0 5px #9f9f9f,
-               0 0 20px  #d5d5d5,
-               0 0 30px  #d5d5d5,
-               0 0 35px  #f9f9f9,
-               0 0 40px  #f9f9f9;
-  }
-  to {
-    text-shadow: 0 0 3px #9f9f9f,
-               0 0 10px #d5d5d5,
-               0 0 15px #d5d5d5,
-               0 0 17px #f9f9f9,
-               0 0 20px #f9f9f9,
-               0 0 20px #f9f9f9;
-  }
-}
->>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
+/* End */

chromebook-checkout-meteor/client/tabs.css

@@ -18,19 +18,15 @@
   border: 1px solid #ddd;
   border-bottom: none;
   margin-bottom: -1px !important;
-  padding: 13px 23.03% 14px 23.02% !important;
+  padding: 13px 23.03% 14px 23.03% !important;
   background-color: #fff;
   color: #333;
 }
 .tabs-content-container {
   padding: 4.2% 15px 15px 15px;
-<<<<<<< HEAD
-=======
 }
-
 .tabs-content {
 overflow: scroll;
 min-width: 500px;
 max-height: 500px;
->>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
 }

chromebook-checkout-meteor/client/teacher.html

@@ -5,12 +5,9 @@
       </div>
               {{#teacherTabs tabs=tabs}}
           <!-- Single -->
-<<<<<<< HEAD
           <div class="tchChromebooks">
             <div>
-=======
            <div>
->>>>>>> a6fe1eebdc16312db82bdb592ef5517d686cb733
               {{#each chromebooks}}
                 <div class="row">
                   {{> chromebook}}
@@ -18,6 +15,7 @@
               {{/each}}
             </div>
           </div>
+        </div>
           <!-- Carts -->
           <div class="tchChromebooks">
             <div>