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

Fixed join class CSS in profile

Browse Source
This commit is contained in:
Kenneth Jao 2016-09-06 19:52:37 -04:00
parent 160d50af1f
commit 5484edfd8b
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -129,9 +129,11 @@
{{/if}} {{/if}}
{{#if profClassTab "addClass"}} {{#if profClassTab "addClass"}}
<i class="fa fa-search" aria-hidden="true"></i> <div id="joinTop">
{{> inputAutocomplete id="profClassSearch" settings=classSettings placeholder="Search..."}} <i class="fa fa-search" aria-hidden="true"></i>
<h4 id="private">Join Private Class</h4> {{> inputAutocomplete id="profClassSearch" settings=classSettings placeholder="Search..."}}
<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" ||