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

Merge branch 'master' of https://github.com/ksjdragon/hourglass

Browse Source
This commit is contained in:
Yaman Qalieh 2016-09-06 20:56:40 -04:00
commit a4b380695f
4 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,9 @@ h4 {
input, textarea { input, textarea {
font-family: 'Raleway'; font-family: 'Raleway';
background-color: #FEFEFE;
border: 3px solid #FEFEFE;
border-radius: 3px;
resize: none; resize: none;
} }

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

@ -16,7 +16,7 @@
} }
.profTitle { .profTitle {
font-size: 150%; font-size: 3vh;
font-weight: 400; font-weight: 400;
margin: 0; margin: 0;
margin-bottom: 1%; margin-bottom: 1%;
@ -24,7 +24,7 @@
} }
.profHea { .profHea {
font-size: 300; font-size: 5.5vh;
font-weight: 200; font-weight: 200;
padding: 6% 6% 0 8%; padding: 6% 6% 0 8%;
} }
@ -155,12 +155,10 @@
#cardColLeft { #cardColLeft {
width: 39.6%; width: 39.6%;
float: left;
} }
#cardColRight { #cardColRight {
width: 60%; width: 60%;
float: right;
} }
.card { .card {
@ -324,13 +322,17 @@
background-color: #138686; background-color: #138686;
} }
#joinTop .fa-search {
font-size: 2.5vh;
margin-right: 3%;
}
#private { #private {
margin: 3% 35% 0 4%; margin-left: 5%;
padding: 1.5%; padding: 1.5%;
background-color: rgba(0,0,0,0.2); background-color: rgba(0,0,0,0.2);
float: right;
cursor: pointer; cursor: pointer;
-webkit-transition: background-color 0.4s ease; -webkit-transition: background-color 0.4s ease;
@ -404,7 +406,7 @@
} }
.creInput { .creInput {
font-size: 120%; font-size: 2vh;
padding: 3%; padding: 3%;
} }
@ -420,8 +422,9 @@
#creSubmit { #creSubmit {
font-weight: 200; font-weight: 200;
font-size: 140%; font-size: 3vh;
margin: 0 35% 0 35%; width: 13vw;
margin: auto;
padding: 2%; padding: 2%;
background-color: rgba(0,0,0,0.25); background-color: rgba(0,0,0,0.25);
@ -668,16 +671,16 @@
} }
#joinPrivClass { #joinPrivClass {
width: 18%; width: 18vw;
margin-bottom: -20%; margin-bottom: -20%;
padding: 1.5%; padding: 1.5%;
padding-bottom: 2%; padding-bottom: 1%;
border-top: 5px solid #852E6D; border-top: 5px solid #852E6D;
box-shadow: -2px 0px 5px 1px #444; box-shadow: -2px 0px 5px 1px #444;
position: absolute; position: absolute;
right: 5%; right: 5vw;
bottom: 0; bottom: 0;
-webkit-transition: margin 0.4s ease; -webkit-transition: margin 0.4s ease;
@ -689,19 +692,23 @@
#joinPrivClass h3 { #joinPrivClass h3 {
font-weight: 400; font-weight: 400;
font-size: 150%; font-size: 150%;
margin-bottom: 3%; margin-bottom: 1vh;
} }
#privateCode { #privateCode {
font-size: 130%; font-size: 3vh;
width: 93%;
margin-top: 1%;
margin-bottom: 1vh;
padding: 1%; padding: 1%;
} }
#privSubmit { #privSubmit {
font-size: 120%; font-size: 2vh;
margin-left: 5%; margin-left: 5%;
padding: 3%; padding: 3%;
background-color: rgba(0,0,0,0.2); background-color: rgba(0,0,0,0.2);
float: right;
cursor: pointer; cursor: pointer;
-webkit-transition: background-color 0.2s ease; -webkit-transition: background-color 0.2s ease;

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

@ -129,9 +129,11 @@
{{/if}} {{/if}}
{{#if profClassTab "addClass"}} {{#if profClassTab "addClass"}}
<div id="joinTop">
<i class="fa fa-search" aria-hidden="true"></i> <i class="fa fa-search" aria-hidden="true"></i>
{{> inputAutocomplete id="profClassSearch" settings=classSettings placeholder="Search..."}} {{> inputAutocomplete id="profClassSearch" settings=classSettings placeholder="Search..."}}
<h4 id="private">Join Private Class</h4> <h4 id="private">Join Private Class</h4>
</div>
<div id="label" class="classBox"> <div id="label" class="classBox">
<span class="name classText">Class Name</span> <span class="name classText">Class Name</span>
<span class="teacher classText">Teacher</span> <span class="teacher classText">Teacher</span>

10
hourglass/client/profile/profile.js
View File

@ -232,19 +232,19 @@ Template.profile.events({
Session.set("profClassTab", "manClass");  Session.set("profClassTab", "manClass"); 
div.style.height = "90%";            div.style.height = "90%";           
openDivFade(functionHolder);         openDivFade(functionHolder);        
}, 400);     }, 400);
}, },
    'click .createClass' () {     'click .createClass' () {
if(Session.equals("profClassTab","creClass")) return;        if(Session.equals("profClassTab","creClass")) return;
var functionHolder = document.getElementById("profClassInfoHolder");         var functionHolder = document.getElementById("profClassInfoHolder");        
closeDivFade(functionHolder); closeDivFade(functionHolder);
var div = document.getElementById("profClasses"); var div = document.getElementById("profClasses");
div.style.height = "50%" div.style.height = "50%"
setTimeout(function() {             setTimeout(function() {
Session.set("profClassTab", "creClass"); Session.set("profClassTab", "creClass");
div.style.height = "90%"; div.style.height = "90%";
openDivFade(functionHolder);         openDivFade(functionHolder);
}, 400);     }, 400);
}, },
'click .classBox' (event) { // When you click on a box that holds class 'click .classBox' (event) { // When you click on a box that holds class
if (event.target.id === "label" || if (event.target.id === "label" ||