Skip to content

Commit 52e9d5d

Browse files
fixed input group and toast UI
1 parent b112d30 commit 52e9d5d

File tree

8 files changed

+19
-74
lines changed

8 files changed

+19
-74
lines changed

public/css/all.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/css/all.css": "/css/all.css?id=3256f1a8f308a04b8b80",
2+
"/css/all.css": "/css/all.css?id=aa722432805a4e442ae8",
33
"/js/all.js": "/js/all.js?id=33999d5e15bc776fbe12",
44
"/js/origin/activity.js": "/js/origin/activity.js?id=280531543dae17c80e07",
55
"/js/origin/backups.js": "/js/origin/backups.js?id=60f7cb557ef68fa6d4d6",

resources/css/origin/origin.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,10 +937,19 @@ table > tbody > tr > td > a:hover {
937937
padding: .6rem 1rem .6rem 1rem;
938938
}
939939

940+
.toast-header {
941+
color: #212529;
942+
}
943+
940944
.toast-header, .toast-body {
941945
background-color: #fff;
942946
}
943947

948+
.toasts-top-right {
949+
top: 10px;
950+
right: 10px;
951+
}
952+
944953
@media (max-width: 767px) {
945954
.content {
946955
padding: 15px 0 15px 0;

resources/views/auth/login.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
@endforeach
3030
@endif
3131
{!! csrf_field() !!}
32-
<div class="input-group mb-3">
32+
<div class="form-group mb-3">
3333
<input type="text" name="username" id="username" class="form-control" placeholder="{{ __('Username') }}">
3434
<span class="invalid-feedback">
3535
{{ __('Please Enter Username') }}
3636
</span>
3737
</div>
38-
<div class="input-group mb-3">
38+
<div class="form-group mb-3">
3939
<input type="password" name="password" id="password" class="form-control" placeholder="{{ __('Password') }}">
4040
<span class="invalid-feedback">
4141
{{ __('Please Enter Password') }}

resources/views/auth/passwords/email.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@endforeach
3636
@endif
3737
{!! csrf_field() !!}
38-
<div class="input-group mb-3">
38+
<div class="form-group mb-3">
3939
<input type="text" class="form-control" name="email" placeholder="{{ __('Email Address') }}" />
4040
</div>
4141
<div class="row">

resources/views/auth/passwords/reset.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
@endif
3737
{!! csrf_field() !!}
3838
<input type="hidden" name="token" value="{{ $token }}">
39-
<div class="input-group mb-3">
39+
<div class="form-group mb-3">
4040
@if ($email)
4141
<input type="text" name="email" class="form-control" placeholder="{{ __('Email Address') }}" value="{{ $email }}" required autofocus readonly>
4242
@else
4343
<input type="text" name="email" class="form-control" placeholder="{{ __('Email Address') }}" value="" required autofocus>
4444
@endif
4545
</div>
46-
<div class="input-group mb-3">
46+
<div class="form-group mb-3">
4747
<input type="password" name="password" class="form-control" placeholder="{{ __('Password') }}">
4848
</div>
49-
<div class="input-group mb-3">
49+
<div class="form-group mb-3">
5050
<input type="password" name="password_confirmation" class="form-control" placeholder="{{ __('Confirm Password') }}">
5151
</div>
5252
<div class="row">

resources/views/templates/navbar.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
</div>
3333
<ul class="order-1 order-md-3 navbar-nav navbar-no-expand ml-auto">
3434
<form class="form-inline ml-0 ml-md-3">
35-
<div class="input-group input-group-sm">
36-
<input type="search" name="top-search" id="top-search" class="form-control form-control-navbar" placeholder="{{ __('Search') }}" aria-label="Search" autocomplete="off">
35+
<div class="form-group">
36+
<input type="search" name="top-search" id="top-search" class="form-control form-control-sm form-control-navbar" placeholder="{{ __('Search') }}" aria-label="Search" autocomplete="off">
3737
</div>
3838
</form>
3939
@inject('activities', 'App\Http\Controllers\ActivityController')

resources/views/templates/vertical_nav.blade.php

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)