diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 53202ac..e69de29 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -1,38 +0,0 @@ - -// Body -$body-bg: #f5f8fa; - -// Borders -$laravel-border-color: darken($body-bg, 10%); -$list-group-border: $laravel-border-color; -$navbar-default-border: $laravel-border-color; -$panel-default-border: $laravel-border-color; -$panel-inner-border: $laravel-border-color; - -// Brands -$brand-primary: #3097D1; -$brand-info: #8eb4cb; -$brand-success: #2ab27b; -$brand-warning: #cbb956; -$brand-danger: #bf5329; - -// Typography -$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/"; -$font-family-sans-serif: "Raleway", sans-serif; -$font-size-base: 14px; -$line-height-base: 1.6; -$text-color: #636b6f; - -// Navbar -$navbar-default-bg: #fff; - -// Buttons -$btn-default-color: $text-color; - -// Inputs -$input-border: lighten($text-color, 40%); -$input-border-focus: lighten($brand-primary, 25%); -$input-color-placeholder: lighten($text-color, 30%); - -// Panels -$panel-default-heading-bg: #fff; diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 1bbc550..7771f7c 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,7 +1,4 @@ -// Fonts -@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); - // Variables @import "variables"; diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php new file mode 100644 index 0000000..35a0995 --- /dev/null +++ b/resources/views/home.blade.php @@ -0,0 +1,9 @@ +@extends('layouts.master') + +@section('title', 'Home') + +@section('content') + +

This is the home page

+ +@endsection \ No newline at end of file diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php new file mode 100644 index 0000000..66108bd --- /dev/null +++ b/resources/views/layouts/master.blade.php @@ -0,0 +1,15 @@ + + + + @yield('title') + + + + +
+ @yield('content') +
+ + + + \ No newline at end of file diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index a246e10..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - Laravel - - - - - - - - -
- @if (Route::has('login')) -
- @auth - Home - @else - Login - Register - @endauth -
- @endif - -
-
- Laravel -
- -
- Documentation - Laracasts - News - Forge - GitHub -
-
-
- - diff --git a/routes/web.php b/routes/web.php index 810aa34..9bdaea4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -12,5 +12,5 @@ */ Route::get('/', function () { - return view('welcome'); + return view('home'); });