css fixes due to animation, more google sites

This commit is contained in:
ksjdragon 2015-01-31 21:04:08 -05:00
parent aff4818f80
commit d2b12ae8c1
11 changed files with 36 additions and 11 deletions

View File

@ -1,7 +1,3 @@
.overlap-fix {
margin-left:100px;
margin-top: 16px;
}
.yield:hover, .yieldc:hover {
color: #E14C2B;
}

View File

@ -29,15 +29,15 @@
<div class="border">
<div>
<h6> Edit Carts</h6> <!-- Editing Carts -->
{{#momentum plugin='slide-fade'}}
{{#each carts}}
<div class="row-admin">
{{>cart}}
<i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i>
<div class="overlap-fix">
<i class="icons crossc fa fa-times fa-lg"></i>
</div>
</div>
{{/each}}
{{/momentum}}
<h6>Add a Cart</h6> <!-- Adding Carts -->
<form class="new-task">
<input type="text" name="acnumber" placeholder="Cart Number (ex. A)" class="submission"/>

View File

@ -1,5 +1,5 @@
<template name="cart">
<div class="cart chromebook {{status_class}}">
<div class="cart chromebook {{status_class}} {{url}}">
<p class="pure-u-3-5">Cart {{number}}</p>
{{#if status }}
<div class="timestamp pure-u-2-5">

View File

@ -16,6 +16,9 @@ Template.cart.helpers({
} else {
return moment(this.last_checkout).fromNow();
}
},
url: function() {
return Router.current().originalUrl.replace("/", "");
}
});

View File

@ -5,11 +5,13 @@
</div>
<div class="chckBorder">
<div class="chckChromebooks">
{{#momentum plugin='slide-fade'}}
{{#each chromebooks}}
<div class="row">
{{> chromebook}}
</div>
{{/each}}
{{/momentum}}
</div>
</div>
</div>

View File

@ -19,6 +19,10 @@ body {
max-width: 81%;
}
.checkout, .teacher {
min-width: 94%;
}
.chromebook:hover {
box-shadow: 5px 0 12px #919191, -5px 0 12px #919191;
outline: #25abd9 solid 3px;
@ -36,10 +40,11 @@ body {
color: #5A5A5A;
transition: color 0.5s;
}
.icons.yield.fa.fa-exclamation-triangle.fa-lg {
.icons.yield.fa.fa-exclamation-triangle.fa-lg, .icons.yieldc.fa.fa-exclamation-triangle.fa-lg {
margin-right: 6%;
}
.cross:hover, .crossc:hover{
color: #E14C2B;
}

View File

@ -1,5 +1,5 @@
<template name="chromebook">
<div class="chromebook {{status_class}}">
<div class="chromebook {{status_class}} {{url}}">
<p class="pure-u-3-5">Chromebook #{{number}}</p>
{{#if status}}
<div class="timestamp pure-u-2-5">

View File

@ -16,6 +16,9 @@ Template.chromebook.helpers({
} else {
return moment(this.last_checkout).fromNow();
}
},
url: function() {
return Router.current().originalUrl.replace("/", "");
}
});

View File

@ -4,7 +4,9 @@ var links = [
"https://translate.google.com",
"https://keep.google.com/",
"https://mail.google.com/mail/u/0/",
"https://classroom.google.com/h"
"https://classroom.google.com/h",
"https://maps.google.com/",
"https://earth.google.com/",
]
Template.initial.events({
@ -16,3 +18,12 @@ Template.initial.events({
Router.go('/checkout');
}
})
Template.login.events({
'click .chromeicon': function() {
var randomint = Math.floor(Math.random() * (links.length - 1));
window.open(links[randomint], "_blank");
},
'click .submit': function() {
Router.go('/checkout');
}
})

View File

@ -8,22 +8,26 @@
<div class="tchChromebooks">
<div>
<div>
{{#momentum plugin='slide-fade'}}
{{#each chromebooks}}
<div class="row">
{{> chromebook}}
</div>
{{/each}}
{{/momentum}}
</div>
</div>
</div>
<!-- Carts -->
<div class="tchChromebooks">
<div>
{{#momentum plugin='slide-fade'}}
{{#each carts}}
<div class="row">
{{>cart}}
</div>
{{/each}}
{{/momentum}}
</div>
</div>
{{/teacherTabs}}

View File

@ -33,7 +33,8 @@ var teachers = [
// Add all Teachers here
"mminer@bloomfield.org",
"qalieh.yaman90@bloomfield.org",
"ruhelski@bloomfield.org"
"ruhelski@bloomfield.org",
"jao.kenneth43@bloomfield.org"
];
for (var i = 0; i < teachers.length; i++) {
var teacher = teachers[i];