Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/views/users/_returnTop_btn.html.erb

@@ -39,10 +39,24 @@
   </a>
 
 </div>
-
 <script>
-  function trophyreturnfun(){
-      $("#trophyreturn").hide()
-  }
+    function trophyreturnfun(){
+        $("#trophyreturn").hide()
+        localStorage.setItem('trophy_uid', true);
+    }
+
+    $(function() {
+
+        var trophy_uid = false;
+        console.log(trophy_uid)
+        if (window.localStorage) {
+            trophy_uid = localStorage.getItem('trophy_uid');
+        } else {
+            trophy_uid = false
+        }
+        if(trophy_uid===true){
+            $("#trophyreturn").hide()
+        }
+    })
 
-</script>
+</script>

public/stylesheets/educoder/edu-main.css

@@ -1253,4 +1253,9 @@ html>body #ajax-indicator { position: fixed; }
 #member_block{
     height: 260px;
     overflow-y: auto;
+}
+
+#trophyreturn i{
+    font-size: 16px!important;
+    color: #AAAAAA;
 }