Merge branch 'master' of github.com:pingpong-labs/admin

pingpong-labs · Jun 12, 2015 · 221f995 · 221f995
2 parents 578f5f1 + 58614f8
commit 221f995
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/public/css/default.css b/public/css/default.css
@@ -12,7 +12,7 @@ body, table, a{
 	font-family: menlo, monaco, monospace;
 }
 
-a, 
+a,
 a:hover,
 a:focus{
 	color: #E5453E;
@@ -41,7 +41,7 @@ a:focus{
 .navbar-admin .navbar-nav>.open>a,
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li.active > a,
-.dropdown-menu > li > a:focus 
+.dropdown-menu > li > a:focus
 .navbar-admin .navbar-nav>.active>a:focus{
 	background-color: #F6564F !important;
 	color: #FFF !important;
@@ -79,4 +79,8 @@ footer.container {
 	margin-bottom: 50px;
 	padding: 10px;
 	margin-top: -19px;
+}
+
+.login-flash-text {
+	margin-top: 10px;
 }
diff --git a/src/views/login.blade.php b/src/views/login.blade.php
@@ -23,6 +23,11 @@
             <div class="header">Sign In</div>
             {!! Form::open(['route' => 'admin.login.store']) !!}
                 <div class="body bg-gray">
+                    @if(Session::has('flash_message'))
+                        <p class="login-flash-text text-danger">
+                            {{ Session::get('flash_message') }}
+                        </p>
+                    @endif
                     <div class="form-group">
                         <input type="text" name="email" class="form-control" placeholder="Email"/>
                     </div>
@@ -37,7 +42,7 @@
                     <button type="submit" class="btn bg-olive btn-block">Sign me in</button>
                     <!--
                     <p><a href="#">I forgot my password</a></p>
-                    
+
                     <a href="register.html" class="text-center">Register a new membership</a> -->
                 </div>
             {!! Form::close() !!}