Merge branch 'develop' of github.com:laravel/laravel into develop

Conflicts: public/css/app.css resources/assets/sass/app.scss resources/assets/sass/pages/_welcome.scss resources/views/layouts/app.blade.php resources/views/welcome.blade.php
kokigit · Nov 25, 2014 · 7a5bf6f · 7a5bf6f
2 parents 75e2aca + 799e630
commit 7a5bf6f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -1,6 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
+<div class="container">
 <div class="row">
 	<div class="col-sm-8 col-sm-offset-2">
 		<div class="panel panel-default">
@@ -46,4 +47,5 @@
 		</div>
 	</div>
 </div>
+</div>
 @stop
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php
@@ -1,6 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
+<div class="container">
 <div class="row">
 	<div class="col-sm-8 col-sm-offset-2">
 		<div class="panel panel-default">
@@ -34,4 +35,5 @@
 		</div>
 	</div>
 </div>
+</div>
 @stop
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -1,6 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
+<div class="container">
 <div class="row">
 	<div class="col-sm-8 col-sm-offset-2">
 		<div class="panel panel-default">
@@ -46,4 +47,5 @@
 		</div>
 	</div>
 </div>
+</div>
 @stop
diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php
@@ -1,6 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
+<div class="container">
 <div class="row">
 	<div class="col-sm-8 col-sm-offset-2">
 		<div class="panel panel-default">
@@ -41,4 +42,5 @@
 		</div>
 	</div>
 </div>
+</div>
 @stop
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -1,5 +1,18 @@
 @extends('layouts.app')
 
+@section('banner')
+<div class="jumbotron">
+    <div class="container">
+        <h1 class="jumbotron__header">Welcome to Laravel 5!</h1>
+
+        <p class="jumbotron__body">
+            Laravel is a web application framework with expressive, elegant syntax. We believe development
+            must be an enjoyable, creative experience to be truly fulfilling.
+        </p>
+    </div>
+</div>
+@stop
+
 @section('content')
 <div id="welcome">
     <div class="jumbotron">