Skip to content

Commit

Permalink
adjusted backgrounds and spacings
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaishiyoku committed Sep 7, 2020
1 parent 01fac76 commit 1253d1f
Show file tree
Hide file tree
Showing 19 changed files with 290 additions and 265 deletions.
13 changes: 11 additions & 2 deletions resources/css/app.css
Expand Up @@ -26,15 +26,18 @@
}

.input-default {
@apply shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight transition-all duration-200;
@apply appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight transition-all duration-200;
}
.input-shadow {
@apply shadow;
}
.input-default:focus,
.input-with-btn:focus {
@apply outline-none shadow-outline-purple;
}

.input-with-btn {
@apply shadow appearance-none border-l border-t border-b rounded-l w-full py-2 px-3 text-gray-700 leading-tight;
@apply appearance-none border-l border-t border-b rounded-l w-full py-2 px-3 text-gray-700 leading-tight;
}

.validation-error {
Expand Down Expand Up @@ -109,3 +112,9 @@
.table-hover tr:hover {
@apply bg-purple-50;
}

/* Typography
---------------------------------------------------------------------------- */
.headline-1 {
@apply text-3xl mt-6 mb-2;
}
1 change: 1 addition & 0 deletions resources/lang/de/manga.php
Expand Up @@ -33,6 +33,7 @@
'no_mangas_yet' => 'Noch keine Mangas vorhanden.',
'statistics' => [
'title' => 'Statistiken',
'general' => 'Allgemein',
'latest_volumes_and_specials' => 'Letzte Bände und Specials',
'mangas' => 'Manga|Mangas',
'volumes' => 'Band|Bände',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/manga.php
Expand Up @@ -33,6 +33,7 @@
'no_mangas_yet' => 'No mangas yet.',
'statistics' => [
'title' => 'Statistics',
'general' => 'General',
'latest_volumes_and_specials' => 'Latest volumes and specials',
'mangas' => 'manga|mangas',
'volumes' => 'volume|volumes',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/login.blade.php
Expand Up @@ -5,7 +5,7 @@
@section('content')
<div class="flex flex-wrap justify-center">
<div class="w-full max-w-sm">
<div class="flex flex-col break-words">
<div class="flex flex-col break-words rounded overflow-hidden shadow-lg border border-gray-200 bg-white mt-8">
<form class="w-full p-6" method="POST" action="{{ route('login') }}">
@csrf

Expand Down
4 changes: 2 additions & 2 deletions resources/views/auth/passwords/email.blade.php
Expand Up @@ -4,15 +4,15 @@

@section('content')
<div class="flex flex-wrap justify-center">
<div class="w-full max-w-md">
<div class="w-full max-w-md rounded overflow-hidden shadow-lg border border-gray-200 bg-white mt-8">
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
</div>
@endif

<div class="flex flex-col break-words mt-4">
<h1 class="text-2xl">{{ __('auth.passwords.reset_password') }}</h1>
<h1 class="text-2xl px-6">{{ __('auth.passwords.reset_password') }}</h1>

<form class="w-full p-6" method="POST" action="{{ route('password.email') }}">
@csrf
Expand Down
58 changes: 30 additions & 28 deletions resources/views/home/contact.blade.php
Expand Up @@ -3,45 +3,47 @@
@section('title', __('home.contact.title'))

@section('content')
<h1 class="text-5xl mt-2">{{ __('home.contact.title') }}</h1>
<h1 class="headline-1">{{ __('home.contact.title') }}</h1>

{{ Form::open(['route' => 'home.send_contact_form', 'method' => 'post', 'role' => 'form']) }}
@captcha()
<div class="rounded overflow-hidden shadow-lg border border-gray-200 bg-white px-6 py-4 mb-8">
@captcha()

<div class="mb-4">
{{ Form::label('email', __('validation.attributes.email'), ['class' => 'label-default']) }}
<div class="mb-4">
{{ Form::label('email', __('validation.attributes.email'), ['class' => 'label-default']) }}

{{ Form::email('email', old('email'), ['class' => 'input-default' . ($errors->has('email') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.email')]) }}
{{ Form::email('email', old('email'), ['class' => 'input-default' . ($errors->has('email') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.email')]) }}

@if ($errors->has('email'))
<p class="validation-error">
{{ $errors->first('email') }}
</p>
@endif
</div>
@if ($errors->has('email'))
<p class="validation-error">
{{ $errors->first('email') }}
</p>
@endif
</div>

<div class="mb-4">
{{ Form::label('fullname', __('validation.attributes.fullname'), ['class' => 'label-default']) }}
<div class="mb-4">
{{ Form::label('fullname', __('validation.attributes.fullname'), ['class' => 'label-default']) }}

{{ Form::text('fullname', old('fullname'), ['class' => 'input-default' . ($errors->has('fullname') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.fullname')]) }}
{{ Form::text('fullname', old('fullname'), ['class' => 'input-default' . ($errors->has('fullname') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.fullname')]) }}

@if ($errors->has('fullname'))
<p class="validation-error">
{{ $errors->first('fullname') }}
</p>
@endif
</div>
@if ($errors->has('fullname'))
<p class="validation-error">
{{ $errors->first('fullname') }}
</p>
@endif
</div>

<div class="mb-4">
{{ Form::label('content', __('validation.attributes.content'), ['class' => 'label-default']) }}
<div class="mb-4">
{{ Form::label('content', __('validation.attributes.content'), ['class' => 'label-default']) }}

{{ Form::textarea('content', old('content'), ['class' => 'input-default' . ($errors->has('content') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.content')]) }}
{{ Form::textarea('content', old('content'), ['class' => 'input-default' . ($errors->has('content') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.content')]) }}

@if ($errors->has('content'))
<p class="validation-error">
{{ $errors->first('content') }}
</p>
@endif
@if ($errors->has('content'))
<p class="validation-error">
{{ $errors->first('content') }}
</p>
@endif
</div>
</div>

{{ Form::button(__('common.contact_me_now'), ['type' => 'submit', 'class' => 'border border-purple-600 bg-purple-500 text-white py-2 px-3 hover:bg-purple-900 transition-all duration-150 rounded shadow focus:shadow-outline']) }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/app.blade.php
Expand Up @@ -18,7 +18,7 @@
<link media="all" type="text/css" rel="stylesheet" href="{{ asset('css/app.css') }}">
<link media="all" type="text/css" rel="stylesheet" href="{{ asset('css/font-awesome.css') }}">
</head>
<body>
<body class="bg-gray-100">

<div class="container lg:px-20 mx-auto">
<a href="{{ route('mangas.index') }}">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/manga/_card.blade.php
@@ -1,4 +1,4 @@
<div class="rounded overflow-hidden shadow-lg border border-gray-200">
<div class="rounded overflow-hidden shadow-lg border border-gray-200 bg-white">
@if ($manga->malItem && $manga->malItem->image_url)
<div class="text-center">
{{ Html::image($manga->malItem->image_url, $manga->name, ['class' => 'w-full']) }}
Expand Down
72 changes: 37 additions & 35 deletions resources/views/manga/_form.blade.php
@@ -1,38 +1,40 @@
<div class="mb-4">
{{ Form::label('name', __('validation.attributes.name'), ['class' => 'label-default']) }}

{{ Form::text('name', old('name', $manga->name), ['class' => 'input-default' . ($errors->has('name') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.name')]) }}

@if ($errors->has('name'))
<p class="validation-error">
{{ $errors->first('name') }}
</p>
@endif
</div>

<div class="mb-4">
{{ Form::label('mal_id', __('validation.attributes.mal_id'), ['class' => 'label-default']) }}

{{ Form::number('mal_id', old('mal_id', $manga->mal_id), ['class' => 'input-default' . ($errors->has('mal_id') ? ' has-error' : ''), 'placeholder' => __('validation.attributes.mal_id')]) }}

@if ($errors->has('mal_id'))
<p class="validation-error">
{{ $errors->first('mal_id') }}
</p>
@endif
</div>

<div class="mb-4">
<label class="inline-flex items-center text-sm text-gray-700" for="is_completed">
{{ Form::checkbox('is_completed', true, old('is_completed', $manga->is_completed), ['id' => 'is_completed']) }}
<span class="ml-2">{{ __('validation.attributes.is_completed') }}</span>
</label>

@if ($errors->has('is_completed'))
<p class="validation-error">
{{ $errors->first('') }}
</p>
@endif
<div class="rounded overflow-hidden shadow-lg border border-gray-200 bg-white px-6 py-4 mb-8">
<div class="mb-4">
{{ Form::label('name', __('validation.attributes.name'), ['class' => 'label-default']) }}

{{ Form::text('name', old('name', $manga->name), ['class' => 'input-default' . ($errors->has('name') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.name')]) }}

@if ($errors->has('name'))
<p class="validation-error">
{{ $errors->first('name') }}
</p>
@endif
</div>

<div class="mb-4">
{{ Form::label('mal_id', __('validation.attributes.mal_id'), ['class' => 'label-default']) }}

{{ Form::number('mal_id', old('mal_id', $manga->mal_id), ['class' => 'input-default' . ($errors->has('mal_id') ? ' has-error' : ''), 'placeholder' => __('validation.attributes.mal_id')]) }}

@if ($errors->has('mal_id'))
<p class="validation-error">
{{ $errors->first('mal_id') }}
</p>
@endif
</div>

<div class="mb-4">
<label class="inline-flex items-center text-sm text-gray-700" for="is_completed">
{{ Form::checkbox('is_completed', true, old('is_completed', $manga->is_completed), ['id' => 'is_completed']) }}
<span class="ml-2">{{ __('validation.attributes.is_completed') }}</span>
</label>

@if ($errors->has('is_completed'))
<p class="validation-error">
{{ $errors->first('') }}
</p>
@endif
</div>
</div>

{!! Html::decode(Form::button($submitTitle, ['type' => 'submit', 'class' => 'btn-default'])) !!}
66 changes: 34 additions & 32 deletions resources/views/manga/_specials.blade.php
@@ -1,39 +1,41 @@
<h2 class="text-4xl">{{ __('special.title') }}</h2>

@if ($manga->specials->count() == 0)
<p><i>{{ __('manga.edit.no_specials_yet') }}</i></p>
@else
<table class="table table-hover">
<thead>
<tr>
<th>{{ __('validation.attributes.name') }}</th>
<th></th>
</tr>
</thead>

<tbody>
@foreach ($manga->specials as $special)
<div class="rounded overflow-hidden shadow-lg border border-gray-200 bg-white">
@if ($manga->specials->count() == 0)
<p><i>{{ __('manga.edit.no_specials_yet') }}</i></p>
@else
<table class="table table-hover">
<thead>
<tr>
<td>{{ $special->name }}</td>
<td class="text-right">
@include('shared._delete_link', ['route' => ['specials.destroy', $manga, $special]])
</td>
<th>{{ __('validation.attributes.name') }}</th>
<th></th>
</tr>
@endforeach
</tbody>
</table>
@endif
</thead>

<tbody>
@foreach ($manga->specials as $special)
<tr>
<td>{{ $special->name }}</td>
<td class="text-right">
@include('shared._delete_link', ['route' => ['specials.destroy', $manga, $special]])
</td>
</tr>
@endforeach
</tbody>
</table>
@endif

{{ Form::open(['route' => ['specials.store', $manga], 'method' => 'post', 'role' => 'form']) }}
<div class="flex mt-4">
{{ Form::text('name', old('name', $newSpecial->name), ['class' => 'input-with-btn' . ($errors->has('name') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.name')]) }}
{{ Form::open(['route' => ['specials.store', $manga], 'method' => 'post', 'role' => 'form', 'class' => 'px-4 pb-4']) }}
<div class="flex mt-4">
{{ Form::text('name', old('name', $newSpecial->name), ['class' => 'input-with-btn' . ($errors->has('name') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.name')]) }}

{{ Form::button(__('special.new'), ['type' => 'submit', 'class' => 'btn-with-input']) }}
</div>
{{ Form::button(__('special.new'), ['type' => 'submit', 'class' => 'btn-with-input']) }}
</div>

@if ($errors->has('name'))
<p class="validation-error">
{{ $errors->first('name') }}
</p>
@endif
{{ Form::close() }}
@if ($errors->has('name'))
<p class="validation-error">
{{ $errors->first('name') }}
</p>
@endif
{{ Form::close() }}
</div>
66 changes: 34 additions & 32 deletions resources/views/manga/_volumes.blade.php
@@ -1,39 +1,41 @@
<h2 class="text-4xl">{{ __('volume.title') }}</h2>

@if ($manga->volumes->count() == 0)
<p><i>{{ __('manga.edit.no_volumes_yet') }}</i></p>
@else
<table class="table table-hover">
<thead>
<tr>
<th>{{ __('validation.attributes.no') }}</th>
<th></th>
</tr>
</thead>

<tbody>
@foreach ($manga->volumes as $volume)
<div class="rounded overflow-hidden shadow-lg border border-gray-200 bg-white">
@if ($manga->volumes->count() == 0)
<p><i>{{ __('manga.edit.no_volumes_yet') }}</i></p>
@else
<table class="table table-hover">
<thead>
<tr>
<td>{{ $volume->no }}</td>
<td class="text-right">
@include('shared._delete_link', ['route' => ['volumes.destroy', $manga, $volume]])
</td>
<th>{{ __('validation.attributes.no') }}</th>
<th></th>
</tr>
@endforeach
</tbody>
</table>
@endif
</thead>

<tbody>
@foreach ($manga->volumes as $volume)
<tr>
<td>{{ $volume->no }}</td>
<td class="text-right">
@include('shared._delete_link', ['route' => ['volumes.destroy', $manga, $volume]])
</td>
</tr>
@endforeach
</tbody>
</table>
@endif

{{ Form::open(['route' => ['volumes.store', $manga], 'method' => 'post', 'role' => 'form']) }}
<div class="flex mt-4">
{{ Form::number('no', old('no', $newVolume->no), ['class' => 'input-with-btn' . ($errors->has('no') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.no')]) }}
{{ Form::open(['route' => ['volumes.store', $manga], 'method' => 'post', 'role' => 'form', 'class' => 'px-4 pb-4']) }}
<div class="flex mt-4">
{{ Form::number('no', old('no', $newVolume->no), ['class' => 'input-with-btn' . ($errors->has('no') ? ' has-error' : ''), 'required' => true, 'placeholder' => __('validation.attributes.no')]) }}

{{ Form::button(__('volume.new'), ['type' => 'submit', 'class' => 'btn-with-input']) }}
</div>
{{ Form::button(__('volume.new'), ['type' => 'submit', 'class' => 'btn-with-input']) }}
</div>

@if ($errors->has('no'))
<p class="validation-error">
{{ $errors->first('no') }}
</p>
@endif
{{ Form::close() }}
@if ($errors->has('no'))
<p class="validation-error">
{{ $errors->first('no') }}
</p>
@endif
{{ Form::close() }}
</div>
2 changes: 1 addition & 1 deletion resources/views/manga/create.blade.php
Expand Up @@ -3,7 +3,7 @@
@section('title', __('manga.create.title'))

@section('content')
<h1 class="text-5xl mt-2">{{ __('manga.create.title') }}</h1>
<h1 class="headline-1">{{ __('manga.create.title') }}</h1>

{{ Form::open(['route' => 'mangas.store', 'method' => 'post', 'role' => 'form']) }}
@include('manga._form', ['submitTitle' => '<i class="fas fa-save"></i> ' . __('common.create')])
Expand Down

0 comments on commit 1253d1f

Please sign in to comment.