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

CSS fixes, and update packages

Browse Source
This commit is contained in:
Kenneth Jao 2016-09-08 21:32:10 -04:00
parent c37244fce8
commit 4143d2cf05
7 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hourglass/.meteor/packages
View File

@ -21,7 +21,7 @@ fortawesome:fontawesome
session@1.1.6
proyk:meteor-cookies
aldeed:simple-schema
accounts-google@1.0.10
accounts-google
accounts-ui@1.1.9
iron:router
ongoworks:security

12
hourglass/.meteor/versions
View File

@ -1,7 +1,7 @@
accounts-base@1.2.11
accounts-google@1.0.10
accounts-oauth@1.1.13
accounts-password@1.1.13
accounts-password@1.3.0
accounts-ui@1.1.9
accounts-ui-unstyled@1.1.12
alanning:roles@1.2.15
@ -22,7 +22,7 @@ callback-hook@1.0.9
check@1.2.3
coffeescript@1.2.4_1
dandv:caret-position@2.1.1
dburles:mongo-collection-instances@0.3.4
dburles:mongo-collection-instances@0.3.5
ddp@1.2.5
ddp-client@1.3.1
ddp-common@1.2.6
@ -33,7 +33,7 @@ diff-sequence@1.0.6
ecmascript@0.5.8
ecmascript-runtime@0.3.14
ejson@1.0.12
email@1.0.16
email@1.1.17
es5-shim@4.6.14
eternicode:bootstrap-datepicker@1.6.0_3
fastclick@1.0.12
@ -55,7 +55,7 @@ iron:middleware-stack@1.1.0
iron:router@1.0.13
iron:url@1.0.11
jquery@1.11.9
lai:collection-extensions@0.1.4
lai:collection-extensions@0.2.1_1
launch-screen@1.0.12
less@2.7.5
livedata@1.0.18
@ -75,8 +75,8 @@ modules-runtime@0.7.6
momentjs:moment@2.14.4
mongo@1.1.12
mongo-id@1.0.5
npm-bcrypt@0.8.6_3
npm-mongo@1.5.48
npm-bcrypt@0.9.1
npm-mongo@1.5.49
oauth@1.1.11
oauth2@1.1.10
observe-sequence@1.0.12

37
hourglass/client/login/login.css
View File

@ -2,6 +2,8 @@
width: 100%;
height: 100%;
display: table;
table-layout: fixed;
border-collapse: collapse;
}
@ -10,57 +12,52 @@
height: 4px;
background-color: #33ADFF;
position: absolute;
bottom: 0;
top: 13vh;
z-index: 51;
}
flogin
#loginHeader {
font-weight: 600;
width: 100%;
height: 13vh;
background-color: #EBEBEB;
box-shadow: 2px 2px 5px 3px #666;
background-color: #EBEBEB;
display: table-row;
position: relative;
position: absolute;
top: 0;
z-index: 50;
}
#logo {
height: 10vh;
width: 10vh;
padding: 0.5%;
padding-left: 1%;
padding: 1.1vh;
padding-left: 1.5vh;
float: left;
-webkit-filter: drop-shadow(2px 2px 5px #333);
filter: drop-shadow(2px 2px 5px #333);
}
#banner {
height: 100%;
position: relative;
}
#loginTitle {
font-size: 255%;
font-size: 5vh;
color: #000 !important;
padding: 1.4%;
padding-left: 1%;
padding: 3vh;
}
#loginMain {
width: 100%;
height: 80vh;
border-top: solid 1vh #33ADFF;
display: table-row;
background-color: #E5E5E5;
background-image: url("banner100.jpg");
background-size: 100vw 80vh;
display: table-row;
position: absolute;
top: 13vh;
}
#circle {
@ -74,6 +71,8 @@ flogin
border-radius: 50%;
background-color: rgba(0,0,0,0.2);
position: relative;
z-index: 0;
-webkit-filter: drop-shadow(2px 2px 5px #333);
filter: drop-shadow(2px 2px 5px #333);
@ -153,7 +152,7 @@ p.text {
}
#github {
font-size: 150%;
font-size: 3vh;
color: #000 !important;
margin: 0;
padding: 1%;

17
hourglass/client/main/main.css
View File

@ -85,7 +85,7 @@ body {
pointer-events: all;
}
header {
#mainHeader {
font-weight: 600;
width: 100%;
height: 6vh;
@ -102,7 +102,7 @@ header {
transition: background-color 0.5s ease;
}
header h1, header h2 {
#mainHeader h1, #mainHeader h2 {
-webkit-filter: none;
filter: none;
}
@ -187,7 +187,7 @@ header h2 {
}
#login-buttons {
display: none;
display: none !important;
}
#dropdown {
@ -1052,6 +1052,10 @@ header h2 {
border-left: 2.5vh solid transparent;
border-right: 2.5vh solid transparent;
-webkit-filter: drop-shadow(0px -1px 1px #444);
filter: drop-shadow(0px -1px 1px #444);
position: absolute;
top: -2.9vh;
@ -1136,8 +1140,9 @@ header h2 {
#requests {
width: 25vw;
margin-bottom: -15.8%;
padding: 1.5%;
height: 9vw;
margin-bottom: -13.3vw;
padding: 2vw;
border-top: 5px solid #852E6D;
box-shadow: -2px 0px 5px 1px #444;
@ -1163,7 +1168,7 @@ header h2 {
position: absolute;
right: 0;
top: -4.3vw;
top: -4vw;
cursor: pointer;
z-index: 15;

2
hourglass/client/main/main.html
View File

@ -4,7 +4,7 @@
</head>
<template name="main">
<header style="background-color:{{userProfile}}{{divColor 'header'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
<header id="mainHeader" style="background-color:{{userProfile}}{{divColor 'header'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
<i class="fa fa-bars" aria-hidden="true" style="color:{{iconColor 'menu'}}"></i>
<h1>Hourglass</h1><h2>{{schoolName}}</h2>
<i class="fa fa-cog" aria-hidden="true" style="color:{{iconColor 'options'}}"></i>

4
hourglass/client/main/main.js
View File

@ -452,7 +452,7 @@ Template.main.events({
}
if(!document.getElementById("userDropdown").contains(event.target)) closeDivFade(document.getElementById("userDropdown"));
if(!document.getElementById("requests").contains(event.target)) document.getElementById("requests").style.marginBottom = "-15.8%";
if(!document.getElementById("requests").contains(event.target)) document.getElementById("requests").style.marginBottom = "-13.3vw";
},
// MAIN MENU BUTTONS
'click .fa-bars' () { // Click menu button.
@ -568,7 +568,7 @@ Template.main.events({
Meteor.call("createRequest", array, function(err,result) {
area.value = "Request sent!";
setTimeout(function(){
document.getElementById("requests").style.marginBottom = "-15.8%";
document.getElementById("requests").style.marginBottom = "-13.3vw";
area.value = "";
},1000);
})

1
hourglass/package.json
View File

@ -5,6 +5,7 @@
"start": "meteor run"
},
"dependencies": {
"bcrypt": "^0.8.7",
"meteor-node-stubs": "~0.2.0"
}
}