Skip to content

Commit b14fddf

Browse files
driesvintsdriesvints
committed
Tweak styling
1 parent faa9191 commit b14fddf

File tree

15 files changed

+101
-41
lines changed

15 files changed

+101
-41
lines changed

‎resources/views/articles/_form.blade.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ class="text-green-darker"
7979
></button>
8080

8181
<div class="flex justify-end items-center">
82-
<a href="{{ isset($article) ? route('articles.show', $article->slug()) : route('articles') }}" class="text-green-darker mr-4">Cancel</a>
82+
<a href="{{ isset($article) ? route('articles.show', $article->slug()) : route('user.articles') }}" class="text-green-darker mr-4">
83+
Cancel
84+
</a>
85+
8386
@if (isset($article) && $article->isSubmitted())
8487
<button
8588
type="submit"

‎resources/views/articles/create.blade.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
@extends('layouts.default')
44

5+
@section('subnav')
6+
<div class="bg-white border-b">
7+
<div class="container mx-auto flex justify-between items-center px-4">
8+
<h1 class="text-xl py-4 text-gray-900">
9+
<a href="{{ route('user.articles') }}">My Articles</a>
10+
> {{ $title }}
11+
</h1>
12+
</div>
13+
</div>
14+
@endsection
15+
516
@section('content')
617
<div class="container mx-auto p-4 flex justify-center">
718
<div class="w-full md:w-2/3 xl:w-1/2">

‎resources/views/articles/edit.blade.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
@extends('layouts.default')
44

5+
@section('subnav')
6+
<div class="bg-white border-b">
7+
<div class="container mx-auto flex justify-between items-center px-4">
8+
<h1 class="text-xl py-4 text-gray-900">
9+
<a href="{{ route('user.articles') }}">My Articles</a>
10+
> {{ $title }}
11+
</h1>
12+
</div>
13+
</div>
14+
@endsection
15+
516
@section('content')
617
<div class="container mx-auto p-4 flex justify-center">
718
<div class="w-full md:w-2/3 xl:w-1/2">

‎resources/views/articles/show.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class="article text-lg"
107107
'identifier' => 'disapproveArticle',
108108
'route' => ['admin.articles.disapprove', $article->slug()],
109109
'title' => "Disapprove article",
110-
'body' => '<p>Are you sure you want to disapprove this article?</p><p>Doing so will mean it is no longer live on the site.</p>',
110+
'body' => '<p>Are you sure you want to disapprove this article? Doing so will mean it is no longer live on the site.</p>',
111111
])
112112
@endif
113113
@endcan
@@ -117,7 +117,7 @@ class="article text-lg"
117117
'identifier' => 'deleteArticle',
118118
'route' => ['articles.delete', $article->slug()],
119119
'title' => "Delete article",
120-
'body' => '<p>Are you sure you want to delete this article?</p><p>Doing so will mean it is permanently removed from the site.</p>',
120+
'body' => '<p>Are you sure you want to delete this article? Doing so will mean it is permanently removed from the site.</p>',
121121
])
122122
@endcan
123123

@@ -129,4 +129,4 @@ class="article text-lg"
129129
'body' => $article->isPinned() ? '<p>Are you sure you want to unpin this article?</p>' : '<p>Are you sure you want to pin this article?</p>',
130130
])
131131
@endcan
132-
@endsection
132+
@endsection

‎resources/views/home.blade.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@section('body')
44
@include('layouts._alerts')
55

6-
<div class="bg-gray-50 overflow-hidden">
6+
<div class="bg-white overflow-hidden">
77
<div x-data="{ open: false }" class="pt-6 pb-12 sm:pb-16 md:pb-20 lg:pb-28 xl:pb-32">
88
<div class="mt-10 mx-auto max-w-screen-xl px-4 sm:mt-12 sm:px-6 md:mt-16 lg:mt-20 xl:mt-28">
99
<div class="text-center">
@@ -33,6 +33,11 @@
3333
Start a Thread
3434
</a>
3535
</div>
36+
<div class="mt-3 rounded-md shadow sm:mt-0 sm:ml-3">
37+
<a href="{{ route('articles.create') }}" class="w-full flex items-center justify-center px-8 py-3 border border-transparent text-base leading-6 font-medium rounded-md text-white bg-green-dark hover:bg-green-primary focus:outline-none focus:shadow-outline-indigo transition duration-150 ease-in-out md:py-4 md:text-lg md:px-10">
38+
Share an Article
39+
</a>
40+
</div>
3641
@endif
3742
</div>
3843
</div>

‎resources/views/layouts/default.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@extends('layouts.base')
22

33
@section('body')
4-
<div>
4+
<div class="bg-gray-50">
55
@yield('subnav')
66

77
@include('layouts._alerts')

‎resources/views/layouts/settings.blade.php‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
@extends('layouts.base')
22

33
@section('body')
4-
<div class="bg-white border-b">
5-
<div class="container mx-auto flex justify-between items-center px-4">
6-
<h1 class="text-xl py-4 text-gray-900">{{ $title }}</h1>
4+
<div class="bg-gray-50">
5+
<div class="bg-white border-b">
6+
<div class="container mx-auto flex justify-between items-center px-4">
7+
<h1 class="text-xl py-4 text-gray-900">{{ $title }}</h1>
8+
</div>
79
</div>
8-
</div>
910

10-
@include('layouts._alerts')
11+
@include('layouts._alerts')
1112

12-
<div class="container mx-auto px-4 pt-4 flex flex-wrap">
13-
<div class="w-full md:w-3/4 md:pr-3">
14-
@yield('content')
15-
</div>
16-
17-
<div class="w-full md:w-1/4 md:pl-3">
18-
<h3 class="text-xs font-bold tracking-wider uppercase text-gray-500 mb-4">Settings</h3>
19-
<ul class="tags">
20-
<li class="{{ active('settings.profile') }}">
21-
<a href="{{ route('settings.profile') }}">Profile</a>
22-
</li>
23-
<li class="{{ active('settings.password') }}">
24-
<a href="{{ route('settings.password') }}">Password</a>
25-
</li>
26-
</ul>
13+
<div class="container mx-auto px-4 pt-4 flex flex-wrap">
14+
<div class="w-full md:w-3/4 md:pr-3">
15+
@yield('content')
16+
</div>
17+
18+
<div class="w-full md:w-1/4 md:pl-3">
19+
<h3 class="text-xs font-bold tracking-wider uppercase text-gray-500 mb-4">Settings</h3>
20+
<ul class="tags">
21+
<li class="{{ active('settings.profile') }}">
22+
<a href="{{ route('settings.profile') }}">Profile</a>
23+
</li>
24+
<li class="{{ active('settings.password') }}">
25+
<a href="{{ route('settings.password') }}">Password</a>
26+
</li>
27+
</ul>
28+
</div>
2729
</div>
2830
</div>
2931
@endsection

‎resources/views/layouts/small.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@extends('layouts.base')
22

33
@section('body')
4-
<div class="flex items-center justify-center my-8 md:my-20">
4+
<div class="flex items-center justify-center py-8 md:py-20 bg-gray-50">
55
<div class="w-full md:w-1/2 lg:w-1/3 xl:w-1/4">
66
<h1 class="text-4xl text-gray-700 text-center mb-2 font-bold">{{ $title }}</h1>
77
<div class="p-8 md:border-2 md:rounded md:bg-gray-100">

‎resources/views/livewire/notifications.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div>
22
@if ($notifications->count())
3-
<div class="flex flex-col">
3+
<div class="flex flex-col bg-white">
44
<div class="-my-2 py-2 overflow-x-auto sm:-mx-6 sm:px-6 lg:-mx-8 lg:px-8">
55
<div class="align-middle inline-block min-w-full shadow overflow-hidden sm:rounded-lg border-b border-gray-200">
66
<table class="min-w-full">

‎resources/views/series/_form.blade.php‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,26 @@ class="form-control"
1919
@formGroup('tags')
2020
<label for="tags">Tags</label>
2121

22-
<select name="tags[]" id="create-series" multiple x-data="{}" x-init="function () { choices($el) }">
23-
@foreach($tags as $tag)
24-
<option value="{{ $tag->id }}" @if(in_array($tag->id, $selectedTags)) selected @endif>{{ $tag->name }}</option>
22+
<select id="tags" name="tags[]" id="create-series" multiple x-data="{}" x-init="function () { choices($el) }">
23+
@foreach ($tags as $tag)
24+
<option value="{{ $tag->id }}" @if(in_array($tag->id, $selectedTags)) selected @endif>
25+
{{ $tag->name }}
26+
</option>
2527
@endforeach
2628
</select>
2729

2830
@error('tags')
2931
@endFormGroup
3032

3133
<div class="flex justify-end items-center">
32-
<a href="{{ isset($series) ? route('series.show', $series->id()) : route('user.series') }}" class="text-green-darker mr-4">Cancel</a>
33-
<button type="submit" class="button button-primary">{{ isset($series) ? 'Update series' : 'Create series' }}</button>
34+
<a
35+
href="{{ isset($series) ? route('series.show', $series->id()) : route('user.series') }}"
36+
class="text-green-darker mr-4"
37+
>
38+
Cancel
39+
</a>
40+
<button type="submit" class="button button-primary">
41+
{{ isset($series) ? 'Update series' : 'Create series' }}
42+
</button>
3443
</div>
3544
</form>

0 commit comments

Comments
 (0)