kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed css, removed scrollbar

Browse Source
This commit is contained in:
ksjdragon 2015-02-09 20:00:56 -05:00
parent 5eedb68e0f
commit 59125b4f35
16 changed files with 128 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chromebook-checkout-meteor/.meteor/packages
View File

@ -14,5 +14,4 @@ fortawesome:fontawesome
templates:tabs
accounts-ui
percolate:momentum
maazalik:malihu-jquery-custom-scrollbar
ongoworks:security

1
chromebook-checkout-meteor/.meteor/versions
View File

@ -41,7 +41,6 @@ less@1.0.12
livedata@1.0.12
localstorage@1.0.2
logging@1.0.6
maazalik:malihu-jquery-custom-scrollbar@3.0.6
meteor@1.1.4
meteor-platform@1.2.1
minifiers@1.1.3

78
chromebook-checkout-meteor/.meteor/versions~ Normal file
View File

@ -0,0 +1,78 @@
accounts-base@1.1.3
accounts-google@1.0.3
accounts-oauth@1.1.3
accounts-ui@1.1.4
accounts-ui-unstyled@1.1.5
alanning:roles@1.2.13
application-configuration@1.0.4
autoupdate@1.1.4
base64@1.0.2
binary-heap@1.0.2
blaze@2.0.4
blaze-tools@1.0.2
boilerplate-generator@1.0.2
callback-hook@1.0.2
check@1.0.3
coffeescript@1.0.5
ddp@1.0.13
deps@1.0.6
ejson@1.0.5
fastclick@1.0.2
follower-livedata@1.0.3
fortawesome:fontawesome@4.2.0_2
geojson-utils@1.0.2
google@1.1.3
html-tools@1.0.3
htmljs@1.0.3
http@1.0.9
id-map@1.0.2
iron:controller@1.0.6
iron:core@1.0.6
iron:dynamic-template@1.0.6
iron:layout@1.0.6
iron:location@1.0.6
iron:middleware-stack@1.0.6
iron:router@1.0.6
iron:url@1.0.6
jquery@1.0.2
json@1.0.2
launch-screen@1.0.1
less@1.0.12
livedata@1.0.12
localstorage@1.0.2
logging@1.0.6
maazalik:malihu-jquery-custom-scrollbar@2.8.3
meteor@1.1.4
meteor-platform@1.2.1
minifiers@1.1.3
minimongo@1.0.6
mobile-status-bar@1.0.2
momentjs:moment@2.8.4
mongo@1.0.10
mrt:purecss@0.6.0
oauth@1.1.3
oauth2@1.1.2
observe-sequence@1.0.4
ongoworks:security@1.0.1
ordered-dict@1.0.2
percolate:momentum@0.7.0
percolate:velocityjs@1.1.0
random@1.0.2
reactive-dict@1.0.5
reactive-var@1.0.4
reload@1.1.2
retry@1.0.2
routepolicy@1.0.3
service-configuration@1.0.3
session@1.0.5
spacebars@1.0.4
spacebars-compiler@1.0.4
templates:array@1.0.0
templates:tabs@1.1.0
templating@1.0.10
tracker@1.0.4
ui@1.0.5
underscore@1.0.2
url@1.0.3
webapp@1.1.5
webapp-hashing@1.0.2

23
chromebook-checkout-meteor/client/admin.css
View File

@ -1,6 +1,3 @@
.yield:hover, .yieldc:hover {
color: #E14C2B;
}
.row-admin {
min-width: 100%;
}
@ -11,7 +8,7 @@
margin-top: 0%;
font-size: 14pt;
}
.add, .addc {
.add {
background: #d94158;
background-image: -webkit-linear-gradient(top, #d94158, #ad3838);
background-image: -moz-linear-gradient(top, #d94158, #ad3838);
@ -27,7 +24,7 @@
width: 97%;
font-size: 18pt;
}
.add:hover, .addc:hover {
.add:hover {
background: #db6b6b;
background-image: -webkit-linear-gradient(top, #db6b6b, #d64949);
background-image: -moz-linear-gradient(top, #db6b6b, #d64949);
@ -36,19 +33,3 @@
background-image: linear-gradient(to bottom, #db6b6b, #d64949);
text-decoration: none;
}
.border {
padding: 1% 0px 1% 15px;
overflow:auto;
min-width:700px;
}
.remove {
margin-bottom: 4%;
}
.yield:hover {
color: #E14C2B;
}
.row {
min-width: 80%;
}

11
chromebook-checkout-meteor/client/admin.html
View File

@ -5,7 +5,6 @@
</div>
{{#teacherTabs tabs=tabs}}
<!-- Single -->
<div class="border">
<div>
<h6>Edit Chromebooks</h6> <!-- Edit Chromebooks -->
{{#momentum plugin='slide-fade'}}
@ -24,27 +23,25 @@
<input type="submit" value="Submit" class="add" />
</form>
</div>
</div>
<!-- Carts -->
<div class="border">
<div>
<h6> Edit Carts</h6> <!-- Edit Carts -->
{{#momentum plugin='slide-fade'}}
{{#each carts}}
<div class="row-admin">
{{>cart}}
<i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i>
<i class="icons crossc fa fa-times fa-lg"></i>
<i class="icons yield fa fa-exclamation-triangle fa-lg"></i>
<i class="icons cross fa fa-times fa-lg"></i>
</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"/>
<input type="submit" value="Submit" class="add, addc" />
<input type="submit" value="Submit" class="add addc" />
</form>
</div>
</div>
{{/teacherTabs}}
</div>
</template>

9
chromebook-checkout-meteor/client/admin.js
View File

@ -52,12 +52,3 @@ Template.admin.events({
}
});
Template.admin.rendered = function() {
$(".border.tabs-content").mCustomScrollbar({
theme: 'dark',
scrollInertia: 10,
mouseWheel: { deltaFactor: 30 },
alwaysShowScrollbar: 2
});
}

4
chromebook-checkout-meteor/client/checkout.html Normal file → Executable file
View File

@ -3,8 +3,8 @@
<div>
<h5>Chromebook Checkout</h5>
</div>
<div class="chckBorder">
<div class="chckChromebooks">
<div class="dataContainer">
<div>
{{#momentum plugin='slide-fade'}}
{{#each chromebooks}}
<div class="row">

8
chromebook-checkout-meteor/client/checkout.js
View File

@ -3,12 +3,4 @@ Template.checkout.helpers({
return Chromebooks.find({}, {sort: {number: 1}});
}
});
Template.checkout.rendered = function() {
$(".chckChromebooks").mCustomScrollbar({
theme: 'dark',
scrollInertia: 10,
mouseWheel: { deltaFactor: 40 },
alwaysShowScrollbar: 2
});
}

40
chromebook-checkout-meteor/client/chromebook.css
View File

@ -1,12 +1,7 @@
body {
-webkit-user-select: none;
}
.pure-u-3-5 {
margin-top: 1.5%;
margin-bottom: 1.5%;
}
.chromebook {
font-family: Lato;
padding-left:2%;
@ -16,42 +11,39 @@ body {
box-shadow: 3px 3px 10px #c2c2c2;
color: #000000;
height: 10%;
max-width: 81%;
max-height: 10%;
max-height: 70px;
min-width: 79%;
}
.checkout, .teacher {
min-width: 94%;
.checkout {
min-width: 760px;
max-width: 760px;
}
.teacher {
min-width: 805px;
max-width: 805px;
}
.admin {
max-width: 700px;
min-width: 700px;
}
.chromebook:hover {
box-shadow: 5px 0 12px #919191, -5px 0 12px #919191;
outline: #25abd9 solid 3px;
}
.timestamp {
color: #6D6E6D;
float: right;
}
.icons {
float: right;
margin-top: 3%;
margin-left: 2%;
margin-top: 27px;
margin-left: 17px;
color: #5A5A5A;
transition: color 0.5s;
}
.yield {
margin-right: 2%;
}
.cross:hover, .crossc:hover{
.cross:hover, .yield:hover {
color: #E14C2B;
}
.user {
font-size: 65%;
margin-top: 2%;
@ -69,22 +61,18 @@ body {
margin-bottom: 0%;
transition: color 0.5s;
}
.available {
background-color:#72D376;
transition: background-color 1s;
}
.checkedout {
background-color:#F9DB45;
transition: background-color 1s;
}
.unavailable {
background-color:#E14C2B;
transition: background-color 1s;
}
.unavailable .user, .unavailable .time {
color: white;
}

2
chromebook-checkout-meteor/client/chromebook.html
View File

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

4
chromebook-checkout-meteor/client/chromebook.js
View File

@ -17,8 +17,8 @@ Template.chromebook.helpers({
return moment(this.last_checkout).fromNow();
}
},
url: function() {
return window.location.href.replace("http://cbook.meteor.com/", "");
page: function() {
return Router.current().route.path().replace("/", "");
}
});

19
chromebook-checkout-meteor/client/main.css
View File

@ -15,7 +15,6 @@ body {
color:#777;
font-weight:300;
height:100%;
overflow:hidden;
width: 100%;
margin: 0;
}
@ -52,6 +51,7 @@ h6 {
.main-center, .main-center-admin {
max-height:650px;
margin-top:4%;
padding: 0.7%;
}
.main-center {
max-width:825px;
@ -62,13 +62,20 @@ h6 {
/* End */
/* Chromebook Content */
.chromebooks, .chckChromebooks, .tchChromebooks {
overflow: auto;
padding-top:.5%;
padding-bottom:.5%;
}
.row, .row-admin {
max-height: 10%;
display: flex !important;
}
.row {
min-width: 80%;
}
.dataContainer {
min-height: 425px;
max-height: 425px;
min-width: 875px;
max-width: 875px;
padding: 1% 80% 1% 0px;
margin-right: -80% !important;
overflow: auto;
}
/* End */

3
chromebook-checkout-meteor/client/router.js
View File

@ -39,3 +39,6 @@ Router.route('/teacher', function() {
this.redirect('/login');
}
});
Router.plugin('dataNotFound', function() {
this.redirect('/')
});

10
chromebook-checkout-meteor/client/tabs.css
View File

@ -26,15 +26,15 @@
background-color: rgba(212, 212, 212, .7);
border-bottom: 5px solid rgba(225, 76, 43, .5);
}
.tab-item.active:hover {
border-bottom: 5px solid #E14C2B;
background-color: #fff;
}
.tabs-content-container {
padding: 4.2% 15px 15px 15px;
}
.tabs-content {
overflow: auto;
min-height: 425px;
max-height: 425px;
min-width: 875px;
max-width: 875px;
padding: 1% 80% 1% 0px;
margin-right: -80% !important;
overflow: auto;
}

4
chromebook-checkout-meteor/client/teacher.html
View File

@ -5,7 +5,6 @@
</div>
{{#teacherTabs tabs=tabs}}
<!-- Single -->
<div class="tchChromebooks">
<div>
<div>
{{#momentum plugin='slide-fade'}}
@ -17,9 +16,7 @@
{{/momentum}}
</div>
</div>
</div>
<!-- Carts -->
<div class="tchChromebooks">
<div>
{{#momentum plugin='slide-fade'}}
{{#each carts}}
@ -29,7 +26,6 @@
{{/each}}
{{/momentum}}
</div>
</div>
{{/teacherTabs}}
</div>
</template>

14
chromebook-checkout-meteor/client/teacher.js
View File

@ -11,10 +11,7 @@ Template.teacher.helpers({
{ name: 'Single', slug: 'single' },
{ name: 'Carts', slug: 'carts' }
];
}
});
Template.teacher.helpers({
},
chromebooks: function() {
return Chromebooks.find({}, {sort: {number: 1}});
},
@ -22,12 +19,3 @@ Template.teacher.helpers({
return carts.find();
}
});
Template.teacher.rendered = function() {
$(".tchChromebooks").mCustomScrollbar({
theme: 'dark',
scrollInertia: 10,
mouseWheel: { deltaFactor: 30 },
alwaysShowScrollbar: 2
});
}