Display fixesfor cross-browsers compatibility

This commit is contained in:
Kenneth Jao 2016-08-11 22:14:13 -04:00
parent f8f36f2616
commit a15b70adc5
5 changed files with 29 additions and 18 deletions

View File

@ -78,6 +78,7 @@ h2.text {
p.text {
font-size: 150%;
margin-bottom: 5%;
}
#loginButton {

View File

@ -6,7 +6,7 @@
<div id="progress" style="background-color:{{loadType}};width:{{loadPercent}}"></div>
</div>
</header>
<div id="loginMain">
<div id="loginMain" style="background-size:{{width}}">
<div id="circle" style="width:{{dim}};height:{{dim}};margin:{{margin}}">
<div id="loginContent" style="width:{{contDim}};height:{{contDim}};margin:{{contMargin}}">
<h2 class="text">Hourglass</h2>

View File

@ -4,6 +4,10 @@
cursor: pointer;
}
.radio {
cursor: pointer;
}
.changeInput {
font-size: 100%;
padding: 0;
@ -93,10 +97,11 @@
transition: opacity 0.4s ease;
}
.profOptions p {
.profOptionText {
font-size: 150%;
min-width: 10%;
padding: 20px;
margin: 0;
padding: 20%;
text-align: center;
cursor: pointer;
@ -376,6 +381,7 @@
#save h2 {
font-weight: 200;
width: 100%;
padding: 8%;
-webkit-filter: none;

View File

@ -22,10 +22,10 @@
<span class="change radio" opc="0" op="0" re="readonly" id="grade">{{grade}}</span>
</div>
<div class="profOptions" style="background-color:{{divColor 'header'}}">
<p>9th</p>
<p>10th</p>
<p>11th</p>
<p>12th</p>
<p class="profOptionText">9th</p>
<p class="profOptionText">10th</p>
<p class="profOptionText">11th</p>
<p class="profOptionText">12th</p>
</div>
</div>
</div>
@ -56,9 +56,9 @@
<span class="subscriptions classText">Members</span>
</div>
<div class="classHolder" style="max-height:{{classHolderHeight}}">
{{#each myclasses}}
<!-- {{#each myclasses}}
{{> classDisplay}}
{{/each}}
{{/each}} -->
</div>
{{/if}}
@ -110,17 +110,17 @@
<p class="profTitle">Privacy:</p>
<input class="creInput radio op" type="text" name="privacy" opc="1" op="1" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p>Public</p>
<p>Private</p>
<p class="profOptionText">Public</p>
<p class="profOptionText">Private</p>
</div>
</div>
<div>
<p class="profTitle">Category:</p>
<input class="creInput radio op" type="text" name="category" opc="1" op="2" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p>Class</p>
<p>Club</p>
<p>Other</p>
<p class="profOptionText">Class</p>
<p class="profOptionText">Club</p>
<p class="profOptionText">Other</p>
</div>
</div>
<h3 id="creSubmit" style="margin-left:{{submitMargin}}">Submit Request</h3>

View File

@ -111,7 +111,7 @@ Template.profile.helpers({
},
grade() {
if(Meteor.user().profile.grade !== undefined) {
return Meteor.user().profile.grade;
return Meteor.user().profile.grade+"th";
} else {
return "Click here to edit...";
}
@ -145,13 +145,13 @@ Template.profile.helpers({
autocompleteClasses() {
return Session.get("autocompleteDivs");
},
myclasses() {
/*myclasses() {
if (Meteor.user().profile.classes === undefined || Meteor.user().profile.classes.length === 0) {
return [];
} else {
return Meteor.user().profile.classes;
}
},
},*/
notfound() {
return Session.get("notfound");
},
@ -403,7 +403,11 @@ Template.profile.events({
})
function openDivFade(div) {
div.style.display = "block";
if(div.className === "profOptions") {
div.style.display = "inline-block";
} else {
div.style.display = "block";
}
div.style.opacity = "0";
setTimeout(function() {
div.style.opacity = "1";