Merge branch 'bugfix/somefixes' into develop

rowers/views/workoutviews.py

@@ -3417,10 +3417,15 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
                 privacy = 'private'
             else:
                 privacy = 'visible'
-                
-            startdatetime = datetime.datetime.combine(
-                date,starttime
+
+            try:
+                startdatetime = datetime.datetime.combine(
+                    date,starttime
                 )
+            except TypeError:
+                startdatetime = datetime.datetime.combine(
+                    date,datetime.datetime.min.time()
+                    )
 
             try:
                 startdatetime = pytz.timezone(thetimezone).localize(

static/css/styles2.css

@@ -366,10 +366,12 @@
         background: white;
     }
 
+    /*
     nav li.selected {
         color: #1c75bc;
         background: white;
-    }        
+    } 
+      */ 
     
     .nav-active,
     .nav-active a,