organized css, fixed ALL known issues

This commit is contained in:
Kenneth Jao 2015-01-12 19:51:46 -05:00
parent 0967667fb9
commit f326d46d97
11 changed files with 194 additions and 263 deletions

View File

@ -0,0 +1,48 @@
.overlap-fix {
margin-left:100px;
margin-top: 16px;
}
.yield:hover {
color: #E14C2B;
}
.row-admin {
max-width:89%;
}
.submission {
margin-left: 2%;
height: 30px;
width: 95%;
margin-top: 0%;
font-size: 14pt;
}
.add {
background: #d94158;
background-image: -webkit-linear-gradient(top, #d94158, #ad3838);
background-image: -moz-linear-gradient(top, #d94158, #ad3838);
background-image: -ms-linear-gradient(top, #d94158, #ad3838);
background-image: -o-linear-gradient(top, #d94158, #ad3838);
background-image: linear-gradient(to bottom, #d94158, #ad3838);
border-radius: 9px;
outline: 0;
color: #ffffff;
padding: .5% 0%;
margin-left: 1.5%;
margin-right: 1.5%;
width: 97%;
font-size: 18pt;
}
.add:hover {
background: #db6b6b;
background-image: -webkit-linear-gradient(top, #db6b6b, #d64949);
background-image: -moz-linear-gradient(top, #db6b6b, #d64949);
background-image: -ms-linear-gradient(top, #db6b6b, #d64949);
background-image: -o-linear-gradient(top, #db6b6b, #d64949);
background-image: linear-gradient(to bottom, #db6b6b, #d64949);
text-decoration: none;
}
.border {
padding: 1% 15px 1% 15px;
overflow:auto;
max-height:550px;
min-width:700px;
}

View File

@ -1,53 +1,52 @@
<template name="admin">
<div id="main-center-admin">
<h5 class="titleadmin">Admin Panel</h5>
<div class="content">
{{#teacherTabs tabs=tabs}}
<div class="main-center-admin">
<div>
<h5>Admin Panel</h5>
</div>
{{#teacherTabs tabs=tabs}}
<!-- Single -->
<div class="border">
<div>
<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 id="edit-admin">
<h6>Edit Chromebooks</h6>
<h6>Edit Chromebooks</h6> <!-- Edit Chromebooks -->
{{#each chromebooks}}
<div class="row-admin">
{{> chromebook}}
<i class="icons yield fa fa-exclamation-triangle fa-lg"></i>
<div id="overlap-fix">
<div class="overlap-fix">
<i class="icons cross fa fa-times fa-lg"></i>
</div>
</div>
{{/each}}
</div>
</div>
</div>
{{/each}}
<h6>Add a Chromebook</h6> <!-- Add Chromebooks -->
<form class="new-task">
<input type="text" name="anumber" placeholder="Chromebook Number (eg. B1)" class="submission" />
<input type="text" name="aserial" placeholder="Serial Number (eg. ABCD1234)" class="submission"/>
<input type="submit" value="Submit" class="add" />
</form>
</div>
</div>
<!-- Carts -->
<div class="border">
<div>
<h6>Add a Cart</h6>
<form class="new-task">
<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>
<h6> Edit Carts</h6> <!-- Editing Carts -->
{{#each carts}}
<div class="row-admin">
{{>cart}}
<i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i>
<div id="overlap-fix">
<div class="overlap-fix">
<i class="icons crossc fa fa-times fa-lg"></i>
</div>
</div>
{{/each}}
</div>
</div>
{{/each}}
<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" />
</form>
</div>
</div>
{{/teacherTabs}}
</div>
</div>
</template>

View File

@ -0,0 +1,6 @@
.chckChromebooks {
max-height:600px;
}
.chckBorder {
padding: 1% 15px 15px 15px;
}

View File

@ -1,19 +1,17 @@
<template name="checkout">
<div id="main-center">
<div class="main-center">
<div>
<h5>Chromebook Checkout</h5>
</div>
<div id="border">
<div id="chromebooks">
<div class="chckBorder">
<div class="chckChromebooks">
{{#each chromebooks}}
<div class="row">
{{> chromebook}}
<!-- fa-times -->
<!-- <i class="icons cross fa fa-exclamation-triangle fa-lg"></i> -->
</div>
{{/each}}
</div>
</div>
</div>
<i class="icons teacher fa fa-user"></i>
<i class="icons edit fa fa-pencil-square-o fa-lg"></i>
</div>

View File

@ -0,0 +1,44 @@
.submit {
background: #d94158;
background-image: -webkit-linear-gradient(top, #d94158, #ad3838);
background-image: -moz-linear-gradient(top, #d94158, #ad3838);
background-image: -ms-linear-gradient(top, #d94158, #ad3838);
background-image: -o-linear-gradient(top, #d94158, #ad3838);
background-image: linear-gradient(to bottom, #d94158, #ad3838);
border-radius: 9px;
outline:0;
font: 50px 'Lato';
color: #ffffff;
padding: 1% 10% 1% 10%;
text-decoration: none;
margin-left:21.15%;
margin-top:2%;
margin-bottom:2%;
}
.submit:hover {
background: #db6b6b;
background-image: -webkit-linear-gradient(top, #db6b6b, #d64949);
background-image: -moz-linear-gradient(top, #db6b6b, #d64949);
background-image: -ms-linear-gradient(top, #db6b6b, #d64949);
background-image: -o-linear-gradient(top, #db6b6b, #d64949);
background-image: linear-gradient(to bottom, #db6b6b, #d64949);
text-decoration: none;
}
.chromeicon {
height: 30px;
width: 30px;
float: right;
margin-right: 37%;
margin-top: 0.75%;
}
p.bottom {
padding-left:0px;
padding-top:0%;
margin-left:37.5%;
margin-right:auto;
color:#f7f7f7;
max-width:325px;
font:27px 'Lato';
display: inline;
}

View File

@ -1,7 +1,7 @@
<template name="initial">
<div id="initial">
<div class="initial">
<h5>Chromebook Checkout</h5>
<button id="submit">Checkout!</button>
<button class="submit">Checkout!</button>
</div>
<p class="bottom">Checkout a chromebook.</p>
<img class="chromeicon" src="ico/chrico.png">

View File

@ -12,7 +12,7 @@ Template.initial.events({
var randomint = Math.floor(Math.random() * (links.length - 1));
window.open(links[randomint], "_blank");
},
'click #submit': function() {
'click .submit': function() {
Router.go('/checkout');
}
})

View File

@ -1,4 +1,4 @@
/* CSS declarations go here */
/* Global HTML Defaults */
@font-face {
font-family: 'Lato';
src: url('fonts/Lato-Light.woff');
@ -10,22 +10,6 @@ html {
-o-background-size: cover;
background-size: cover;
}
.center {
position: absolute;
width: 100%;
height: 80%;
display: table;
}
.chromeicon {
height: 30px;
width: 30px;
float: right;
margin-right: 37%;
margin-top: 0.75%;
}
body {
font:35px/1.5 'Lato';
color:#777;
@ -35,180 +19,7 @@ body {
width: 100%;
margin: 0;
}
a {
color:#f7f7f7;
font-weight:400;
font-family: 'Lato';
text-decoration:none;
-webkit-animation: neon1 1.5s ease-in-out infinite alternate;
-moz-animation: neon1 1.5s ease-in-out infinite alternate;
animation: neon1 1.5s ease-in-out infinite alternate;
}
#initial {
background-color: #F7F7FF;
border-radius:15px;
margin-left:auto;
margin-right:auto;
margin-top:23%;
margin-bottom:0;
height:auto;
max-width:600px;
box-shadow: 0px 5px 10px #222222;
padding-bottom:0;
padding-top:0;
}
#main-center {
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:825px;
box-shadow: 0px 5px 10px #222222;
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;
}
button {
background: #d94158;
background-image: -webkit-linear-gradient(top, #d94158, #ad3838);
background-image: -moz-linear-gradient(top, #d94158, #ad3838);
background-image: -ms-linear-gradient(top, #d94158, #ad3838);
background-image: -o-linear-gradient(top, #d94158, #ad3838);
background-image: linear-gradient(to bottom, #d94158, #ad3838);
border-radius: 9px;
outline:0;
font: 50px 'Lato';
color: #ffffff;
padding: 1% 10% 1% 10%;
text-decoration: none;
margin-left:21.15%;
margin-top:2%;
margin-bottom:2%;
}
button:hover {
background: #db6b6b;
background-image: -webkit-linear-gradient(top, #db6b6b, #d64949);
background-image: -moz-linear-gradient(top, #db6b6b, #d64949);
background-image: -ms-linear-gradient(top, #db6b6b, #d64949);
background-image: -o-linear-gradient(top, #db6b6b, #d64949);
background-image: linear-gradient(to bottom, #db6b6b, #d64949);
text-decoration: none;
}
#chromebooks, #carts {
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 {
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;
}
//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%;
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{
h5 {
margin-top:0.3%;
margin-bottom:0.3%;
color:#777;
@ -216,25 +27,48 @@ h5{
padding-top:3%;
text-align: center;
}
h6{
margin:0;
padding:1% 10% 0% 0%;
padding-left:3.6%;
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;
}
/* End */
/* Center Boxes -- All HTML Files */
.initial {
margin-top:24.5%;
max-width:600px;
}
.main-center, .main-center-admin, .initial {
background-color: #F7F7FF;
border-radius:15px;
margin-left:auto;
margin-right:auto;
margin-bottom:0;
height:auto;
box-shadow: 0px 5px 10px #222222;
}
.main-center, .main-center-admin {
max-height:700px;
margin-top:4%;
}
.main-center {
max-width:825px;
}
.main-center-admin {
max-width:900px;
}
/* End */
/* Chromebook Content */
.chromebooks, .chckChromebooks, .tchChromebooks {
overflow: auto;
padding-top:.5%;
padding-bottom:.5%;
}
.row, .row-admin {
height: 10%;
display: flex;
}
/* End */

View File

@ -24,5 +24,4 @@
}
.tabs-content-container {
padding: 4.2% 15px 15px 15px;
}
}

View File

@ -4,7 +4,7 @@
<!-- You can put the tabs anywhere and style them however you want! -->
<ul class="tabs-list">
{{#each tabs}}
<li class="tab-item {{activeTab slug}}">{{name}}</li>
<li class="tab-item {{activeTab slug}}" style="">{{name}}</li>
{{/each}}
</ul>
</div>

View File

@ -1,26 +1,29 @@
<template name="teacher">
<div id="main-center">
<div class="main-center">
<div>
<h5>Chromebook Checkout</h5>
<div>
</div>
{{#teacherTabs tabs=tabs}}
<!-- Single -->
<div id="tchromebooks">
<div class="tchChromebooks">
<div>
{{#each chromebooks}}
<div class="row">
{{> chromebook}}
</div>
{{/each}}
</div>
</div>
</div>
<!-- Carts -->
<div>
<div class="tchChromebooks">
<div>
{{#each carts}}
<div class="row">
{{>cart}}
</div>
{{/each}}
</div>
</div>
</div>
{{/teacherTabs}}
</div>
</div>
</template>