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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Browse Source
This commit is contained in:
frederikpyt
2020-08-31 08:16:36 +02:00
parent 08362b24cb 1dafdfe052
commit d8a754d398
23 changed files with 681 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/events/index.blade.php
+4
View File
@@ -5,6 +5,10 @@
@section("content")
<style>
iframe, .ql-video {
width: 100%;
}
div.card {
margin-top: 1rem;
margin-bottom: 30px;
skolehjem/resources/views/app/events/show.blade.php
+4
View File
@@ -6,6 +6,10 @@
@section("content")
<style>
iframe, .ql-video {
width: 100%;
}
h2, h3, h4 {
margin-top: 0;
}
skolehjem/resources/views/app/news/index.blade.php
+4
View File
@@ -1,6 +1,10 @@
@extends("app.layout.base")
@section("content")
<style>
iframe, .ql-video {
width: 100%;
}
div.card {
margin-top: 1rem;
margin-bottom: 30px;
skolehjem/resources/views/app/users/edit.blade.php
+2 -2
View File
@@ -13,9 +13,9 @@
<span>{{__('msg.navn')}}:</span>
<input type="text" value="{{ Auth::user()->name_first . " " . Auth::user()->name_last }}" disabled>
<span>{{__('msg.email')}}:</span>
<input type="email" name="email" id="email" value="{{ Auth::user()->email }}" required>
<input type="email" name="email" id="email" placeholder="x@y.z" value="{{ Auth::user()->email }}" required>
<span>{{__('msg.telefon')}} Nr.:</span>
<input type="text" name="phone" id="phone" value="{{ Auth::user()->phone }}" required>
<input type="tel" name="phone" id="phone" value="{{ Auth::user()->phone }}" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<button type="submit" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
<a onclick="window.history.back()" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
</form>
skolehjem/resources/views/app/users/login.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<label class="toggle">
<input class="toggle__input" type="checkbox" name="rememberpassword">
<span class="toggle__label">
<span class="toggle__text text-white">Remember password</span>
<span class="toggle__text text-white">Remember me</span>
</span>
</label>
{!! session()->get('success#passwordchange') !!}