Зуев Егор / wiki.dev

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
b97d5704 1 parent b912eb9f

Fixed some lib paths and seperated out duplicated notifications

Inline Side-by-side
Showing 3 changed files with 22 additions and 24 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <head> 3 <head>
4 <title>BookStack</title> 4 <title>BookStack</title>
5 5
6 - <!-- Meta--> 6 + <!-- Meta -->
7 <meta name="viewport" content="width=device-width"> 7 <meta name="viewport" content="width=device-width">
8 <meta name="token" content="{{ csrf_token() }}"> 8 <meta name="token" content="{{ csrf_token() }}">
9 <meta charset="utf-8"> 9 <meta charset="utf-8">
...@@ -21,17 +21,7 @@ ...@@ -21,17 +21,7 @@
21 </head> 21 </head>
22 <body class="@yield('body-class')" id="app"> 22 <body class="@yield('body-class')" id="app">
23 23
24 - @if(Session::has('success')) 24 + @include('partials/notifications')
25 - <div class="notification anim pos">
26 - <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
27 - </div>
28 - @endif
29 -
30 - @if(Session::has('error'))
31 - <div class="notification anim neg stopped">
32 - <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
33 - </div>
34 - @endif
35 25
36 <header id="header"> 26 <header id="header">
37 <div class="container"> 27 <div class="container">
......
1 +@if(Session::has('success'))
2 + <div class="notification anim pos">
3 + <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
4 + </div>
5 +@endif
6 +
7 +@if(Session::has('error'))
8 + <div class="notification anim neg stopped">
9 + <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
10 + </div>
11 +@endif
...\ No newline at end of file ...\ No newline at end of file
...@@ -2,27 +2,24 @@ ...@@ -2,27 +2,24 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <title>BookStack</title> 4 <title>BookStack</title>
5 +
6 + <!-- Meta -->
5 <meta name="viewport" content="width=device-width"> 7 <meta name="viewport" content="width=device-width">
8 + <meta charset="utf-8">
9 +
10 + <!-- Styles and Fonts -->
6 <link rel="stylesheet" href="{{ elixir('css/styles.css') }}"> 11 <link rel="stylesheet" href="{{ elixir('css/styles.css') }}">
12 + <link rel="stylesheet" media="print" href="{{ elixir('css/print-styles.css') }}">
7 <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'> 13 <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
8 - <link rel="stylesheet" href="/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css"> 14 + <link rel="stylesheet" href="/libs/material-design-iconic-font/css/material-design-iconic-font.min.css">
9 15
10 <!-- Scripts --> 16 <!-- Scripts -->
11 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 17 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
18 +
12 </head> 19 </head>
13 <body class="@yield('body-class')" id="app"> 20 <body class="@yield('body-class')" id="app">
14 21
15 -@if(Session::has('success')) 22 +@include('partials/notifications')
16 - <div class="notification anim pos">
17 - <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
18 - </div>
19 -@endif
20 -
21 -@if(Session::has('error'))
22 - <div class="notification anim neg stopped">
23 - <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
24 - </div>
25 -@endif
26 23
27 <header id="header"> 24 <header id="header">
28 <div class="container"> 25 <div class="container">
......