Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
556821ec8f
skolehjem/resources/views/admin/layout
|
@ -4,13 +4,10 @@
|
|||
<title>@yield("title")</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
<link type="text/css" rel="stylesheet" href="{{ mix("/css/admin.css") }}">
|
||||
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
|
||||
</head>
|
||||
<body>
|
||||
@yield("header")
|
||||
<main class="row">
|
||||
<script type="text/javascript">
|
||||
document.onreadystatechange = checkIfIShouldCollapse();
|
||||
|
||||
function openNav() {
|
||||
var open = document.getElementById("open");
|
||||
var close = document.getElementById("close");
|
||||
|
@ -56,7 +53,17 @@
|
|||
|
||||
localStorage.setItem("collapsed", "true");
|
||||
}
|
||||
|
||||
function checkIfIShouldCollapse() {
|
||||
if (localStorage.getItem("collapsed") == "true" && document.readyState === "complete")
|
||||
closeNav();
|
||||
}
|
||||
</script>
|
||||
<link type="text/css" rel="stylesheet" href="{{ mix("/css/admin.css") }}">
|
||||
</head>
|
||||
<body onload="document.body.style.display='block';" style="display: none;">
|
||||
@yield("header")
|
||||
<main class="row">
|
||||
<div class="col nav" style="background-color: #333333;">
|
||||
<div class="segment" style="height: 60px;">
|
||||
<div class="text-white row align-items-center" style="margin-left: -1rem; margin-top: 0; margin-bottom: 0; font-size: 1.15rem; height: calc(100% - 2rem); padding: 1rem 2rem; width: calc(100% - 3rem); background-color: #333333 !important;">
|
||||
|
@ -161,11 +168,11 @@
|
|||
@yield("content")
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
if(localStorage.getItem("collapsed") == "true")
|
||||
closeNav();
|
||||
|
||||
</script>
|
||||
<script>
|
||||
if(localStorage.getItem("collapsed") == "true")
|
||||
closeNav();
|
||||
</script>
|
||||
</main>
|
||||
|
||||
<script src="{{ mix("/js/app.js") }}"></script>
|
||||
|
|
Loading…
Reference in New Issue