merge develop

front/dist/resources/style/cowebsite.scss

@@ -35,9 +35,8 @@
     cursor: url('/resources/logos/cursor_pointer.png'), pointer;
 
     img {
-      height: 20px;
-      background-color: rgba(0,0.0,0,0.3);
-      padding: 5px;
+      height: 25px;
+      padding: 4px;
       border-radius: 3px;
     }
 
@@ -78,31 +77,13 @@
     }
 
     .top-right-btn{
-      top: 10px;
-      right: -100px;
-      animation: right .2s ease;
-
-      img {
-        right: 15px;
+      left: -6px;
+      &#cowebsite-close {
+        top: 0px;
+      }
+      &#cowebsite-fullscreen {
+        top: 25px;
       }
-    }
-
-    #cowebsite-close {
-      right: -140px;
-    }
-    #cowebsite-fullscreen {
-      right: -100px;
-    }
-
-  }
-
-  #cowebsite:hover {
-    #cowebsite-close{
-      right: 10px;
-    }
-
-    #cowebsite-fullscreen{
-      right: 45px;
     }
   }
 }
@@ -139,32 +120,13 @@
       }
     }
 
-    .top-right-btn{
-      top: 10px;
-      right: -100px;
-      animation: right .2s ease;
-
-      img {
-        right: 15px;
+    .top-right-btn {
+      &#cowebsite-close {
+        right: 0px;
+      }
+      &#cowebsite-fullscreen {
+        right: 25px;
       }
     }
-
-    #cowebsite-close {
-      right: -140px;
-    }
-    #cowebsite-fullscreen {
-      right: -100px;
-    }
-
   }
-
-  #cowebsite:hover {
-    #cowebsite-close{
-      right: 10px;
-    }
-
-    #cowebsite-fullscreen{
-      right: 45px;
-    }
-  }  
 }

front/dist/resources/style/style.css

@@ -1123,6 +1123,31 @@ div.action p.action-body{
     margin-left: calc(50% - 75px);
     border-radius: 15px;
 }
+.popUpElement{
+    font-family: 'Press Start 2P';
+    text-align: left;
+    color: white;
+}
+.popUpElement div {
+    font-family: 'Press Start 2P';
+    font-size: 10px;
+    background-color: #727678;
+}
+
+.popUpElement button {
+    position: relative;
+    font-size: 10px;
+    border-image-repeat: revert;
+    margin-right: 5px;
+}
+
+.popUpElement .buttonContainer {
+    float: right;
+    background-color: inherit;
+
+}
+
+
 @keyframes mymove {
     0% {bottom: 40px;}
     50% {bottom: 30px;}