More partial fixes, css based

hourglass/client/main/main.js

@@ -101,6 +101,7 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
         return [];
     } else {
         var array = myClasses();
+        if(Meteor.Device.isPhone()) mobileWork();
         Session.set("myClasses", array);
         calendarEvents(array);
         $("#fullcalendar").fullCalendar("removeEvents");
@@ -699,6 +700,7 @@ sendData = function(funcName) { // Call Meteor function, and do actions after fu
                 toggleToMode("manageClass");
             }
         }
+        if(Meteor.Device.isPhone()) mobileWork();
         calendarEvents(myClasses());
         $("#fullcalendar").fullCalendar("removeEvents");
         $("#fullcalendar").fullCalendar("addEventSource", Session.get("calendarEvents"));
@@ -1002,7 +1004,7 @@ myClasses = function() {
             thisWork[j].confirmationLength = thisWork[j].confirmations.length; // Counts the number of confirmations and reports for a particular work.
             thisWork[j].reportLength = thisWork[j].reports.length;
 
-            thisWork[j].creator = Meteor.users.findOne({
+            thisWork[j].creatorname = Meteor.users.findOne({
                 _id: thisWork[j].creator
             }).profile.name;
             var conf = thisWork[j].confirmations.length;

hourglass/client/menus/menus.css

@@ -558,7 +558,6 @@
 	padding: 0;
 	background-color: transparent;
 	display: inline;
-	position: relative;
 }
 
 .formDiv:first-child {

hourglass/client/mobile/mobile.css

@@ -54,7 +54,7 @@
 
 #mobileBody {
 	width: 100%;
-	height: 92vh;
+	height: 92%;
 	margin-bottom: 10%;
 	overflow-y: auto;
 	overflow-x: hidden;
@@ -106,9 +106,11 @@
 }
 
 .mobileClassContent div {
-	width: 28%;
+	position: absolute;
-	display: inline-block;
+	right: 6%;
+	bottom: 11%;
 	text-align: right;
+
 }
 
 .minorHeader {
@@ -166,9 +168,13 @@
 }
 
 .mCircleButton .fa {
-	font-size: 5vw;
+	font-size: 5vw !important;
-	margin-left: 4.25vw;
+	padding: 0 !important;
-	margin-top: 4vw;
+	width: 100%;
+	height: 100%;
+	margin: auto;
+	text-align: center;
+	line-height: 13.1vw;
 
 	pointer-events: none;
 }
@@ -444,10 +450,6 @@
 	transition: background-color 0.4s ease; 
 }
 
-#mReport .fa {
-	margin-left: 4vw;
-}
-
 #mConfirm {
 	position: absolute;
 	bottom: 36vw;

hourglass/client/mobile/mobile.js

@@ -54,7 +54,6 @@ Template.mobile.rendered = function() {
 	        	sendData("editWork");
 	        }
 	        
-	        mobileWork();
 			$("#mainCircleButton").velocity("fadeOut", 200);
 	        $("#mobileBody").velocity("fadeOut", {
 				duration: 200,
@@ -120,7 +119,6 @@ Template.defaultSidebar.rendered = function() {
 		if(Session.equals("mobileMode", "main")) {
 			toggleSidebar(false);
 		} else {
-			mobileWork();
 			Session.set("mobileMode","main");
 			toggleSidebar(false);
 			timedPushback();
@@ -131,7 +129,6 @@ Template.defaultSidebar.rendered = function() {
 		if(Session.equals("mobileMode", "done")) {
 			toggleSidebar(false);
 		} else {
-			mobileWork();
 			Session.set("mobileMode","done");
 			toggleSidebar(false);
 			timedPushback();
@@ -559,7 +556,6 @@ Template.mOptionCard.rendered = function() {
         Session.set("user", newSetting);
         serverData = Session.get("user");
         sendData("editProfile");
-        mobileWork();
         toggleSidebar(false);
 	});
 }
@@ -686,7 +682,7 @@ function timedPushback() {
 	}, fadeTime);
 }
 
-function mobileWork() {
+mobileWork = function() {
 	var array = myClasses();
 	if(array === undefined) return;
 	var notDoneWork = [];

hourglass/client/profile/mProfile.css

@@ -144,7 +144,7 @@
 	outline: none;
 }
 
-.-autocomplete-container {
+#mProfWrapper .-autocomplete-container {
 	display: none;
 }
 

hourglass/client/profile/profile.css

@@ -38,10 +38,6 @@
 	border: 1px solid #FCF0F0 !important;
 }
 
-#profPageWrapper .optionHolder {
-	width: 100%;
-}
-
 #basicInfo {
 	width: 100%;
 	position: absolute;
@@ -56,6 +52,10 @@
 	background-color: rgba(255,255,255,0.2);
 }
 
+#newUserWrapper .formDiv {
+	position: relative;
+}
+
 .opTitle {
 	font-weight: 200;
 	margin: 1%;
@@ -233,13 +233,15 @@
 	margin: auto;
 	margin-top: -1%;
 	padding: 3%;
-	padding-bottom: 2%;
+	padding-top: 2%;
+	padding-bottom: 1%;
 	width: 30%;
 
 	background-color: rgba(255,255,255,0.2);
 }
 
 #profPageWrapper #creSubmit {
+	margin-top: 5%;
 	border: 1px solid #FCF0F0 !important;
 }
 
@@ -285,4 +287,8 @@
 
 #profileSubmit:hover {
 	background-color: rgba(0,0,0,0.3);
-}
+}
+
+ #profPageWrapper #createInfo .formDiv:nth-child(5),  #profPageWrapper #createInfo .formDiv:nth-child(6) {
+ 	position: relative;
+ } 

hourglass/lib/constants.js

@@ -40,7 +40,7 @@ themeColors =  {
         "userDropdownColor": "#2EA96A", 
         "iconHighlight": "#61D9A3",
         "modeHighlight": "#C9FE62",
-        "classCardColor":"#2567A1",
+        "classCardColor":"#45729A",
         "textColor": "#FCF0F0"  
     },
     "fresva": {
@@ -62,7 +62,7 @@ themeColors =  {
         "userDropdownColor": "#2E312B", 
         "iconHighlight": "#70E6E6",
         "modeHighlight": "#70E6E6",
-        "classCardColor":"#1FAAB1",
+        "classCardColor":"#3C6567",
         "textColor": "#FCF0F0"
     }
 };