Changeset 42d565b in Git for src/main/resources/static

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:

src/main/resources/static

Files:

• css/shared.css (modified) (1 diff)
• img/logo.png (added)
• js/sharedScript.js (modified) (2 diffs)

src/main/resources/static/css/shared.css

@@ -2 +2 @@
     max-width: 5vw;
 }
+
+.row{
+    height: 300px;
+    margin-bottom: 15px;
+}
+
+.row div{
+    height: 100%;
+}
+
+.row div div{
+    height: 100%;
+}
+
+.card{
+    background-size: 100vh auto;
+    float:left;
+    margin: 7px;
+    border-radius: 10px;
+    padding: 20px;
+    color: white;
+    -webkit-text-stroke-width: 1px !important;
+    -webkit-text-stroke-color: black !important;
+    width: 90%;
+    height: 90%;
+    box-shadow: 4px 4px 4px rgba(128,128,128,1);
+}
+
+.card a h3{
+    -webkit-text-stroke-width: 1px;
+    -webkit-text-stroke-color: black;
+    color:white;
+    transition: 100ms;
+}
+
+.card:hover a h3{
+    transition: 400ms;
+    color:black;
+    -webkit-text-stroke-color: white;
+}
+
+.title{
+    text-align: center;
+    background-color: rgba(0,0,0,0.25);
+    border-radius: 10px 10px 0px 0px;
+    padding: 10px;
+}
+
+.bottom{
+    position: absolute;
+    top: 80%;
+    margin:auto;
+    width: 100%;
+    left: 0%;
+    border-radius: 0px;
+    text-align: center;
+    background-color: rgba(0,0,0,0.25);
+}
+
+
+.bottom-heart{
+    top: 60%;
+    left: auto;
+    position: absolute;
+    margin: auto;
+    width: 20%;
+    text-align: center;
+}

src/main/resources/static/js/sharedScript.js

@@ -4 +4 @@
     var elements = $(".elements")
     var elementGrade;
+
 
     $("#dialog-rating").dialog({
@@ -145 +146 @@
                 let movieId=$(button).attr("movie-id")
                 if (type==='like') {
-                    $(button).parent().append("<a class='btn btn-primary button-remove-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">Избриши од омилена листа</a>")
+                    $(button).parent().append("<a class='bottom-heart btn btn-danger button-remove-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">💔</a>")
                     console.log("da")
                 }
                 else{
-                    $(button).parent().append("<a class='btn btn-primary button-add-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">Додади во омилена листа</a>")
+                    $(button).parent().append("<a class='bottom-heart btn btn-success button-add-favourite-list' movie-id=" + movieId + " user-id=" + userId + ">❤</a>")
 
                 }