Scrolling CSS fix, and minor css fix

This commit is contained in:
Kenneth Jao 2016-09-10 19:08:32 -04:00
parent 4d4fb0d69c
commit e5b27791a9
3 changed files with 495 additions and 470 deletions

View File

@ -85,6 +85,12 @@ body {
pointer-events: all;
}
.noScroll {
width: 100%;
height: 100%;
position: fixed;
}
#mainHeader {
font-weight: 600;
width: 100%;
@ -1027,7 +1033,7 @@ input, textarea {
}
.doneUser {
font-size: 110%;
font-size: 1.5vh;
margin: 0;
padding: 4% 4% 3% 6%;
background-color: rgba(0,0,0,0.1);
@ -1045,20 +1051,33 @@ input, textarea {
background-color: rgba(0,0,0,0.15);
}
.doneUser div {
height: 2vw;
line-height: 2vw;
text-align: center;
}
.doneUser img {
height: 2vw;
width: 2vw;
margin-right: 0.5vw;
margin-bottom: 0.3vw;
display: inline-block;
vertical-align: middle;
line-height: normal;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
}
.doneUser span {
position: absolute;
top: 32%;
width: 7.5vw;
margin-bottom: 0.3vw;
display: inline-block;
vertical-align: middle;
line-height: normal;
}
#toggleButtons {
@ -1103,12 +1122,6 @@ input, textarea {
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15);
}
.workCreator span {
font-weight: 400;
font-size: 1.2vh;
text-align: center;
}
#userTab {
width: 0;
height: 0;

View File

@ -4,6 +4,7 @@
</head>
<template name="main">
<div class="noScroll">
<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>
@ -188,8 +189,12 @@
<p>{{work 'reports'}}</p>
</div>
<div class="workCreator doneUser" onclick="window.location='/user/{{work 'email'}}'">
<div style="display:inline-block">
<img src="{{work 'avatar'}}">
<span>Created by<br>{{work 'creator'}}</span>
</div>
<div style="display:inline-block;margin-left:0.3vw">
<span>{{work 'creator'}}</span>
</div>
</div>
</div>
</div>
@ -243,6 +248,7 @@
</div>
</div>
{{> loginButtons}}
</div>
</template>
<template name="sidebarClasses">
@ -311,7 +317,11 @@
<template name="doneUsers">
<div class="doneUser" onclick="window.location='/user/{{email}}'">
<div style="display:inline-block">
<img src='{{avatar}}'>
</div>
<div style="display:inline-block;margin-left:0.3vw">
<span>{{user}}</span>
</div>
</div>
</template>

View File

@ -1,4 +1,5 @@
<template name="profile">
<div class="noScroll">
<div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div>
<div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div>
<div id="profPage" style="background-color:{{divColor 'header'}};{{textColor}}{{loadNew}}">
@ -258,6 +259,7 @@
<h4 id="privSubmit">Submit</h4>
</div>
{{> loginButtons}}
</div>
</template>
<template name="classDisplay">