diff --git a/public/css/app.css b/public/css/app.css index eaf8c2cd..8d90b4f2 100644 --- a/public/css/app.css +++ b/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; } diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 74f23c39..04c2ad90 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,11 +1,8 @@ -@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; -} diff --git a/resources/assets/sass/partials/_auth.scss b/resources/assets/sass/pages/_auth.scss similarity index 100% rename from resources/assets/sass/partials/_auth.scss rename to resources/assets/sass/pages/_auth.scss diff --git a/resources/assets/sass/pages/_welcome.scss b/resources/assets/sass/pages/_welcome.scss index 6c771be1..7e0b33ff 100644 --- a/resources/assets/sass/pages/_welcome.scss +++ b/resources/assets/sass/pages/_welcome.scss @@ -1,11 +1,35 @@ -.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; diff --git a/resources/assets/sass/partials/_banner.scss b/resources/assets/sass/partials/_banner.scss deleted file mode 100644 index c4eb48ae..00000000 --- a/resources/assets/sass/partials/_banner.scss +++ /dev/null @@ -1,18 +0,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; -} diff --git a/resources/assets/sass/partials/_buttons.scss b/resources/assets/sass/partials/_buttons.scss new file mode 100644 index 00000000..0095777d --- /dev/null +++ b/resources/assets/sass/partials/_buttons.scss @@ -0,0 +1,3 @@ +.fa-btn { + margin-right: 10px; +} diff --git a/resources/assets/sass/partials/_variables.scss b/resources/assets/sass/variables.scss similarity index 100% rename from resources/assets/sass/partials/_variables.scss rename to resources/assets/sass/variables.scss diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 35ad11bd..74e7e38c 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -64,11 +64,7 @@ - @yield('banner') - -
- @yield('content') -
+ @yield('content') diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index d5214f24..b5580726 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,65 +1,60 @@ @extends('layouts.app') -@section('banner') -
-
-

Welcome to Laravel 5!

+@section('content') +
+
+
+

Welcome to Laravel 5.

-

- Laravel is a web application framework with expressive, elegant syntax. We believe development - must be an enjoyable, creative experience to be truly fulfilling. -

+

+ Laravel is a web application framework with expressive, elegant syntax. We believe development + must be an enjoyable, creative experience. Enjoy the fresh air. +

+
+
+ +
+
    +
  1. +
    +

    Have a Look Around

    + +

    + Review app/Http/routes.php to learn how HTTP requests are + routed to controllers. +

    + +

    + We've included simple login and registration screens to get you started. +

    +
    +
  2. + +
  3. +
    +

    Harness Your Skills

    + +

    + Ready to keep learning more about Laravel? Start here: +

    + + +
    +
  4. + +
  5. +
    +

    Forge Ahead

    + +

    + When you're finished building your application, Laravel still has your back. Check out Laravel Forge. +

    +
    +
  6. +
@stop - -@section('content') -
    -
  1. -
    -

    Have a Look Around

    - -

    - Review app/Http/Controllers/WelcomeController.php to learn - how this page was constructed. -

    -
    -
  2. - -
  3. -
    -

    Harness Your Skills

    - -

    - Once you've toyed around for a bit, you'll surely want to dig in and - learn more. Try: -

    - - -
    -
  4. - -
  5. -
    -

    Forge Ahead

    - -

    - Finished building your app? It's time to deploy! Laravel still has your back. Use Laravel Forge. -

    -
    -
  6. - -
  7. -
    -

    Profit

    - -

    - ...and go be with your family. -

    -
    -
  8. -
-@stop