Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Taylor Otwell 2014-11-25 14:34:26 -06:00
parent 75e2aca9af 799e630965
commit 7a5bf6f554
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/auth/login.blade.php
View File

@ -1,6 +1,7 @@
@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 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop

2
resources/views/auth/password.blade.php
View File

@ -1,6 +1,7 @@
@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 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop

2
resources/views/auth/register.blade.php
View File

@ -1,6 +1,7 @@
@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 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop

2
resources/views/auth/reset.blade.php
View File

@ -1,6 +1,7 @@
@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 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@stop @stop

13
resources/views/welcome.blade.php
View File

@ -1,5 +1,18 @@
@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">