diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index 620ca4e..161541a 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6914,8 +6914,6 @@ nav > .pagination { /* Stay in place */ z-index: 1; /* Sit on top */ - padding-top: 100px; - /* Location of the box */ left: 0; top: 0; width: 100%; @@ -6942,9 +6940,25 @@ nav > .pagination { border: 2px solid #888; width: 700px; min-width: 400px; + top: -50px; + height: 80%; border-radius: 6px; overflow: auto; - padding-bottom: 120px; + overflow-y: scroll; +} + +.modal-content::-webkit-scrollbar { + width: 12px; +} + +.modal-content::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; +} + +.modal-content::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5); } /* The Close Button */ @@ -6963,6 +6977,10 @@ nav > .pagination { cursor: pointer; } +.modal-content > center > img { + width: 100%; +} + .tbl { border-collapse: collapse; width: 100%; diff --git a/skolehjem/resources/sass/admin/modal/modal.scss b/skolehjem/resources/sass/admin/modal/modal.scss index 513a9c9..7db881f 100644 --- a/skolehjem/resources/sass/admin/modal/modal.scss +++ b/skolehjem/resources/sass/admin/modal/modal.scss @@ -3,7 +3,6 @@ display: none; /* Hidden by default */ position: fixed; /* Stay in place */ z-index: 1; /* Sit on top */ - padding-top: 100px; /* Location of the box */ left: 0; top: 0; width: 100%; /* Full width */ @@ -23,9 +22,24 @@ border: 2px solid #888; width: 700px; min-width: 400px; + top: -50px; + height: 80%; border-radius: 6px; overflow: auto; - padding-bottom: 120px; + overflow-y: scroll; +} + +.modal-content::-webkit-scrollbar { + width: 12px; +} +.modal-content::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + border-radius: 10px; +} + +.modal-content::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); } /* The Close Button */ @@ -41,3 +55,7 @@ text-decoration: none; cursor: pointer; } + +.modal-content > center > img { + width: 100%; +} diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 3f7cd7a..9afbe37 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -89,7 +89,7 @@ url: '{{route('events.preview')}}', data: {'preview':id}, success:function (data) { - modalNews.style.display = "block"; + modalNews.style.display = "flex"; var l = JSON.parse(data); console.log(l); $("#name").html(l.name); diff --git a/skolehjem/resources/views/admin/guides/index.blade.php b/skolehjem/resources/views/admin/guides/index.blade.php index 5e9d568..0b52c88 100644 --- a/skolehjem/resources/views/admin/guides/index.blade.php +++ b/skolehjem/resources/views/admin/guides/index.blade.php @@ -111,7 +111,7 @@ url: '{{route('guides.preview')}}', data: {'preview':id}, success:function (data) { - modalNews.style.display = "block"; + modalNews.style.display = "flex"; var l = JSON.parse(data); console.log(l); $("#name").html(l.name); diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 373c143..8b72f48 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -82,7 +82,7 @@ url: '{{route('menuplans.preview')}}', data: {'preview':id}, success:function (data) { - modalNews.style.display = "block"; + modalNews.style.display = "flex"; var l = JSON.parse(data); $("#week").html("Menuplan for uge " + l.week); $("#monday").html(l.monday); diff --git a/skolehjem/resources/views/admin/news/index.blade.php b/skolehjem/resources/views/admin/news/index.blade.php index c383608..f72bfef 100644 --- a/skolehjem/resources/views/admin/news/index.blade.php +++ b/skolehjem/resources/views/admin/news/index.blade.php @@ -79,7 +79,7 @@ url: '{{route('news.preview')}}', data: {'preview':id}, success:function (data) { - modalNews.style.display = "block"; + modalNews.style.display = "flex"; var l = JSON.parse(data); $("#titleEvent").html(l.subname); $("#dateEvent").html(l.news_expiration_date);