Projekt

Obecné

Profil

« Předchozí | Další » 

Revize deebc8b6

Přidáno uživatelem Marek Zábran před asi 4 roky(ů)

Oprava like/unlike u charts.

Zobrazit rozdíly:

resources/sass/_custom.scss
405 405
            }
406 406
        }
407 407

  
408
        .charts{
409
            .inter_info, .inter_like, .inter_like_filled{
408
        .charts {
409
            .inter_info, .inter_like, .inter_like_filled {
410
                display: inline;
411

  
410 412
                &:before {
411 413
                    width: 3rem;
412 414
                    height: 3rem;
......
744 746
        }
745 747
    }
746 748

  
747
    .btn-dark:not(:disabled):not(.disabled).active{
749
    .btn-dark:not(:disabled):not(.disabled).active {
748 750
        background-color: $theme-color-four;
749
        color:white;
751
        color: white;
750 752
        border-color: $theme-color-five;
751 753
    }
752 754

  
......
764 766
    }
765 767

  
766 768
    //CATEGORIES - Main menu
767
    .cat-main-menu{
769
    .cat-main-menu {
768 770
        font-size: 1.75rem;
769 771
        text-align: center;
770 772
        margin-bottom: 30pt;
771 773

  
772
        a,a:visited{
774
        a, a:visited {
773 775
            color: $theme-color-two;
774 776
            text-decoration: none;
775 777
        }
776 778

  
777
        a:hover{
779
        a:hover {
778 780
            color: $theme-color-four;
779 781
        }
780 782

  
781 783
    }
782 784

  
783 785
    //CATEGORIES - Wrapper around Enter button
784
    .cat-wrapper{
785
        margin:auto;
786
        display:block;
786
    .cat-wrapper {
787
        margin: auto;
788
        display: block;
787 789
        //align-content: center;
788 790
        //margin:auto;
789 791
        //display:block;
......
794 796
        //font-size: 8pt;
795 797
        //background-color: grey;
796 798
        //color: $theme-color-one;
797
       // border: 0.5pt solid $theme-color-one;
799
        // border: 0.5pt solid $theme-color-one;
798 800
        border-radius: 0;
799 801
        bottom: 5%;
800 802
        position: fixed;
......
816 818
    }
817 819

  
818 820
    //VERIFY - main text
819
    .ver-text{
821
    .ver-text {
820 822

  
821
        margin-top: 20pt    ;
823
        margin-top: 20pt;
822 824

  
823
        h2{
825
        h2 {
824 826
            text-align: center;
825
            color:$theme-color-two;
827
            color: $theme-color-two;
826 828
        }
827 829
    }
828 830
}
......
1320 1322
            top: -1.125rem;
1321 1323
            left: -0.56rem;
1322 1324
        }
1323
        .pin-left{
1325

  
1326
        .pin-left {
1324 1327
            // center fixed div
1325 1328
            left: 75%;
1326 1329
            transform: translateX(-50%);
......
1332 1335
            font-size: 18pt;
1333 1336
            line-height: 26pt;
1334 1337
        }
1338

  
1335 1339
        .text2 {
1336 1340
            text-align: left;
1337 1341
            font-size: 18pt;
resources/views/charts/index.blade.php
28 28

  
29 29
                                            <div class="charts float-center">
30 30
                                                @if (!$artefact->favourite)
31
                                                    <form method="POST"
32
                                                          action="{{ url('/artefact/like/' . $artefact->id) }}">
33
                                                        @csrf
34
                                                        <button id="like_butt_{{$artefact->id}}" style="display: inline"
35
                                                                type="submit"
36
                                                                class="btn btn-primary button-image inter_like" ></button>
37
                                                    </form>
31
                                                    <a href="{{  action('ArtefactController@like', ['id' => $artefact->id]) }}">
32
                                                        <button id="like_butt_{{$artefact->id}}" type="button"
33
                                                                class="btn btn-primary button-image inter_like"></button>
34
                                                    </a>
38 35
                                                @else
39
                                                    <form method="POST"
40
                                                          action="{{ url('/artefact/unlike/' . $artefact->id) }}">
41
                                                        @csrf
42
                                                        <button id="like_butt_{{$artefact->id}}" style="display: inline"
43
                                                                type="submit"
36
                                                    <a href="{{  action('ArtefactController@unlike', ['id' => $artefact->id]) }}">
37
                                                        <button id="like_butt_{{$artefact->id}}" type="button"
44 38
                                                                class="btn btn-primary button-image inter_like_filled"></button>
45
                                                    </form>
39
                                                    </a>
46 40
                                                @endif
47
                                                <span class="likes_text">
48
                                                <h6>{{$artefact->likes}}</h6>
49
                                            </span>
41
                                                <h6 class="artefact-likes">{{$artefact->likes}}</h6>
50 42
                                            </div>
51 43
                                        </div>
52 44
                                    </div>
resources/views/inc/sidebar.blade.php
2 2
    <a href="javascript:void(0)" class="arrow arrow-left" onclick="closeNav()"></a>
3 3
    <ul style="padding-left: 0; margin-top: 5rem;">
4 4
        @if(Request::is('login')||Request::is('register'))
5
        <li class="nav-item">
6
            <a class="menu-item text-headline" href="{{ url('/') }}">
7
                {{ __('general.home') }}
8
            </a>
9
            <a class="menu-item text-headline" href="{{ route('login') }}">
10
                {{ __('general.login') }}
11
            </a>
12
        </li>
13
        @if (Route::has('register'))
14 5
            <li class="nav-item">
15
                <a class="menu-item text-headline" href="{{ route('register') }}">
16
                    {{ __('general.register') }}
6
                <a class="menu-item text-headline" href="{{ url('/') }}">
7
                    {{ __('general.home') }}
8
                </a>
9
                <a class="menu-item text-headline" href="{{ route('login') }}">
10
                    {{ __('general.login') }}
17 11
                </a>
18 12
            </li>
19
        @endif
20
    @else
21
        <li class="nav-item">
22
            <a class="menu-item text-headline" href="{{ url('/') }}">
23
                {{ __('general.home') }}
24
            </a>
13
            @if (Route::has('register'))
14
                <li class="nav-item">
15
                    <a class="menu-item text-headline" href="{{ route('register') }}">
16
                        {{ __('general.register') }}
17
                    </a>
18
                </li>
19
            @endif
20
        @else
21
            <li class="nav-item">
22
                <a class="menu-item text-headline" href="{{ url('/') }}">
23
                    {{ __('general.home') }}
24
                </a>
25 25

  
26
            <a class="menu-item text-headline" href="{{ url('/categories') }}">
27
                {{ __('general.topics') }}
28
            </a>
26
                <a class="menu-item text-headline" href="{{ url('/categories') }}">
27
                    {{ __('general.topics') }}
28
                </a>
29 29

  
30
            <a class="menu-item text-headline" href="{{ url('/artefact') }}">
31
                {{ __('general.artefacts') }}
32
            </a>
30
                <a class="menu-item text-headline" href="{{ url('/artefact') }}">
31
                    {{ __('general.artefacts') }}
32
                </a>
33 33

  
34
            <a class="menu-item text-headline" href="{{ url('/favartefacts') }}">
35
                {{ __('general.favourite_artefacts') }}
36
            </a>
34
                <a class="menu-item text-headline" href="{{ url('/favartefacts') }}">
35
                    {{ __('general.favourite_artefacts') }}
36
                </a>
37 37

  
38
            <a class="menu-item text-headline" href="{{ url('/favmetadata') }}">
39
                {{ __('general.favourite_metadata') }}
40
            </a>
38
                <a class="menu-item text-headline" href="{{ url('/favmetadata') }}">
39
                    {{ __('general.favourite_metadata') }}
40
                </a>
41 41

  
42
            <a class="menu-item text-headline" href="{{ url('/charts') }}">
43
                {{ __('general.charts') }}
44
            </a>
42
                <a class="menu-item text-headline" href="{{ url('/charts') }}">
43
                    {{ __('general.charts') }}
44
                </a>
45 45

  
46
        </li>
47
        <li class="nav-item down">
48
            <a class="menu-item text-headline" href="{{ url('/czech') }}">
49
                {{ __('general.cs') }}
50
            </a>
51
            @guest
46
            </li>
47
            <li class="nav-item down">
48
                <a class="menu-item text-headline" href="{{ url('/czech') }}">
49
                    {{ __('general.cs') }}
50
                </a>
51
                @guest
52 52
                @else
53
            <a class="menu-item text-headline" href="{{ route('logout') }}" onclick="
53
                    <a class="menu-item text-headline" href="{{ route('logout') }}" onclick="
54 54
            event.preventDefault();
55 55
            document.getElementById('logout-form').submit();">
56
                {{ __('general.logout') }}
57
            </a>
56
                        {{ __('general.logout') }}
57
                    </a>
58 58

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

  
......
74 74
    @endif
75 75
    <div class="bar-desktop">
76 76
        @if(Request::is('login')||Request::is('register'))
77
                <a class="menu-item text-headline-desktop" href="{{ url('/') }}">
78
                    {{ __('general.home') }}
79
                </a>
80
                <a class="menu-item text-headline-desktop" href="{{ route('login') }}">
81
                    {{ __('general.login') }}
82
                </a>
77
            <a class="menu-item text-headline-desktop" href="{{ url('/') }}">
78
                {{ __('general.home') }}
79
            </a>
80
            <a class="menu-item text-headline-desktop" href="{{ route('login') }}">
81
                {{ __('general.login') }}
82
            </a>
83 83
            @if (Route::has('register'))
84
                    <a class="menu-item text-headline-desktop" href="{{ route('register') }}">
85
                        {{ __('general.register') }}
86
                    </a>
84
                <a class="menu-item text-headline-desktop" href="{{ route('register') }}">
85
                    {{ __('general.register') }}
86
                </a>
87 87
            @endif
88 88
        @else
89
        <a class="menu-item text-headline-desktop" href="{{ url('/') }}">
90
            {{ __('general.home') }}
91
        </a>
89
            <a class="menu-item text-headline-desktop" href="{{ url('/') }}">
90
                {{ __('general.home') }}
91
            </a>
92 92

  
93
        <a class="menu-item text-headline-desktop" href="{{ url('/categories') }}">
94
            {{ __('general.topics') }}
95
        </a>
93
            <a class="menu-item text-headline-desktop" href="{{ url('/categories') }}">
94
                {{ __('general.topics') }}
95
            </a>
96 96

  
97
        <a class="menu-item text-headline-desktop" href="{{ url('/artefact') }}">
98
            {{ __('general.artefacts') }}
99
        </a>
97
            <a class="menu-item text-headline-desktop" href="{{ url('/artefact') }}">
98
                {{ __('general.artefacts') }}
99
            </a>
100 100

  
101
        <a class="menu-item text-headline-desktop" href="{{ url('/favartefacts') }}">
102
            {{ __('general.favourite_artefacts') }}
103
        </a>
101
            <a class="menu-item text-headline-desktop" href="{{ url('/favartefacts') }}">
102
                {{ __('general.favourite_artefacts') }}
103
            </a>
104 104

  
105
        <a class="menu-item text-headline-desktop" href="{{ url('/favmetadata') }}">
106
            {{ __('general.favourite_metadata') }}
107
        </a>
105
            <a class="menu-item text-headline-desktop" href="{{ url('/favmetadata') }}">
106
                {{ __('general.favourite_metadata') }}
107
            </a>
108 108

  
109
        <a class="menu-item text-headline-desktop" href="{{ url('/charts') }}">
110
            {{ __('general.charts') }}
111
        </a>
109
            <a class="menu-item text-headline-desktop" href="{{ url('/charts') }}">
110
                {{ __('general.charts') }}
111
            </a>
112 112

  
113
        <a class="menu-item text-headline-desktop" href="{{ url('/czech') }}">
114
            {{ __('general.cs') }}
115
        </a>
116
        @guest
113
            <a class="menu-item text-headline-desktop" href="{{ url('/czech') }}">
114
                {{ __('general.cs') }}
115
            </a>
116
            @guest
117 117
            @else
118
        <a class="menu-item text-headline-desktop" href="{{ route('logout') }}" onclick="
118
                <a class="menu-item text-headline-desktop" href="{{ route('logout') }}" onclick="
119 119
            event.preventDefault();
120 120
            document.getElementById('logout-form').submit();">
121
            {{ __('general.logout') }}
122
        </a>
121
                    {{ __('general.logout') }}
122
                </a>
123 123

  
124
        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
125
            @csrf
126
        </form>
124
                <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
125
                    @csrf
126
                </form>
127 127
            @endguest
128 128
        @endif
129 129
    </div>

Také k dispozici: Unified diff