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
This commit is contained in:
commit
7a5bf6f554
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Reference in New Issue