minor layout adjustments

Kaishiyoku · Jun 7, 2018 · 8b7563a · 8b7563a
1 parent afe8244
commit 8b7563a
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.

diff --git a/app/Http/Middleware/Menus.php b/app/Http/Middleware/Menus.php
@@ -53,7 +53,7 @@ public function handle($request, Closure $next)
         Menu::registerDefault([
             Menu::linkRoute('mangas.index', __('common.manga_list')),
             Menu::linkRoute('mangas.statistics', __('common.statistics')),
-            Menu::linkRoute('recommendations.create', __('common.recommend_manga')),
+            Menu::linkRoute('recommendations.create', __('common.recommend_manga'), [], [], [], $this->auth->guest()),
             Menu::linkRoute('mangas.manage', __('common.manage_mangas'), [], [], [], $this->auth->check())
         ], ['class' => 'nav navbar-nav']);
 

diff --git a/resources/assets/sass/bootstrap/_variables.scss b/resources/assets/sass/bootstrap/_variables.scss
@@ -208,9 +208,9 @@ $line-height-sm:              1.5 !default;
 $border-width:                1px !default;
 $border-color:                $gray-300 !default;
 
-$border-radius:               0 !default;
-$border-radius-lg:            0 !default;
-$border-radius-sm:            0 !default;
+$border-radius:               .25rem !default;
+$border-radius-lg:            .3rem !default;
+$border-radius-sm:            .2rem !default;
 
 $box-shadow-sm:               0 .125rem .25rem rgba($black, .075) !default;
 $box-shadow:                  0 .5rem 1rem rgba($black, .15) !default;
@@ -231,7 +231,7 @@ $transition-collapse:         height .35s ease !default;
 // Font, line-height, and color for body text, headings, and more.
 
 // stylelint-disable value-keyword-case
-$font-family-sans-serif:      "Muli", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
+$font-family-sans-serif:      "Sanchez", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
 $font-family-monospace:       SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
 $font-family-base:            $font-family-sans-serif !default;
 // stylelint-enable value-keyword-case

diff --git a/resources/lang/de/auth.yaml b/resources/lang/de/auth.yaml
@@ -5,7 +5,7 @@ login:
 logout:
   success: Logout erfolgreich.
 passwords:
-  send_password_reset_link: Link zum Zurücksetzen des Passworts versendet
+  send_password_reset_link: Link zum Zurücksetzen des Passworts versenden
   reset_password: Passwort zurücksetzen
   remember_me: An mich erinnern
   forgot_your_password: Passwort vergessen?
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -46,7 +46,7 @@
 
                 <div class="form-group">
                     <div class="col-md-6">
-                        {{ Form::submit(__('common.login'), ['class' => 'btn btn-outline-primary']) }}
+                        {{ Form::submit(__('common.login'), ['class' => 'btn btn-primary']) }}
 
                         {{ Html::linkRoute('password.request', __('auth.passwords.forgot_your_password'), ['class' => 'btn btn-link']) }}
                     </div>

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
@@ -26,7 +26,7 @@
 
                 <div class="form-group">
                     <div class="col-md-12">
-                        {{ Form::submit(__('auth.passwords.send_password_reset_link'), ['class' => 'btn btn-outline-primary']) }}
+                        {{ Form::submit(__('auth.passwords.send_password_reset_link'), ['class' => 'btn btn-primary']) }}
                     </div>
                 </div>
             {{ Form::close() }}

diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('app')
 
 @section('content')
     <div class="row">
@@ -50,7 +50,7 @@
 
                 <div class="form-group">
                     <div class="col-md-12">
-                        {{ Form::submit(__('auth.passwords.reset_password'), ['class' => 'btn btn-outline-primary']) }}
+                        {{ Form::submit(__('auth.passwords.reset_password'), ['class' => 'btn btn-primary']) }}
                     </div>
                 </div>
             {{ Form::close() }}

diff --git a/resources/views/home/contact.blade.php b/resources/views/home/contact.blade.php
@@ -52,7 +52,7 @@
 
         <div class="form-group">
             <div class="col-md-12">
-                {{ Form::submit(__('common.contact_me_now'), ['class' => 'btn btn-outline-primary']) }}
+                {{ Form::submit(__('common.contact_me_now'), ['class' => 'btn btn-primary']) }}
             </div>
         </div>
     {{ Form::close() }}

diff --git a/resources/views/manga/_form.blade.php b/resources/views/manga/_form.blade.php
@@ -48,6 +48,6 @@
 
 <div class="form-group row">
     <div class="col-lg-12">
-        {!! Html::decode(Form::button($submitTitle, ['type' => 'submit', 'class' => 'btn btn-outline-primary'])) !!}
+        {!! Html::decode(Form::button($submitTitle, ['type' => 'submit', 'class' => 'btn btn-primary'])) !!}
     </div>
 </div>
diff --git a/resources/views/manga/index.blade.php b/resources/views/manga/index.blade.php
@@ -7,11 +7,11 @@
 
     <p>
         @auth
-            {!! Html::decode(Html::linkRoute('mangas.manage', '<i class="fas fa-wrench"></i> ' . __('manga.index.manage'), [], ['class' => 'btn btn-outline-secondary btn-sm'])) !!}
+            {!! Html::decode(Html::linkRoute('mangas.manage', '<i class="fas fa-wrench"></i> ' . __('manga.index.manage'), [], ['class' => 'btn btn-dark btn-sm'])) !!}
         @endauth
 
         @guest
-            {!! Html::decode(Html::linkRoute('recommendations.create', '<i class="far fa-envelope-open"></i> ' . __('manga.index.recommend_me_a_manga'), [], ['class' => 'btn btn-outline-primary btn-sm'])) !!}
+            {!! Html::decode(Html::linkRoute('recommendations.create', '<i class="far fa-envelope-open"></i> ' . __('manga.index.recommend_me_a_manga'), [], ['class' => 'btn btn-primary btn-sm'])) !!}
         @endguest
     </p>
 

diff --git a/resources/views/manga/manage.blade.php b/resources/views/manga/manage.blade.php
@@ -7,7 +7,7 @@
 
     @auth
         <p>
-            {!! Html::decode(Html::linkRoute('mangas.create', '<i class="fas fa-plus"></i> ' . __('manga.manage.new'), [], ['class' => 'btn btn-outline-secondary btn-sm'])) !!}
+            {!! Html::decode(Html::linkRoute('mangas.create', '<i class="fas fa-plus"></i> ' . __('manga.manage.new'), [], ['class' => 'btn btn-dark btn-sm'])) !!}
         </p>
     @endauth
 

diff --git a/resources/views/recommendation/create.blade.php b/resources/views/recommendation/create.blade.php
@@ -22,7 +22,7 @@
 
         <div class="form-group row">
             <div class="col-lg-12">
-                {!! Html::decode(Form::submit(__('recommendation.create.submit'), ['class' => 'btn btn-outline-primary'])) !!}
+                {!! Html::decode(Form::submit(__('recommendation.create.submit'), ['class' => 'btn btn-primary'])) !!}
             </div>
         </div>
     {{ Form::close() }}