Changeset 42d565b in Git for target/classes/static


Ignore:
Timestamp:
02/06/22 21:38:16 (3 years ago)
Author:
GitHub <noreply@…>
Branches:
main
Children:
7f36551
Parents:
5b447b0 (diff), 2efe93e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Mato-77 <56981531+Mato-77@…> (02/06/22 21:38:16)
git-committer:
GitHub <noreply@…> (02/06/22 21:38:16)
Message:

Merge pull request #1 from partaloski/master

Fixed and added a better front end, improved clarity

Location:
target/classes/static
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • target/classes/static/css/shared.css

    r5b447b0 r42d565b  
    22    max-width: 5vw;
    33}
     4
     5.row{
     6    height: 300px;
     7    margin-bottom: 15px;
     8}
     9
     10.row div{
     11    height: 100%;
     12}
     13
     14.row div div{
     15    height: 100%;
     16}
     17
     18.card{
     19    background-size: 100vh auto;
     20    float:left;
     21    margin: 7px;
     22    border-radius: 10px;
     23    padding: 20px;
     24    color: white;
     25    -webkit-text-stroke-width: 1px !important;
     26    -webkit-text-stroke-color: black !important;
     27    width: 90%;
     28    height: 90%;
     29    box-shadow: 4px 4px 4px rgba(128,128,128,1);
     30}
     31
     32.card a h3{
     33    -webkit-text-stroke-width: 1px;
     34    -webkit-text-stroke-color: black;
     35    color:white;
     36    transition: 100ms;
     37}
     38
     39.card:hover a h3{
     40    transition: 400ms;
     41    color:black;
     42    -webkit-text-stroke-color: gray;
     43}
     44
     45.title{
     46    text-align: center;
     47    background-color: rgba(0,0,0,0.25);
     48    border-radius: 10px 10px 0px 0px;
     49    padding: 10px;
     50}
     51
     52.bottom{
     53    position: absolute;
     54    top: 80%;
     55    margin:auto;
     56    width: 100%;
     57    left: 0%;
     58    border-radius: 0px;
     59    text-align: center;
     60    background-color: rgba(0,0,0,0.25);
     61}
     62
     63
     64.bottom-heart{
     65    top: 60%;
     66    left: auto;
     67    position: absolute;
     68    margin: auto;
     69    width: 20%;
     70    text-align: center;
     71}

  • target/classes/static/js/sharedScript.js

    r5b447b0 r42d565b  
    44    var elements = $(".elements")
    55    var elementGrade;
     6
    67
    78    $("#dialog-rating").dialog({
    … …  
    145146                let movieId=$(button).attr("movie-id")
    146147                if (type==='like') {
    147                     $(button).parent().append("<a class='btn btn-primary button-remove-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">Избриши од омилена листа</a>")
     148                    $(button).parent().append("<a class='bottom-heart btn btn-danger button-remove-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">💔</a>")
    148149                    console.log("da")
    149150                }
    150151                else{
    151                     $(button).parent().append("<a class='btn btn-primary button-add-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">Додади во омилена листа</a>")
     152                    $(button).parent().append("<a class='bottom-heart btn btn-success button-add-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">❤</a>")
    152153
    153154                }
Note: See TracChangeset for help on using the changeset viewer.