fix SONAR-6041 update layout

diff --git a/server/sonar-web/src/main/less/layout-new.less b/server/sonar-web/src/main/less/layout-new.less
index ef0290991c0cbdde473431e794d7a38c37dd6ae5..330ea4f1a4d1029d688e566b87d127760663d2f1 100644 (file)
--- a/server/sonar-web/src/main/less/layout-new.less
+++ b/server/sonar-web/src/main/less/layout-new.less
@@ -4,9 +4,9 @@
 
 @pageWidth: 1020px;
 @containerWidth: 980px;
-@sideWidth: 200px;
-@fullWidthSideWidth: 40px;
+@contentWidth: 780px;
 @sideMargin: 10px;
+@sideWidth: @containerWidth - @contentWidth - @sideMargin;
 
 html {
   overflow-y: scroll;
@@ -25,20 +25,17 @@ body {
   width: @containerWidth;
   margin: 0 auto;
   .box-sizing(border-box);
-  .trans(width);
 }
 
 .container-full-width {
-  width: ~"calc(100% - @{fullWidthSideWidth})";
+  width: ~"calc(100% - 40px)";
 
   .container-main {
     width: 100%;
   }
 
   .container-side {
-    position: absolute;
-    .translate(-100%, 0);
-    opacity: 0;
+    display: none;
   }
 }
 
@@ -57,24 +54,31 @@ body {
 .container-side {
   width: @sideWidth;
   .box-sizing(border-box);
-  .trans;
 }
 
 .container-side-left {
   float: left;
   padding-right: @sideMargin;
+  border-right: 1px solid @barBackgroundColor;
+}
+
+.container-side-left + .container-main {
+  padding-left: @sideMargin;
 }
 
 .container-side-right {
   float: right;
   padding-left: @sideMargin;
+  border-left: 1px solid @barBackgroundColor;
+}
+
+.container-side-right + .container-main {
+  padding-right: @sideMargin;
 }
 
 .container-main {
   float: left;
-  width: @containerWidth - @sideWidth;
-  .box-sizing(border-box);
-  .trans(width);
+  width: @contentWidth;
 }
 
 .face-bar {

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
index 98e4d993b8fb28992e85a0684c5571b430887c01..bceb1df63ab7d8a20f16c4ae6d7dbc892c5ee01a 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
@@ -87,12 +87,10 @@
       <li>
         <%= link_to message('issue') + ' #' + @issue.key.to_s -%>
       </li>
-    <%
-       end
-    %>
     </ul>
     </div>
     </div>
+    <% end %>
   <% end %>
 
 <% end %>