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

hourglass/client/main/main.css

@@ -849,6 +849,7 @@ input, textarea {
 }
 
 #calendar {
+	color: #000;
 	width: 90%;
 	height: 94vh;
 	margin: auto;

hourglass/client/main/main.html

@@ -129,7 +129,7 @@
             {{/if}}
 
             {{#if currMode 'calendar'}}
-                <div id="calendar" style="{{calColor}}">
+                <div id="calendar">
                     {{> fullcalendar calendarOptions}}
                 </div>
             {{/if}}

hourglass/client/main/main.js

@@ -403,9 +403,6 @@ Template.main.helpers({
         var width = window.innerWidth * 0.85;
         return "width:" + width.toString() + "px;margin-left:" + (0.5 * window.innerWidth - 0.5 * width).toString() + "px;";
     },
-    calColor() { // Sets the color of the calendar according to theme
-        return "color:" + Session.get("user").preferences.theme.calendar;
-    },
     calCreWork() { // Display instructions for creating a work.
         if (Session.get("calCreWork")) return true;
         return false;

hourglass/lib/constants.js

@@ -22,7 +22,7 @@ themeColors =  {
         "textColor": "#F6F6F6" 
     },*/
     /*"dark": {
-       "background": "RedBlack.png",
+       "background": "RedBlack.jpg",
         "mainColor": "#302c36",
         "secondaryColor": "#151313",
         "sidebarColor": "#327c5a",
@@ -33,7 +33,7 @@ themeColors =  {
         "textColor": "#fcf0f0"  
     },*/
     /*"dark": {
-       "background": "Sea.png",
+       "background": "Sea.jpg",
         "mainColor": "#1e926c",
         "secondaryColor": "#1c564f",
         "sidebarColor": "#3cb08a",
@@ -44,7 +44,7 @@ themeColors =  {
         "textColor": "#fcf0f0"  
     },*/
     /*"dark": {
-       "background": "Earth.png",
+       "background": "Earth.jpg",
         "mainColor": "#dea743",
         "secondaryColor": "#496234",
         "sidebarColor": "#6d9957",
@@ -55,7 +55,7 @@ themeColors =  {
         "textColor": "#fcf0f0"  
     },*/
     "dark": {
-       "background": "NeonBlue.png",
+       "background": "NeonBlue.jpg",
         "mainColor": "#1d1c23",
         "secondaryColor": "#1f212f",
         "sidebarColor": "#312e32",