Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 8bb7ed68

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

Fast fix

Zobrazit rozdíly:

resources/lang/en/general.php
27 27

  
28 28
    'home' => 'home',
29 29
    'login' => 'login',
30
    'logout' => 'logout',
30 31
    'register' => 'register',
31 32
    'topics' => 'topics',
32 33
    'artefacts' => 'books',
resources/sass/_custom.scss
68 68
        .carousel-caption {
69 69
            top: 50%;
70 70
            bottom: auto;
71
            padding-left: 1rem;
72
            padding-right: 1rem;
71 73
            transform: translateY(-50%);
72 74
            background-color: rgba(239, 218, 179, 0.5);
73 75
        }
......
304 306
        }
305 307
    }
306 308

  
307
    .fav-cat-mybooks{
308
        color:$theme-color-two;
309
    .fav-cat-mybooks {
310
        color: $theme-color-two;
309 311
        text-align: center;
310 312
        font-size: 1.9rem;
311 313
    }
312 314

  
313
    .fav-cat-nofav{
315
    .fav-cat-nofav {
314 316
        text-align: center;
315
        color:$theme-color-three;
317
        color: $theme-color-three;
316 318
        background-color: $theme-color-five;
317 319
        border-color: $theme-color-three;
318 320
    }
......
348 350

  
349 351
        .left_panel_info {
350 352
            margin-top: 15px;
351
            max-width: 70%;//250px
353
            max-width: 70%; //250px
352 354
        }
353 355

  
354 356
        .right_panel_info {
355 357
            margin-top: 15px;
356 358
        }
357 359

  
358
        .likes_text{
360
        .likes_text {
359 361
            text-align: center;
360 362
        }
361 363

  
......
371 373
                background-image: url(../images/interface/Button_Info.svg);
372 374
                //width: 60px;
373 375
                //height: 60px;
374
                width:8vw;
375
                height:8vw;
376
                width: 8vw;
377
                height: 8vw;
376 378
            }
377 379
        }
378 380

  
......
384 386
                background-image: url(../images/interface/Heart_Empty.svg);
385 387
                //width: 60px;
386 388
                //height: 60px;
387
                width:8vw;
388
                height:8vw;
389
                width: 8vw;
390
                height: 8vw;
389 391
            }
390 392
        }
391 393

  
......
395 397
                background-image: url(../images/interface/Heart_Filled.svg);
396 398
                //width: 60px;
397 399
                //height: 60px;
398
                width:8vw;
399
                height:8vw;
400
                width: 8vw;
401
                height: 8vw;
400 402
            }
401 403
        }
402 404

  
......
709 711
        font-size: 22pt;
710 712

  
711 713
        //SPACING
712
        padding: 4rem 0.5rem;
714
        padding: 4rem 1rem;
713 715

  
714 716
        &:active, &:focus {
715 717
            background-color: $theme-color-three;
......
726 728
    }
727 729

  
728 730
    //CATEGORIES - Choose a topic TITLE
729
    .head-title.text-center.cat-main-topic{
731
    .head-title.text-center.cat-main-topic {
730 732

  
731
        h1{
733
        h1 {
732 734
            font-size: 1.9rem;
733 735
        }
734 736
    }
......
741 743
    width: 100%;
742 744
    top: 0;
743 745
    z-index: 2;
746

  
744 747
    .shadow {
745 748
        box-shadow: none;
746 749
    }
747 750
}
748 751

  
749
.separator {
750
    position: relative;
751
    z-index : 5;
752
    &:before{
753
        width: 50%;
754
        content : "";
755
        position: absolute;
756
        left    : 0;
757
        bottom  : 0;
758
        height  : 1px;
759
        border-bottom:1px solid $theme-color-five;
760
    }
761
}
762

  
763 752
.sidenav {
764 753
    height: 100%;
765 754
    width: 0;
......
790 779
    }
791 780
}
792 781

  
793
.bar-desktop{
782
.bar-desktop {
794 783
    display: flex;
795 784
    align-items: center;
796 785
    text-align: center;
......
808 797
    margin-bottom: 3rem;
809 798
}
810 799

  
811
.menu-item{
812
    padding: 0.25rem 0.25rem;
800
.menu-item {
801
    padding: 0.25rem 1rem;
813 802
    width: 100%;
814 803
    border: 0;
815
    &:active, &.active, &:focus{
804

  
805
    &:active, &.active, &:focus {
816 806
        color: $theme-color-one;
817 807
        //background-color: $theme-color-five;
818 808
        border: none;
......
824 814
.logo-kaplicky {
825 815
    text-align: center;
826 816
    display: none;
827
    &:active, &.active, &:focus{
817

  
818
    &:active, &.active, &:focus {
828 819
        outline: none;
829 820
        box-shadow: none;
830 821
    }
831 822
}
832 823

  
833
.navbar{
824
.navbar {
834 825
    padding: unset;
835 826
}
836 827

  
......
881 872
            }
882 873

  
883 874
            .book-arrow-right {
884
               &:after {
885
                   right: 25%;
886
                   border-left: 1.25rem solid $theme-color-two;
887
               }
875
                &:after {
876
                    right: 25%;
877
                    border-left: 1.25rem solid $theme-color-two;
878
                }
888 879
            }
889 880

  
890 881
            .likes {
......
894 885

  
895 886
                .inter_like, .inter_like_filled {
896 887
                    margin: 0 auto;
888

  
897 889
                    &:before {
898 890
                        margin-right: 0;
899 891
                        height: 5rem;
......
1080 1072
}
1081 1073

  
1082 1074
@media (max-width: 770px) {
1083
    .logo-kaplicky{
1084
        width: 100%;
1075
    .logo-kaplicky {
1076
        margin: 0 auto;
1085 1077
        display: block;
1086 1078
    }
1087 1079
    .arrow {
......
1091 1083
        margin: 2rem;
1092 1084
        cursor: pointer;
1093 1085
        border: 0.59055rem solid transparent;
1094
        &:active, &.active, &:focus{
1086

  
1087
        &:active, &.active, &:focus {
1095 1088
            outline: none;
1096 1089
            box-shadow: none;
1097 1090
        }
......
1110 1103
        top: 0;
1111 1104
        left: 0;
1112 1105
    }
1113
    .bar-desktop{
1106
    .bar-desktop {
1114 1107
        display: none;
1115 1108
    }
1116
    .menu-item:active, .menu-item.active{
1109
    .menu-item:active, .menu-item.active {
1117 1110
        color: $theme-color-five;
1118 1111
        background-color: $theme-color-one;
1119 1112
    }
1120 1113
    .books-component {
1121
        .info-area{
1114
        .info-area {
1122 1115
            padding-left: 1.5625rem;
1123 1116
        }
1124 1117
    }
......
1135 1128
    }
1136 1129

  
1137 1130

  
1138

  
1139 1131
    /*.btn-circle.rounded-circle.btn-sm
1140 1132
    {
1141 1133
        width: 90px;
......
1181 1173
@media (min-width: 1024px) {
1182 1174

  
1183 1175
    body {
1184
        .kaplicky{
1176
        .kaplicky {
1185 1177
            text-align: left !important;
1186 1178
            font-size: 24pt;
1187 1179
            line-height: 24pt;
......
1211 1203
                        }
1212 1204
                    }
1213 1205
                }
1206

  
1214 1207
                .carousel-button {
1215 1208
                    bottom: 15%;
1216 1209
                }
1217 1210
            }
1218 1211

  
1219
            .carousel-caption{
1212
            .carousel-caption {
1220 1213
                padding: 3.75rem 6.25rem 5em;
1221 1214

  
1222 1215
                h2 {
......
1244 1237
        }
1245 1238
    }
1246 1239
}
1247

  
1248
@media (min-width: 1900px) {
1249

  
1250
    body {
1251
        .carousel {
1252
            .carousel-inner {
1253
                .carousel-button {
1254
                    transform: none;
1255
                    left: 76%;
1256
                    bottom: 25%;
1257
                }
1258
            }
1259
        }
1260
    }
1261
}
resources/views/auth/register.blade.php
71 71
                                    <div class="row">
72 72
                                        <div class="col-md-12">
73 73
                                            <button type="submit" class="btn button-square">
74
                                                {{ __('Register') }}
74
                                                {{ __('general.register') }}
75 75
                                            </button>
76 76
                                        </div>
77 77
                                    </div>
......
81 81
                                            <div class="col-sm-12">
82 82
                                                <div class="text white pin-left" role="alert">
83 83
                                                    <div class="al">
84
                                                        @error('email')
84
                                                        @error('name')
85 85
                                                        <p class="text">{{ $message }}</p>
86 86
                                                        @enderror
87
                                                        @error('password')
87
                                                        @error('email')
88 88
                                                        <p class="text">{{ $message }}</p>
89 89
                                                        @enderror
90
                                                        @error('name')
90
                                                        @error('password')
91 91
                                                        <p class="text">{{ $message }}</p>
92 92
                                                        @enderror
93 93
                                                    </div>
resources/views/inc/sidebar.blade.php
1 1
<div id="sidebar" class="sidenav">
2 2
    <a href="javascript:void(0)" class="arrow arrow-left" onclick="closeNav()"></a>
3
    <li class="nav-item"> &#160;</li>
4
    <li class="nav-item"> &#160;</li>
5
    <li class="nav-item"> &#160;</li>
6
    <li class="nav-item"> &#160;</li>
3
    <ul style="padding-left: 0; margin-top: 5rem;">
7 4
    @guest
8 5
        <li class="nav-item">
9 6
            <a class="menu-item text-headline" href="{{ url('/') }}">
......
21 18
            </li>
22 19
        @endif
23 20
    @else
24
        <li class="nav-item separator">
21
        <li class="nav-item">
25 22
            <a class="menu-item text-headline" href="{{ url('/') }}">
26 23
                {{ __('general.home') }}
27 24
            </a>
......
54 51
            <a class="menu-item text-headline" href="{{ route('logout') }}" onclick="
55 52
            event.preventDefault();
56 53
            document.getElementById('logout-form').submit();">
57
                {{ __('logout') }}
54
                {{ __('general.logout') }}
58 55
            </a>
59 56

  
60 57
            <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
......
62 59
            </form>
63 60
        </li>
64 61
    @endguest
65

  
62
    </ul>
66 63
</div>
67 64

  
68 65
<nav class="navbar navbar-expand-md navbar-light top-bar">
......
116 113
        <a class="menu-item text-headline-desktop" href="{{ route('logout') }}" onclick="
117 114
            event.preventDefault();
118 115
            document.getElementById('logout-form').submit();">
119
            {{ __('logout') }}
116
            {{ __('general.logout') }}
120 117
        </a>
121 118

  
122 119
        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">

Také k dispozici: Unified diff