vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	skolehjem/resources/views/app/layout/base.blade.php
This commit is contained in:
Anders
2020-08-05 08:34:23 +02:00
parent 5120adebc0 4ed1d18392
commit b4634d4933
8 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/layout/base.blade.php
+1 -1
View File
@@ -7,7 +7,7 @@
</head>
<body>
<header class="row align-items-center" id="header">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
<a href="{{ route("root.index") }}"><img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"></a>
<button class="ml-auto" id="toggle">
<i id="icon" class="fas fa-bars"></i>
</button>
skolehjem/resources/views/app/washing-reservations/create.blade.php
+1 -1
View File
@@ -67,7 +67,7 @@
header.appendChild(headerDay);
let date = moment().locale("da").day(weekDay).week(week);
var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero(moment().locale("da").day(weekDay).week(week).month()) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date());
var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero((moment().locale("da").day(weekDay).week(week).month() + 1)) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date());
let dayHolder = document.createElement("div");
dayHolder.classList.add("calendar-table__col");