custom scrollbar added

This commit is contained in:
ksjdragon 2015-01-18 18:57:17 -05:00
parent 1bdaf75e3c
commit 4b87b0d6f8
9 changed files with 32 additions and 10 deletions

View File

@ -13,5 +13,5 @@ alanning:roles
mrt:purecss mrt:purecss
fortawesome:fontawesome fortawesome:fontawesome
templates:tabs templates:tabs
mrt:malihu-custom-scrollbar
accounts-ui accounts-ui
maazalik:malihu-jquery-custom-scrollbar

View File

@ -42,6 +42,7 @@ less@1.0.12
livedata@1.0.12 livedata@1.0.12
localstorage@1.0.2 localstorage@1.0.2
logging@1.0.6 logging@1.0.6
maazalik:malihu-jquery-custom-scrollbar@3.0.6
meteor@1.1.4 meteor@1.1.4
meteor-platform@1.2.1 meteor-platform@1.2.1
minifiers@1.1.3 minifiers@1.1.3
@ -49,7 +50,6 @@ minimongo@1.0.6
mobile-status-bar@1.0.2 mobile-status-bar@1.0.2
momentjs:moment@2.8.4 momentjs:moment@2.8.4
mongo@1.0.10 mongo@1.0.10
mrt:malihu-custom-scrollbar@0.1.1
mrt:purecss@0.6.0 mrt:purecss@0.6.0
oauth@1.1.3 oauth@1.1.3
oauth2@1.1.2 oauth2@1.1.2

View File

@ -41,9 +41,8 @@
text-decoration: none; text-decoration: none;
} }
.border { .border {
padding: 1% 15px 1% 15px; padding: 1% 0px 1% 15px;
overflow:auto; overflow:auto;
max-height:550px;
min-width:700px; min-width:700px;
} }
.remove { .remove {

View File

@ -112,4 +112,11 @@ Template.admin.events({
alert("Access Denied"); alert("Access Denied");
} }
} }
}); });
Template.admin.rendered = function() {
$(".border.tabs-content").mCustomScrollbar({
theme: 'dark'
});
}

View File

@ -4,7 +4,6 @@ Template.checkout.helpers({
} }
}); });
Template.checkout.events({ Template.checkout.events({
'click .edit': function() { 'click .edit': function() {
if (Roles.userIsInRole(Meteor.userId(), ['admin'])) { if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
@ -22,4 +21,10 @@ Template.checkout.events({
alert("Access Denied"); alert("Access Denied");
} }
} }
}); });
Template.checkout.rendered = function() {
$(".chckChromebooks").mCustomScrollbar({
theme: 'dark'
});
}

View File

@ -11,7 +11,8 @@ body {
font-family: Lato; font-family: Lato;
padding-left:2%; padding-left:2%;
margin-left:3%; margin-left:3%;
margin-bottom: 3%; margin-bottom: 1%;
margin-top: 1%;
box-shadow: 3px 3px 10px #c2c2c2; box-shadow: 3px 3px 10px #c2c2c2;
color: #000000; color: #000000;
height: 10%; height: 10%;

View File

@ -13,6 +13,10 @@ Router.route('/checkout', function() {
Router.route('/login', function() { Router.route('/login', function() {
if (Meteor.user()) { if (Meteor.user()) {
this.redirect('/checkout'); this.redirect('/checkout');
} else if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
this.redirect('/admin');
} else if (Roles.userIsInRole(Meteor.userId(), ['teacher'])) {
this.redirect('/teacher');
} else { } else {
this.render("login"); this.render("login");
} }
@ -31,5 +35,5 @@ Router.route('/teacher', function() {
this.render("teacher"); this.render("teacher");
} else { } else {
this.redirect('/login'); this.redirect('/login');
} }
}); });

View File

@ -27,7 +27,7 @@
padding: 4.2% 15px 15px 15px; padding: 4.2% 15px 15px 15px;
} }
.tabs-content { .tabs-content {
overflow-y: scroll; overflow: auto;
min-height: 425px; min-height: 425px;
max-height: 425px; max-height: 425px;
} }

View File

@ -22,3 +22,9 @@ Template.teacher.helpers({
return carts.find(); return carts.find();
} }
}); });
Template.teacher.rendered = function() {
$(".tchChromebooks").mCustomScrollbar({
theme: 'dark'
});
}