Skip to content

U
UserAdminV2
Commit 75e2aca9 by Taylor Otwell
Options

Working on default layout.

parent d4c2ecc4
Showing with 105 additions and 105 deletions
public/css/app.css
......@@ -4605,43 +4605,49 @@ button.close {
.hidden-print {
display: none !important; } }
.forgot-password {
padding-top: 7px;
vertical-align: middle; }
.fa-btn {
margin-right: 10px; }
.navbar-avatar {
border-radius: 999px;
margin: -11px 10px -10px 0;
padding: 0; }
.jumbotron {
.forgot-password {
padding-top: 7px;
vertical-align: middle; }
#welcome .jumbotron {
background: #F55430;
color: #fde0da;
margin-top: -20px; }
.jumbotron__header, .jumbotron h1 {
#welcome .jumbotron__header, .jumbotron h1 {
font-weight: bold;
color: white;
margin-top: 0; }
.jumbotron__body {
#welcome .jumbotron__body {
max-width: 80%;
margin-bottom: 0;
line-height: 1.6em; }
.steps {
#welcome .jumbotron__header, .jumbotron h1 {
font-weight: lighter; }
#welcome .steps {
max-width: 80%;
padding-left: 0;
list-style: none;
counter-reset: welcome-steps; }
.steps > .steps__item {
#welcome .steps > .steps__item {
margin-bottom: 2.5em;
padding: 19px;
border: 1px solid #eeeeee;
border-radius: 4px;
overflow: hidden; }
.steps > .steps__item:before {
#welcome .steps > .steps__item:before {
content: counter(welcome-steps);
counter-increment: welcome-steps;
width: 50px;
......@@ -4654,13 +4660,10 @@ button.close {
font: bold 2em monospace;
text-align: center;
line-height: 49px; }
.steps > .steps__item .body {
#welcome .steps > .steps__item .body {
float: left; }
.steps > .steps__item h2 {
#welcome .steps > .steps__item h2 {
font-weight: bold;
margin-top: 0; }
.steps > .steps__item p:last-child {
#welcome .steps > .steps__item p:last-child {
margin-bottom: 0; }
.fa-btn {
margin-right: 10px; }
resources/assets/sass/app.scss
@import "partials/variables";
@import "variables";
@import "bootstrap";
@import "partials/auth";
@import "partials/buttons";
@import "partials/navigation";
@import "partials/banner";
@import "pages/auth";
@import "pages/welcome";
.fa-btn {
margin-right: 10px;
}
resources/assets/sass/pages/_welcome.scss
.steps {
#welcome .jumbotron {
background: $primary;
color: lighten($primary, 35%);
margin-top: -20px;
}
#welcome .jumbotron__header,
.jumbotron h1 {
font-weight: bold;
color: white;
margin-top: 0;
}
#welcome .jumbotron__body {
max-width: 80%;
margin-bottom: 0;
line-height: 1.6em;
}
#welcome .jumbotron__header, .jumbotron h1 {
font-weight: lighter;
}
#welcome .steps {
max-width: 80%;
padding-left: 0;
list-style: none;
counter-reset: welcome-steps;
}
.steps > .steps__item {
#welcome .steps > .steps__item {
margin-bottom: 2.5em;
padding: 19px;
border: 1px solid $gray-lighter;
......
resources/assets/sass/partials/_banner.scss deleted 100644 → 0
.jumbotron {
background: $primary;
color: lighten($primary, 35%);
margin-top: -20px;
}
.jumbotron__header,
.jumbotron h1 {
font-weight: bold;
color: white;
margin-top: 0;
}
.jumbotron__body {
max-width: 80%;
margin-bottom: 0;
line-height: 1.6em;
}
resources/assets/sass/partials/_buttons.scss 0 → 100644
.fa-btn {
margin-right: 10px;
}
resources/views/layouts/app.blade.php
......@@ -64,11 +64,7 @@
</div>
</nav>
@yield('banner')
<div class="container">
@yield('content')
</div>
@yield('content')
<!-- Bootstrap JavaScript -->
<script src="/js/vendor/jquery.js"></script>
......
resources/views/welcome.blade.php
@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')
<ol class="steps">
<li class="steps__item">
<div class="body">
<h2>Have a Look Around</h2>
<p>
Review <code>app/Http/Controllers/WelcomeController.php</code> to learn
how this page was constructed.
</p>
</div>
</li>
<li class="steps__item">
<div class="body">
<h2>Harness Your Skills</h2>
<p>
Once you've toyed around for a bit, you'll surely want to dig in and
learn more. Try:
<div id="welcome">
<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. Enjoy the fresh air.
</p>
<ul>
<li><a href="http://laravel.com/docs">Laravel Documentation</a></li>
<li><a href="https://laracasts.com">Laravel 5 From Scratch (via Laracasts)</a></li>
</ul>
</div>
</li>
<li class="steps__item">
<div class="body">
<h2>Forge Ahead</h2>
<p>
Finished building your app? It's time to deploy! Laravel still has your back. Use <a href="https://forge.laravel.com">Laravel Forge</a>.
</p>
</div>
</li>
<li class="steps__item">
<div class="body">
<h2>Profit</h2>
</div>
<p>
...and go be with your family.
</p>
</div>
</li>
</ol>
<div class="container">
<ol class="steps">
<li class="steps__item">
<div class="body">
<h2>Have a Look Around</h2>
<p>
Review <code>app/Http/routes.php</code> to learn how HTTP requests are
routed to controllers.
</p>
<p>
We've included simple login and registration screens to get you started.
</p>
</div>
</li>
<li class="steps__item">
<div class="body">
<h2>Harness Your Skills</h2>
<p>
Ready to keep learning more about Laravel? Start here:
</p>
<ul>
<li><a href="http://laravel.com/docs">Laravel Documentation</a></li>
<li><a href="https://laracasts.com">Laravel 5 From Scratch (via Laracasts)</a></li>
</ul>
</div>
</li>
<li class="steps__item">
<div class="body">
<h2>Forge Ahead</h2>
<p>
When you're finished building your application, Laravel still has your back. Check out <a href="https://forge.laravel.com">Laravel Forge</a>.
</p>
</div>
</li>
</ol>
</div>
</div>
@stop
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