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

Finished calendar.js (for now)

This commit is contained in:
Sebastian Davaris 2020-06-26 13:07:57 +02:00
parent 812ff6e855
commit df8eb6c8cb
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skolehjem/public/css/webapp.css vendored
View File

@ -6737,11 +6737,11 @@ main {
color: #99A4AE; color: #99A4AE;
font-size: 12px; font-size: 12px;
font-weight: 700; font-weight: 700;
padding: 12px 3px; padding: 6px 3px;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
width: 40px; width: 40px;
height: 38px; height: 18px;
} }
@media (min-width: 360px) { @media (min-width: 360px) {
@ -6765,7 +6765,7 @@ main {
@media (min-width: 360px) { @media (min-width: 360px) {
.calendar-table__body .calendar-table__col { .calendar-table__body .calendar-table__col {
width: 46px; width: 46px;
height: 48px; height: 24px;
} }
} }

3
skolehjem/resources/js/calendar/calendar.js vendored
View File

@ -31,6 +31,9 @@ const moment = require("moment");
function generateCalendar(weekOffset = 0) { function generateCalendar(weekOffset = 0) {
const week = (moment().week() + weekOffset); const week = (moment().week() + weekOffset);
document.getElementById("title").innerText = week;
let weekDays = Array.apply(null, Array(7)).map((value, index) => { let weekDays = Array.apply(null, Array(7)).map((value, index) => {
return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd"); return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd");
}); });

6
skolehjem/resources/sass/webapp/_default.scss vendored
View File

@ -285,11 +285,11 @@ $primary-color: $blue;
color: $gray; color: $gray;
font-size: $sm-font-size; font-size: $sm-font-size;
font-weight: $font-weight--bold; font-weight: $font-weight--bold;
padding: 12px 3px; padding: 6px 3px;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
width: 40px; width: 40px;
height: 38px; height: 18px;
@include mq(360) { @include mq(360) {
width: 46px; width: 46px;
@ -309,7 +309,7 @@ $primary-color: $blue;
@include mq(360) { @include mq(360) {
width: 46px; width: 46px;
height: 48px; height: 24px;
} }
@include mq(410) { @include mq(410) {

6
skolehjem/resources/views/app/washing-reservations/index.blade.php
View File

@ -10,11 +10,11 @@
<div class="col w-100 mt-auto"> <div class="col w-100 mt-auto">
<div class="calendar-container"> <div class="calendar-container">
<div class="calendar-container__header"> <div class="calendar-container__header">
<button id="week-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous"> <button id="week-previous" class="calendar-container__btn fas fa-arrow-left" title="Previous">
<i class="icon ion-ios-arrow-back"></i> <i class="icon ion-ios-arrow-back"></i>
</button> </button>
<h2 id="month" class="calendar-container__title">{Måned} {År}</h2> <h2 id="title" class="calendar-container__title">{Måned} {År}</h2>
<button id="week-next" class="calendar-container__btn calendar-container__btn--right" title="Next"> <button id="week-next" class="calendar-container__btn fas fa-arrow-right" title="Next">
<i class="icon ion-ios-arrow-forward"></i> <i class="icon ion-ios-arrow-forward"></i>
</button> </button>
</div> </div>