Commit 7a5bf6f5 authored by Taylor Otwell's avatar Taylor Otwell

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
parents 75e2aca9 799e6309
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-8 col-sm-offset-2"> <div class="col-sm-8 col-sm-offset-2">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -46,4 +47,5 @@ ...@@ -46,4 +47,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-8 col-sm-offset-2"> <div class="col-sm-8 col-sm-offset-2">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -34,4 +35,5 @@ ...@@ -34,4 +35,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-8 col-sm-offset-2"> <div class="col-sm-8 col-sm-offset-2">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -46,4 +47,5 @@ ...@@ -46,4 +47,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-8 col-sm-offset-2"> <div class="col-sm-8 col-sm-offset-2">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -41,4 +42,5 @@ ...@@ -41,4 +42,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop
@extends('layouts.app') @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') @section('content')
<div id="welcome"> <div id="welcome">
<div class="jumbotron"> <div class="jumbotron">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment