From a5e40b256e596d7e825a9ee44793ca4ac433be03 Mon Sep 17 00:00:00 2001 From: Bart Roos Date: Wed, 15 Nov 2017 21:15:08 +0100 Subject: [PATCH] Add username and links --- public/css/app.css | 31 ++++++++++++++++++++++++--- resources/assets/sass/app.scss | 23 ++++++++++++++++---- resources/views/layouts/app.blade.php | 12 ++++++++++- 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index b1c76fb..55eff4d 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -8355,15 +8355,40 @@ body { background: linear-gradient(to right, #71B280, #134E5E); } -h1 { - margin: 15px; +header { + margin: 0 15px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + font-size: 16px; +} + +header > * { + margin: 15px 0; +} + +.user { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.user, +.user a { + color: white; } .board { display: grid; grid-gap: 15px; grid-template-columns: 1fr 1fr; - margin: 0 15px 0 15px; + margin: 0 15px; } .category { diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 0f9bf12..9a8369c 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -12,16 +12,31 @@ body{ background: linear-gradient(to right, #71B280, #134E5E); } -h1{ - margin: 15px; +header{ + margin: 0 15px; + display: flex; + justify-content: space-between; + font-size: 16px; +} + +header > *{ + margin: 15px 0; +} + +.user{ + display: flex; + align-items: center; +} + +.user, .user a{ + color: white; } .board{ display: grid; grid-gap: 15px; grid-template-columns: 1fr 1fr; - - margin: 0 15px 0 15px; + margin: 0 15px; } .category{ diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 02f6132..d681ff9 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -11,7 +11,17 @@ Whiteboard -

Whiteboard

+
+

Whiteboard

+
+ {{ Auth::user()->name }} ( + @if(Auth::user()->type == 'teacher') + admin |  + @endif + uitloggen + ) +
+
@yield('content') @stack('scripts')