Calendar adding issue, css hover still doesn't work; sidebar closes on mode change, fixed #64
This commit is contained in:
parent
156fa11930
commit
8a0a18b454
@ -763,7 +763,7 @@ input, textarea {
|
||||
}
|
||||
}
|
||||
|
||||
.fc-day:not(.fc-past):not(.fc-other-month) {
|
||||
.fc-day:not(.fc-past) {
|
||||
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1);
|
||||
|
||||
-webkit-transition: box-shadow 0.4s ease;
|
||||
@ -772,7 +772,7 @@ input, textarea {
|
||||
transition: box-shadow 0.4s ease;
|
||||
}
|
||||
|
||||
.fc-day:not(.fc-past):not(.fc-other-month):hover {
|
||||
.fc-day:not(.fc-past):hover {
|
||||
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15);
|
||||
}
|
||||
|
||||
@ -806,6 +806,7 @@ input, textarea {
|
||||
}
|
||||
|
||||
#commentSubmit {
|
||||
margin-bottom: 0;
|
||||
padding: 2%;
|
||||
background-color: rgba(255,255,255,0.1);
|
||||
|
||||
|
||||
@ -147,11 +147,6 @@
|
||||
{{#unless newWork}}
|
||||
<div id="workComments">
|
||||
<h3>Comments</h3>
|
||||
<div id="comment" style="max-height:{{commentDim}}">
|
||||
{{#each work 'comments'}}
|
||||
{{> comment}}
|
||||
{{/each}}
|
||||
</div>
|
||||
<div>
|
||||
<textarea id="workComment" rows="4" cols="50" maxlength="200"></textarea><br>
|
||||
<div>
|
||||
@ -159,6 +154,11 @@
|
||||
<div id="commentSubmit">Submit</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="comment" style="max-height:{{commentDim}}">
|
||||
{{#each work 'comments'}}
|
||||
{{> comment}}
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
{{/unless}}
|
||||
</div>
|
||||
|
||||
@ -292,7 +292,7 @@ Template.main.helpers({
|
||||
openDivFade(document.getElementsByClassName("overlay")[0]);
|
||||
},
|
||||
dayClick: function(date, jsEvent, view) {
|
||||
if(jsEvent.target.className.includes("fc-other-month") || jsEvent.target.className.includes("fc-past")) return;
|
||||
if(jsEvent.target.className.includes("fc-past")) return;
|
||||
Session.set("calCreWork",true);
|
||||
Session.set("calWorkDate",date.format());
|
||||
Session.set("sidebar","menuContainer");
|
||||
@ -432,6 +432,7 @@ Template.main.events({
|
||||
Session.set("mode", "classes");
|
||||
openDivFade(modeHolder);
|
||||
}, 300);
|
||||
Session.set("sidebar",null);
|
||||
},
|
||||
'click .calendar' () {
|
||||
if (Session.get("mode") === "calendar") return;
|
||||
@ -441,6 +442,7 @@ Template.main.events({
|
||||
Session.set("mode", "calendar");
|
||||
openDivFade(modeHolder);
|
||||
}, 300);
|
||||
Session.set("sidebar",null);
|
||||
},
|
||||
'click' (event) {
|
||||
var e = event.target.className;
|
||||
@ -459,8 +461,7 @@ Template.main.events({
|
||||
!e.includes("fa-bars") &&
|
||||
!document.getElementById("menuContainer").contains(event.target) &&
|
||||
!document.getElementById("optionsContainer").contains(event.target) &&
|
||||
!(event.target.className.includes("fc-today") ||
|
||||
(event.target.className.includes("fc-future") && !event.target.className.includes("fc-other-month")))) {
|
||||
!(event.target.className.includes("fc-day") && !event.target.className.includes("fc-past"))) {
|
||||
if(Session.get("calCreWork")) {
|
||||
Session.set("calCreWork",false);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user