Projekt

Obecné

Profil

« Předchozí | Další » 

Revize d79e27be

Přidáno uživatelem Marek Lovčí před asi 4 roky(ů)

Code fixes

Zobrazit rozdíly:

resources/sass/_custom.scss
4 4
body {
5 5
    background-color: $theme-color-five;
6 6
    font-family: $font-family-one;
7
    padding-top: 5.1rem;
7 8

  
8 9
    .head-title h1 {
9 10
        color: $theme-color-one;
......
14 15
    }
15 16

  
16 17
    .carousel {
18
        margin-top: - 5.1rem;
19

  
17 20
        .carousel-inner {
18 21
            .museum-logo {
19 22
                display: flex;
......
58 61
            top: 50%;
59 62
            bottom: auto;
60 63
            transform: translateY(-50%);
61
            background-color:  rgba(239, 218, 179, 0.5);
64
            background-color: rgba(239, 218, 179, 0.5);
62 65
        }
63 66
    }
64 67

  
65
    .container{
66
        margin-top: 4.99055rem;
67
    }
68

  
69 68
    /////////text types
70 69
    //většina běžných textů
71 70
    .text {
......
75 74
    }
76 75

  
77 76
    //text inputu a název artefaktů
78
    .text2{
77
    .text2 {
79 78
        font-weight: $font-weight-two;
80 79
        font-size: 8pt;
81 80
    }
82 81

  
83 82
    //název "kaplicky" a "choose a few" v categories (tam má jinou barvu)
84
    .kaplicky{
83
    .kaplicky {
85 84
        color: $theme-color-one;
86 85
        font-size: 11pt;
87 86
        font-weight: $font-weight-three;
......
89 88
    }
90 89

  
91 90
    //autor artefaktu
92
    .text-author{
91
    .text-author {
93 92
        font-weight: $font-weight-one;
94 93
        font-size: 7pt;
95 94
        color: $theme-color-four;
96 95
    }
97 96

  
98 97
    //počet lajků
99
    .text-number{
98
    .text-number {
100 99
        font-weight: $font-weight-two;
101 100
        font-size: 5pt;
102 101
        color: $theme-color-four;
103 102
    }
104 103

  
105 104
    //notes u metadat, about v about, text levého menu
106
    .text-headline{
105
    .text-headline {
107 106
        font-weight: $font-weight-two;
108 107
        font-size: 12pt;
109 108
        color: $theme-color-four;
110 109
    }
111 110

  
112 111
    //název metadata, text pravého menu
113
    .text-page{
112
    .text-page {
114 113
        font-weight: $font-weight-two;
115 114
        font-size: 7pt;
116 115
    }
117 116

  
118 117
    ////color pro změnu jen barvy
119
    .black{
118
    .black {
120 119
        color: $theme-color-five;
121 120
    }
122
    .white{
121

  
122
    .white {
123 123
        color: $theme-color-one;
124 124
    }
125
    .colored{
125

  
126
    .colored {
126 127
        color: $theme-color-four;
127 128
    }
128 129

  
129 130

  
130 131
    ////login
131
    .auth{
132
        .card{
132
    .auth {
133
        .card {
133 134
            border: none;
134 135
            text-align: center;
135 136
            font-size: 8pt;
136 137
        }
137 138

  
138
        .col-form-label{
139
        .col-form-label {
139 140
            text-align: left;
140 141
            padding-top: 0;
141 142
            padding-bottom: 0;
142 143
        }
143
        .form-control{
144

  
145
        .form-control {
144 146
            padding: 0;
145 147
            height: 17pt;
146 148
            border-radius: 0;
147
            &:focus{
149

  
150
            &:focus {
148 151
                border-color: $theme-color-one;
149 152
                -webkit-box-shadow: none;
150 153
                box-shadow: none;
151 154
            }
152 155
        }
153

  
154
        .card-body{
155
            padding-bottom: 0px;
156
            padding-top: calc(28vh - 4.99055rem);
157
        }
158 156
    }
159 157

  
160
    /*input:-internal-autofill-selected{
161

  
162
    }*/
163 158
    //Oprava barev pro Chrom
164 159
    input:-webkit-autofill {
165
        -webkit-box-shadow:0 0 0 50px $theme-color-five inset !important;
160
        -webkit-box-shadow: 0 0 0 50px $theme-color-five inset !important;
166 161
        -webkit-text-fill-color: $theme-color-one;
167 162
        background-color: $theme-color-five !important;
168 163
        //outline: none !important;
169
        &:active, &:focus, &:visited, &:hover{
170
            -webkit-box-shadow:0 0 0 50px $theme-color-five inset !important;
164
        &:active, &:focus, &:visited, &:hover {
165
            -webkit-box-shadow: 0 0 0 50px $theme-color-five inset !important;
171 166
            -webkit-text-fill-color: $theme-color-one;
172 167
            background-color: $theme-color-five !important;
173 168
            //outline: none !important;
......
175 170
    }
176 171

  
177 172
    .card-body {
178
    	background-color: $theme-color-five;
179
    	font-weight: $font-weight-one;
180
    	color: $theme-color-four;
181
	}
182

  
183
	.form-control {
184
    	background-color: $theme-color-five;
185
    	margin-top: -1px;
186
    	border-top-color: $theme-color-five;
187
    	border-left-color: $theme-color-five;
188
    	border-right-color: $theme-color-five;
189
    	border-bottom-color: 0.5pt $theme-color-one;
190
    	color: $theme-color-one;
173
        background-color: $theme-color-five;
174
        font-weight: $font-weight-one;
175
        color: $theme-color-four;
176
    }
177

  
178
    .form-control {
179
        background-color: $theme-color-five;
180
        margin-top: -1px;
181
        border-top-color: $theme-color-five;
182
        border-left-color: $theme-color-five;
183
        border-right-color: $theme-color-five;
184
        border-bottom-color: 0.5pt $theme-color-one;
185
        color: $theme-color-one;
191 186
        box-shadow: none;
192 187
        font-size: 8pt;
193 188
        outline: none;
194 189

  
195
        &:active, &:focus, &:visited, &:hover{
190
        &:active, &:focus, &:visited, &:hover {
196 191
            outline: none;
197 192
            background-color: $theme-color-five;
198 193
            margin-top: -1px;
......
204 199
            box-shadow: none;
205 200
        }
206 201

  
207
	}
208
    .form-control.is-invalid{
202
    }
203

  
204
    .form-control.is-invalid {
209 205
        box-shadow: none;
210 206
        border-color: $theme-color-four;
211 207
        background-image: none;
212
        &:active, &:focus, &:visited{
208

  
209
        &:active, &:focus, &:visited {
213 210
            box-shadow: none;
214 211
            border-color: $theme-color-four;
215 212
        }
......
230 227
            box-shadow: none;
231 228
            color: $theme-color-one;
232 229
        }
233
        &:hover{
230

  
231
        &:hover {
234 232
            color: $theme-color-four;
235 233
        }
236 234
    }
......
250 248

  
251 249
    .pin-left {
252 250
        border-left: .5pt solid $theme-color-four;
253
        display: inline-block;
254
        margin: 12rem 50px 0px -5rem;
255 251
        position: fixed;
256
        top: 28vh;
257 252
        bottom: 0;
258 253
        text-align: left;
259
        width: 100%;
260
        .text{
254

  
255
        // center fixed div
256
        left: 50%;
257
        transform: translateX(-50%);
258
        width: 70%;
259

  
260
        .text {
261 261
            margin-left: 0.5rem;
262
            margin-bottom: 0.2rem; // looks fugly without margin
262 263
        }
263
        p{
264

  
265
        p {
264 266
            margin-top: 0;
265 267
            margin-bottom: 0;
266 268
        }
267 269
    }
268 270

  
269
    .register{
270
        .pin-left{
271
            margin-top: 17rem;
272
        }
273
    }
274

  
275
    li{
271
    li {
276 272
        list-style-type: none;
277 273
    }
278 274

  
......
288 284
            margin-right: 5px;
289 285
            vertical-align: text-top;
290 286
            background-color: transparent;
291
            background-position : center center;
292
            background-repeat:no-repeat;
287
            background-position: center center;
288
            background-repeat: no-repeat;
293 289
        }
294 290
    }
295 291

  
......
344 340

  
345 341
        .inter_like {
346 342
            display: none;
343

  
347 344
            &:before {
348
                background-image : url(../images/interface/Hearth_Empty_50.png);
345
                background-image: url(../images/interface/Hearth_Empty_50.png);
349 346
                width: 60px;
350 347
                height: 60px;
351 348
            }
......
353 350

  
354 351
        .inter_like_filled {
355 352
            &:before {
356
                background-image : url(../images/interface/Hearth_Filled_50.png);
353
                background-image: url(../images/interface/Hearth_Filled_50.png);
357 354
                width: 60px;
358 355
                height: 60px;
359 356
            }
......
361 358

  
362 359
        .inter_info, .inter_like, .inter_like_filled {
363 360
            padding: 0;
361

  
364 362
            &:focus, &:active, &:hover {
365 363
                background-color: transparent !important;
366 364
                border-color: transparent !important;
367 365
                outline: none !important;
368 366
                box-shadow: none !important;
369
            };
367
            }
368
        ;
370 369
        }
371 370
    }
372 371

  
......
409 408

  
410 409
        .inter_like_filled {
411 410
            &:before {
412
                background-image : url(../images/interface/Heart_Filled.svg);
411
                background-image: url(../images/interface/Heart_Filled.svg);
413 412
                width: 1.563rem;
414 413
                height: 1.25rem;
415 414
            }
......
418 417
        .inter_info {
419 418

  
420 419
            padding-right: 1rem;
420

  
421 421
            &:before {
422 422
                background-image: url(../images/interface/Button_Info.svg);
423 423
                width: 1.875rem;
......
459 459
            display: inline-block;
460 460
            margin: 2.75rem 3.125rem 0 0;
461 461

  
462
            &:before {
462
            &:after {
463 463
                content: '';
464
                background-color: $theme-color-two;
464
                background-color: #ddd1b9;
465 465
                position: relative;
466 466
                height: .5rem;
467 467
                width: .5rem;
468 468
                border-radius: 50%;
469
                display: inline-block;
470
                top: 1.5rem;
471
                left: 50vw;
469
                display: block;
470
                margin-left: auto;
471
                top: .25rem;
472 472
            }
473 473

  
474 474
            .metadata {
......
551 551
                .inter_like_filled {
552 552

  
553 553
                    &:before {
554
                        background-image : url(../images/interface/Heart_Filled.svg);
554
                        background-image: url(../images/interface/Heart_Filled.svg);
555 555
                        width: 3.125rem;
556 556
                        height: 3.125rem;
557 557
                        margin-right: 0;
......
644 644
    }*/
645 645

  
646 646
    //CATEGORIES - ROW BLOCK
647
    .cat-col-md-2
648
    {
647
    .cat-col-md-2 {
649 648
        margin: 2%;
650 649
    }
651 650

  
652 651
    //CATEGORIES - TILES
653
    .btn.btn-dark.cat-tile
654
    {
652
    .btn.btn-dark.cat-tile {
655 653
        //STYLING
656 654
        border-color: $theme-color-four;
657 655
        border-radius: 0;
......
671 669
        height: 40mm;
672 670
        width: 100%;
673 671

  
674
        &:active, &:focus
675
        {
672
        &:active, &:focus {
676 673
            background-color: $theme-color-three;
677 674
            border-color: $theme-color-four;
678 675
            outline: none !important;
......
682 679
    }
683 680

  
684 681
    //CATEGORY/{id} -h2 title NO ARTEFACTS
685
    .category-h2
686
    {
682
    .category-h2 {
687 683
        color: $theme-color-four;
688 684
    }
689 685
}
690 686

  
691
.arrow{
687
.arrow {
692 688
    position: absolute;
693 689
    width: 0;
694 690
    height: 0;
695 691
    margin: 2rem;
696
    cursor:pointer;
692
    cursor: pointer;
697 693
    border: 0.59055rem solid transparent;
698 694
}
699 695

  
700
.top-bar{
701
    padding-bottom: 4.59055rem;
696
.top-bar {
702 697
    background-color: $theme-color-five;
698
    height: 5rem;
703 699
    position: fixed;
704 700
    width: 100%;
705 701
    top: 0;
702
    z-index: 2;
706 703
}
707 704

  
708 705
.arrow-left {
709 706
    margin-left: 80%;
710 707

  
711
    border-right:0.59055rem solid $theme-color-five;
708
    border-right: 0.59055rem solid $theme-color-five;
712 709
    background-color: $theme-color-four !important;
713 710
}
714 711

  
715 712
.arrow-right {
716
    border-left:0.59055rem solid $theme-color-four;
713
    border-left: 0.59055rem solid $theme-color-four;
717 714

  
718 715
    position: fixed;
719
    z-index: 1;
716
    z-index: 3;
720 717
    top: 0;
721 718
    left: 0;
722 719
}
723 720

  
724
.separator{
721
.separator {
725 722
    border-bottom: 1px solid $theme-color-five;
726 723
}
727 724

  
......
730 727
    //width: 0;
731 728
    width: 250px;
732 729
    position: fixed;
733
    z-index: 1;
730
    z-index: 4;
734 731
    top: 0;
735 732
    left: 0;
736 733
    background-color: $theme-color-four;
......
743 740
    color: $theme-color-five;
744 741
    display: block;
745 742
    transition: 0.3s;
746
    &:hover{
743

  
744
    &:hover {
747 745
        color: $theme-color-four;
748 746
        background-color: $theme-color-one;
749 747
    }
750
    &:active, &:focus, .active{
748

  
749
    &:active, &:focus, .active {
751 750
        color: $theme-color-one;
752 751
        background-color: $theme-color-four;
753 752
    }
754 753
}
755 754

  
756
.dropdown-item.active, .dropdown-item:active{
755
.dropdown-item.active, .dropdown-item:active {
757 756
    color: $theme-color-five;
758 757
    background-color: $theme-color-one;
759 758
}
760 759

  
761
.logo-kaplicky{
762
    position: fixed;
763
    top: 0;
764
    left: calc(50vw - 50pt);
765
    margin-top: 2rem;
760
.logo-kaplicky {
761
    display: block;
762
    text-align: center;
766 763
}
767 764

  
768 765
.vertical-center {
766
    margin-top: -5.1rem; // fixed navbar correction
769 767
    min-height: 100vh;
770 768
    display: flex;
771 769
    align-items: center;
......
778 776
    text-align: center;
779 777
}
780 778

  
779
// login and registration alert bottom margin
780
.al {
781
    margin-bottom: 3rem;
782
}
783

  
781 784
@media screen and (max-height: 450px) {
782
    .sidenav a {font-size: 18px;}
785
    .sidenav a {
786
        font-size: 18px;
787
    }
783 788
}
784 789

  
785
@media (max-width: 990px) {}//Ponecháno pro případ, že se bude měnit login
790
@media (max-width: 990px) {
791
}
786 792

  
787 793
@media (max-width: 770px) {
788
    body {
789
        .pin-left {
790
            margin-left: -33vw;
791
            margin-top: 15rem;
792
            //left: 20vw;
793
        }
794
        .register{
795
            .pin-left{
796
                margin-top: 20rem;
797
            }
798
        }
799

  
800
    }
801 794
}
802 795

  
803
@media only screen and (max-width: 540px)
804
{
805
    .sidenav{
796
@media only screen and (max-width: 540px) {
797
    .sidenav {
806 798
        width: 0;
807 799
    }
808
    .head-title.text-center h1
809
    {
800
    .head-title.text-center h1 {
810 801
        font-size: 23pt;
811 802
        padding-top: 50pt;
812 803
        white-space: nowrap;
......
831 822
        height: 180px;
832 823
    }*/
833 824

  
834
    body{
825
    body {
835 826
        .carousel {
836 827
            .carousel-inner {
837 828
                .social-logo {
......
843 834
    }
844 835
}
845 836

  
846
@media (min-width: 330px) and (max-height: 900px)
847
{
848
    body{
837
@media (min-width: 330px) and (max-height: 900px) {
838
    body {
849 839
        .carousel {
850 840
            .carousel-inner {
851 841
                .social-logo {
resources/views/auth/login.blade.php
7 7
@endsection
8 8

  
9 9
@section('content')
10
<div class="container">
11
    <div class="row justify-content-center">
12
        <div class="col-md-8">
13
            <div class="auth">
14
            <div class="card">
15
                {{--<div class="card-header">{{ __('Login') }}</div>--}}
10
    <div class="vertical-center">
11
        <div class="container">
12
            <div class="row justify-content-center">
13
                <div class="col-sm-12">
14
                    <div class="auth">
15
                        <div class="card">
16
                            {{--<div class="card-header">{{ __('Login') }}</div>--}}
16 17

  
17
                <div class="card-body">
18
                    <form method="POST" action="{{ route('login') }}">
19
                        @csrf
18
                            <div class="card-body">
19
                                <form method="POST" action="{{ route('login') }}">
20
                                    @csrf
20 21

  
21
                        <label for="logo" class="col-md-4 kaplicky">{{ __('kaplicky') }}</label>
22
                                    <label for="logo" class="col-md-4 kaplicky">{{ __('kaplicky') }}</label>
22 23

  
23
                        <div class="form-group row">
24
                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('e-mail') }}</label>
24
                                    <div class="form-group row">
25
                                        <label for="email"
26
                                               class="col-md-4 col-form-label text-md-right">{{ __('e-mail') }}</label>
25 27

  
26
                            <div class="col-md-6">
27
                                <input id="email" type="email" class="form-control text2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" {{--required autocomplete="email" autofocus--}}>
28
                            </div>
29
                        </div>
30

  
31
                        <div class="form-group row">
32
                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('password') }}</label>
28
                                        <div class="col-md-6">
29
                                            <input id="email" type="email"
30
                                                   class="form-control text2 @error('email') is-invalid @enderror"
31
                                                   name="email"
32
                                                   value="{{ old('email') }}" {{--required autocomplete="email" autofocus--}}>
33
                                        </div>
34
                                    </div>
33 35

  
34
                            <div class="col-md-6">
35
                                <input id="password" type="password" class="form-control text2 @error('password') is-invalid @enderror" name="password" {{--required autocomplete="current-password"--}}>
36
                            </div>
37
                        </div>
36
                                    <div class="form-group row">
37
                                        <label for="password"
38
                                               class="col-md-4 col-form-label text-md-right">{{ __('password') }}</label>
38 39

  
39
                        {{--<div class="form-group row">
40
                            <div class="col-md-6 offset-md-4">
41
                                <div class="form-check">
42
                                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
40
                                        <div class="col-md-6">
41
                                            <input id="password" type="password"
42
                                                   class="form-control text2 @error('password') is-invalid @enderror"
43
                                                   name="password" {{--required autocomplete="current-password"--}}>
44
                                        </div>
45
                                    </div>
46
                                    <div class="row">
47
                                        <div class="col-md-12">
48
                                            <button type="submit" class="btn button-square ">
49
                                                {{ __('join') }}
50
                                            </button>
51
                                            {{-- @if (Route::has('password.request'))
52
                                                <a class="btn btn-link" href="{{ route('password.request') }}">
53
                                                    {{ __('Forgot Your Password?') }}
54
                                                </a>
55
                                            @endif --}}
56
                                        </div>
57
                                    </div>
43 58

  
44
                                    <label class="form-check-label" for="remember">
45
                                        {{ __('Remember Me') }}
46
                                    </label>
47
                                </div>
48
                            </div>
49
                        </div>--}}
59
                                    @if($errors->any())
60
                                        <div class="row">
61
                                            <div class="col-sm-12">
62
                                                <div class="text white pin-left" role="alert">
63
                                                    <div class="al">
64
                                                        @error('email')
65
                                                        <p class="text">{{ $message }}</p>
66
                                                        @enderror
67
                                                        @error('password')
68
                                                        <p class="text">{{ $message }}</p>
69
                                                        @enderror
70
                                                    </div>
71
                                                </div>
72
                                            </div>
73
                                    @endif
50 74

  
51
                            <div class="col-md-12">
52
                                <button type="submit" class="btn button-square ">
53
                                    {{ __('join') }}
54
                                </button>
55
                                {{-- @if (Route::has('password.request'))
56
                                    <a class="btn btn-link" href="{{ route('password.request') }}">
57
                                        {{ __('Forgot Your Password?') }}
58
                                    </a>
59
                                @endif --}}
75
                                </form>
60 76
                            </div>
61

  
62
                        @if($errors->any())
63
                            <div class="col-md-6 offset-md-2">
64
                                <span class="text white pin-left" role="alert">
65
                                    <p> </p>
66
                                    @error('email')
67
                                             <p class="text">{{ $message }}</p>
68
                                     @enderror
69
                                    @error('password')
70
                                             <p class="text">{{ $message }}</p>
71
                                     @enderror
72
                                </span>
73
                            </div>
74
                        @endif
75

  
76
                    </form>
77
                        </div>
78
                    </div>
77 79
                </div>
78 80
            </div>
79 81
        </div>
80
        </div>
81 82
    </div>
82
</div>
83 83
@endsection
resources/views/auth/register.blade.php
7 7
@endsection
8 8

  
9 9
@section('content')
10
<div class="container">
11
    <div class="row justify-content-center">
12
        <div class="col-md-8">
13
            <div class="auth register">
14
            <div class="card">
15
                {{--<div class="card-header">{{ __('Register') }}</div>--}}
16

  
17
                <div class="card-body">
18
                    <form method="POST" action="{{ route('register') }}">
19
                        @csrf
20

  
21
                        <label for="logo" class="col-md-4 kaplicky">{{ __('kaplicky') }}</label>
22
                        <div class="form-group row">
23
                            <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('name') }}</label>
24

  
25
                            <div class="col-md-6">
26
                                <input id="name" type="text" class="form-control text2 @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" {{--required autocomplete="name" autofocus--}}>
27

  
28
                            </div>
29
                        </div>
30

  
31
                        <div class="form-group row">
32
                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('e-mail') }}</label>
33

  
34
                            <div class="col-md-6">
35
                                <input id="email" type="email @error('email') is-invalid @enderror" class="form-control text2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" {{--required autocomplete="email"--}}>
36

  
37
                            </div>
38
                        </div>
39

  
40
                        <div class="form-group row">
41
                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('password') }}</label>
42

  
43
                            <div class="col-md-6">
44
                                <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" {{--required autocomplete="new-password"--}}>
45

  
46
                            </div>
47
                        </div>
48

  
49
                        <div class="form-group row">
50
                            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('confirm password') }}</label>
51

  
52
                            <div class="col-md-6">
53
                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" {{--required autocomplete="new-password"--}}>
10
    <div class="vertical-center">
11
        <div class="container">
12
            <div class="row justify-content-center">
13
                <div class="col-md-8">
14
                    <div class="auth">
15
                        <div class="card">
16
                            {{--<div class="card-header">{{ __('Register') }}</div>--}}
17

  
18
                            <div class="card-body">
19
                                <form method="POST" action="{{ route('register') }}">
20
                                    @csrf
21

  
22
                                    <label for="logo" class="col-md-4 kaplicky">{{ __('kaplicky') }}</label>
23
                                    <div class="form-group row">
24
                                        <label for="name"
25
                                               class="col-md-4 col-form-label text-md-right">{{ __('name') }}</label>
26

  
27
                                        <div class="col-md-6">
28
                                            <input id="name" type="text"
29
                                                   class="form-control text2 @error('name') is-invalid @enderror"
30
                                                   name="name"
31
                                                   value="{{ old('name') }}" {{--required autocomplete="name" autofocus--}}>
32

  
33
                                        </div>
34
                                    </div>
35

  
36
                                    <div class="form-group row">
37
                                        <label for="email"
38
                                               class="col-md-4 col-form-label text-md-right">{{ __('e-mail') }}</label>
39

  
40
                                        <div class="col-md-6">
41
                                            <input id="email" type="email @error('email') is-invalid @enderror"
42
                                                   class="form-control text2 @error('email') is-invalid @enderror"
43
                                                   name="email"
44
                                                   value="{{ old('email') }}" {{--required autocomplete="email"--}}>
45

  
46
                                        </div>
47
                                    </div>
48

  
49
                                    <div class="form-group row">
50
                                        <label for="password"
51
                                               class="col-md-4 col-form-label text-md-right">{{ __('password') }}</label>
52

  
53
                                        <div class="col-md-6">
54
                                            <input id="password" type="password"
55
                                                   class="form-control @error('password') is-invalid @enderror"
56
                                                   name="password" {{--required autocomplete="new-password"--}}>
57

  
58
                                        </div>
59
                                    </div>
60

  
61
                                    <div class="form-group row">
62
                                        <label for="password-confirm"
63
                                               class="col-md-4 col-form-label text-md-right">{{ __('confirm password') }}</label>
64

  
65
                                        <div class="col-md-6">
66
                                            <input id="password-confirm" type="password" class="form-control"
67
                                                   name="password_confirmation" {{--required autocomplete="new-password"--}}>
68
                                        </div>
69
                                    </div>
70

  
71
                                    <div class="row">
72
                                        <div class="col-md-12">
73
                                            <button type="submit" class="btn button-square">
74
                                                {{ __('Register') }}
75
                                            </button>
76
                                        </div>
77
                                    </div>
78

  
79
                                    @if($errors->any())
80
                                        <div class="row">
81
                                            <div class="col-sm-12">
82
                                                <div class="text white pin-left" role="alert">
83
                                                    <div class="al">
84
                                                        @error('email')
85
                                                        <p class="text">{{ $message }}</p>
86
                                                        @enderror
87
                                                        @error('password')
88
                                                        <p class="text">{{ $message }}</p>
89
                                                        @enderror
90
                                                        @error('name')
91
                                                        <p class="text">{{ $message }}</p>
92
                                                        @enderror
93
                                                    </div>
94
                                                </div>
95
                                            </div>
96
                                        </div>
97
                                    @endif
98

  
99
                                </form>
54 100
                            </div>
55 101
                        </div>
56

  
57
                            <div class="col-md-12">
58
                                <button type="submit" class="btn button-square">
59
                                    {{ __('Register') }}
60
                                </button>
61
                            </div>
62

  
63
                        @if($errors->any())
64
                            <div class="col-md-6 offset-md-2">
65
                                <span class="text white pin-left" role="alert">
66
                                    <p> </p>
67
                                    @error('email')
68
                                             <p class="text">{{ $message }}</p>
69
                                     @enderror
70
                                    @error('password')
71
                                             <p class="text">{{ $message }}</p>
72
                                     @enderror
73
                                    @error('name')
74
                                             <p class="text">{{ $message }}</p>
75
                                     @enderror
76
                                </span>
77
                            </div>
78
                        @endif
79

  
80
                    </form>
102
                    </div>
81 103
                </div>
82 104
            </div>
83
            </div>
84 105
        </div>
85 106
    </div>
86
</div>
87 107
@endsection
resources/views/errors/404.blade.php
3 3
@section('content')
4 4

  
5 5
    <div class="vertical-center">
6
    <div class="container">
7
        <div class="row">
8
            <div class="col-sm-12">
9
                <span class="error">404 | Not Found</span>
6
        <div class="container">
7
            <div class="row">
8
                <div class="col-sm-12">
9
                    <span class="error">404 | Not Found</span>
10
                </div>
10 11
            </div>
11 12
        </div>
12 13
    </div>
13
    </div>
14 14

  
15 15
@endsection
resources/views/inc/sidebar.blade.php
55 55
    <span class="arrow arrow-right" onclick="openNav()"></span>
56 56
    @if(!Request::is('login')&&!Request::is('register'))
57 57
        <li class="nav-item dropdown col-md-4">
58
            <a for="logo" class="col-md-4 logo-kaplicky kaplicky" href="{{ url('/') }}">{{ __('kaplicky') }}</a>
58
            <a for="logo" class="logo-kaplicky kaplicky" href="{{ url('/') }}">{{ __('kaplicky') }}</a>
59 59
        </li>
60 60
    @endif
61 61
</nav>
resources/views/layouts/app.blade.php
16 16

  
17 17
    <!-- Styles -->
18 18
    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
19
    
19

  
20 20
</head>
21 21
<body>
22 22

  
23
        @if(!Request::is('/'))
24
            @include('inc/sidebar')
25
        @endif
26

  
23
@if(!Request::is('/'))
24
    @include('inc/sidebar')
25
@endif
27 26

  
28
                    @yield('content')
27
@yield('content')
29 28

  
30 29
</body>
31 30
</html>

Také k dispozici: Unified diff