SONAR-9376 Update footer to correctly resize on the new page layout

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/init.js b/server/sonar-web/src/main/js/apps/coding-rules/init.js
index a156574703dd21f38cabdb1b027379515590d287..36d7f608fdaebcb626d7e275e2785e388c591084 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/init.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/init.js
@@ -61,7 +61,7 @@ App.on('start', function(
     .done(() => {
       this.layout = new Layout({ el: options.el });
       this.layout.render();
-      $('#footer').addClass('search-navigator-footer');
+      $('#footer').addClass('page-footer-with-sidebar');
 
       const allFacets = [
         'q',
@@ -123,6 +123,6 @@ export default function(
     // $FlowFixMe
     Backbone.history.stop();
     App.layout.destroy();
-    $('#footer').removeClass('search-navigator-footer');
+    $('#footer').removeClass('page-footer-with-sidebar');
   };
 }

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/App.js b/server/sonar-web/src/main/js/apps/component-measures/components/App.js
index 8bdd6bceea17560e29d5adb6f4e8082e9982a24f..d75feac2ca225f94a66d2b6b6a6a22e6f6dc232b 100644 (file)
--- a/server/sonar-web/src/main/js/apps/component-measures/components/App.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/App.js
@@ -75,7 +75,7 @@ export default class App extends React.PureComponent {
     key.setScope('measures-files');
     const footer = document.getElementById('footer');
     if (footer) {
-      footer.classList.add('search-navigator-footer');
+      footer.classList.add('page-footer-with-sidebar');
     }
   }
 
@@ -93,7 +93,7 @@ export default class App extends React.PureComponent {
     key.deleteScope('measures-files');
     const footer = document.getElementById('footer');
     if (footer) {
-      footer.classList.remove('search-navigator-footer');
+      footer.classList.remove('page-footer-with-sidebar');
     }
   }
 

diff --git a/server/sonar-web/src/main/js/apps/issues/components/App.js b/server/sonar-web/src/main/js/apps/issues/components/App.js
index 199c814ce926c0a3a56cbd05027d1ec225a5903d..4a0040f29910f0ac6e842f9f251417b1ca8bc473 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/components/App.js
+++ b/server/sonar-web/src/main/js/apps/issues/components/App.js
@@ -138,7 +138,7 @@ export default class App extends React.PureComponent {
 
     const footer = document.getElementById('footer');
     if (footer) {
-      footer.classList.add('search-navigator-footer');
+      footer.classList.add('page-footer-with-sidebar');
     }
 
     this.attachShortcuts();
@@ -187,7 +187,7 @@ export default class App extends React.PureComponent {
 
     const footer = document.getElementById('footer');
     if (footer) {
-      footer.classList.remove('search-navigator-footer');
+      footer.classList.remove('page-footer-with-sidebar');
     }
 
     this.mounted = false;

diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js
index b08dbaff99263ab4289846cd88bf121fde7fdd25..e07822b61bdad64c44cf976b73324d9612f3e15e 100644 (file)
--- a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js
+++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js
@@ -59,7 +59,7 @@ export default class AllProjects extends React.PureComponent {
   componentDidMount() {
     this.handleQueryChange(true);
     const footer = document.getElementById('footer');
-    footer && footer.classList.add('search-navigator-footer');
+    footer && footer.classList.add('page-footer-with-sidebar');
   }
 
   componentDidUpdate(prevProps /*: Props */) {
@@ -70,7 +70,7 @@ export default class AllProjects extends React.PureComponent {
 
   componentWillUnmount() {
     const footer = document.getElementById('footer');
-    footer && footer.classList.remove('search-navigator-footer');
+    footer && footer.classList.remove('page-footer-with-sidebar');
   }
 
   getView = () => this.state.query.view || 'overall';

diff --git a/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx b/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx
index 9a346b3f921d8937d4c329902a898061ffd3878f..68cb7e591d49f3d9c46ff42a0212b535b49b1800 100644 (file)
--- a/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx
+++ b/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx
@@ -59,7 +59,7 @@ export default class WebApiApp extends React.PureComponent<Props, State> {
     this.fetchList();
     const footer = document.getElementById('footer');
     if (footer) {
-      footer.classList.add('search-navigator-footer');
+      footer.classList.add('page-footer-with-sidebar');
     }
   }
 
@@ -72,7 +72,7 @@ export default class WebApiApp extends React.PureComponent<Props, State> {
     this.mounted = false;
     const footer = document.getElementById('footer');
     if (footer) {
-      footer.classList.remove('search-navigator-footer');
+      footer.classList.remove('page-footer-with-sidebar');
     }
   }
 

diff --git a/server/sonar-web/src/main/less/components/page.less b/server/sonar-web/src/main/less/components/page.less
index 22fce0f068ffeb2dda375aeea784add84870ced1..2b5c58b37b1b51357c874ad8f561ceb4fa2aa7f6 100644 (file)
--- a/server/sonar-web/src/main/less/components/page.less
+++ b/server/sonar-web/src/main/less/components/page.less
@@ -123,6 +123,14 @@
   }
 }
 
+.page-footer-with-sidebar {
+  padding-left: ~"calc(50vw - 370px + 10px)" !important;
+
+  div {
+    max-width: 980px;
+  }
+}
+
 .page-with-sidebar {
   display: flex;
 }
@@ -288,4 +296,8 @@
   .layout-page-main-header-inner {
     left: 301px;
   }
+
+  .page-footer-with-sidebar {
+    padding-left: 300px + 10px !important;
+  }
 }

diff --git a/server/sonar-web/src/main/less/components/search-navigator.less b/server/sonar-web/src/main/less/components/search-navigator.less
index 68332a9ca3338331452bd0e4c545ba5d8e9a2b6f..b6c203bdbcc94cee020d73c3986d350b2d4b37bc 100644 (file)
--- a/server/sonar-web/src/main/less/components/search-navigator.less
+++ b/server/sonar-web/src/main/less/components/search-navigator.less
@@ -47,11 +47,6 @@
   }
 }
 
-.search-navigator-footer {
-  @padding-left: @sideWidth + 10px;
-  padding-left: @padding-left !important;
-}
-
 .search-navigator-side {
   position: fixed;
   z-index: @search-navigator-side-z-index;