more css cleanup/fixes

This commit is contained in:
Kenneth Jao 2015-01-12 16:51:10 -05:00
parent c80517aa01
commit 83a1bd89af
4 changed files with 43 additions and 11 deletions

View File

@ -1,5 +1,5 @@
<template name="admin"> <template name="admin">
<div id="main-center"> <div id="main-center-admin">
<h5 class="titleadmin">Admin Panel</h5> <h5 class="titleadmin">Admin Panel</h5>
<div class="content"> <div class="content">
@ -14,14 +14,16 @@
<input type="submit" value="Submit" class="add" /> <input type="submit" value="Submit" class="add" />
</form> </form>
</div> </div>
<div> <div id="edit-admin">
<h6>Edit Chromebooks</h6> <h6>Edit Chromebooks</h6>
{{#each chromebooks}} {{#each chromebooks}}
<div class="row"> <div class="row-admin">
{{> chromebook}} {{> chromebook}}
<i class="icons yield fa fa-exclamation-triangle fa-lg"></i> <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> <i class="icons cross fa fa-times fa-lg"></i>
</div> </div>
</div>
{{/each}} {{/each}}
</div> </div>
</div> </div>
@ -32,14 +34,18 @@
<input type="text" name="acnumber" placeholder="Cart Number (ex. B)"/> <input type="text" name="acnumber" placeholder="Cart Number (ex. B)"/>
<input type="submit" value="Submit" class="addc" /> <input type="submit" value="Submit" class="addc" />
</form> </form>
<div id="edit-admin">
<h6> Edit Carts</h6> <h6> Edit Carts</h6>
{{#each carts}} {{#each carts}}
<div class="row"> <div class="row-admin">
{{>cart}} {{>cart}}
<i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i> <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> <i class="icons crossc fa fa-times fa-lg"></i>
</div>
</div> </div>
{{/each}} {{/each}}
</div>
</div> </div>
{{/teacherTabs}} {{/teacherTabs}}
</div> </div>

View File

@ -72,6 +72,20 @@ a {
padding-bottom:0; padding-bottom:0;
padding-top: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 { #chromebooks, #carts {
overflow: auto; overflow: auto;
padding-top:.5%; padding-top:.5%;
@ -91,6 +105,16 @@ a {
height: 10%; height: 10%;
display: flex; display: flex;
} }
.row-admin {
height: 10%;
display: flex;
max-width:89%;
}
#overlap-fix {
margin-left:100px;
margin-top: 16px;
}
.tabs { .tabs {
margin-top: 0; margin-top: 0;
padding-top: 0; padding-top: 0;
@ -107,7 +131,11 @@ a {
.row { .row {
min-width: 80%; min-width: 80%;
} }
#edit-admin {
max-height:350px;
overflow:auto;
}
//End of Admin Panel
button { button {
background: #d94158; background: #d94158;
@ -180,17 +208,16 @@ h3 {
padding-bottom:10px; padding-bottom:10px;
} }
h5{ h5{
margin-left:auto;
margin-right:auto;
margin-top:0.3%; margin-top:0.3%;
margin-bottom:0.3%; margin-bottom:0.3%;
color:#777; color:#777;
font-weight:10; font-weight:10;
padding-top:3%; padding-top:3%;
text-align: center;
} }
h6{ h6{
margin:0; margin:0;
padding:4% 10% 0% 0%; padding:1% 10% 0% 0%;
padding-left:3.6%; padding-left:3.6%;
} }
@-webkit-keyframes neon1 { @-webkit-keyframes neon1 {

View File

@ -1,7 +1,6 @@
<head> <head>
<title>IA Chromebook Checkout</title> <title>IA Chromebook Checkout</title>
<link rel="icon" href="ico/favicon.png"> <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> </head>
<body> <body>

View File

@ -18,11 +18,11 @@
border: 1px solid #ddd; border: 1px solid #ddd;
border-bottom: none; border-bottom: none;
margin-bottom: -1px !important; margin-bottom: -1px !important;
padding: 13px 23.03% 14px 23.03% !important; padding: 13px 23.03% 14px 23.02% !important;
background-color: #fff; background-color: #fff;
color: #333; color: #333;
} }
.tabs-content-container { .tabs-content-container {
padding: 12% 15px 15px 15px; padding: 4.2% 15px 15px 15px;
} }