Automatic merge from branch-6.4

* origin/branch-6.4:
  Fix wording in risk bubble chart and permission template tooltips
  Fix projects page cards links while loading

1 files changed, 5 insertions, 24 deletions

diff --git a/server/sonar-web/src/main/js/app/styles/boxed-group.css b/server/sonar-web/src/main/js/app/styles/boxed-group.css
index c1f569c1206..24c56850676 100644
--- a/server/sonar-web/src/main/js/app/styles/boxed-group.css
+++ b/server/sonar-web/src/main/js/app/styles/boxed-group.css
@@ -17,6 +17,8 @@
 }
 
 .boxed-group-header {
+  position: relative;
+  z-index: 10;
   padding: 15px 20px 0;
 }
 
@@ -64,6 +66,7 @@
 .boxed-group-loading:before,
 .boxed-group-loading:after {
   position: absolute;
+  z-index: 1;
   border: 2px solid transparent;
   box-sizing: border-box;
   content: '';
@@ -100,36 +103,14 @@
     height: 0;
   }
 
-  50% {
-    width: 100%;
-    height: 100%;
-  }
-
-  75% {
-    width: 100%;
-    height: 100%;
-  }
-
-  100% {
+  50%, 100% {
     width: 100%;
     height: 100%;
   }
 }
 
 @keyframes border-bottom-border {
-  0% {
-    width: 0;
-    height: 0;
-    border-width: 0;
-  }
-
-  25% {
-    width: 0;
-    height: 0;
-    border-width: 0;
-  }
-
-  50% {
+  0%, 50% {
     width: 0;
     height: 0;
     border-width: 0;