Merge pull request #956 from sharelatex/jel-margins

Margins on content pages

services/web/public/stylesheets/app/cms-page.less

@@ -45,8 +45,8 @@
     All content from CMS is in .row-spaced.
     Margin below is to fix extra whitespace for first rows
   */
-  .container > .row:nth-child(2) {
-    //- first child is page header, don't correct margin
+  .container > .row:nth-child(2), .content-container > .row:first-child {
+    //- .container first child is page header, don't correct margin
     margin-top: 0;
   }
   .tab-pane {

services/web/public/stylesheets/app/portals.less

@@ -90,6 +90,10 @@
   }
   // End Actions
 
+  .nav-tabs {
+    margin-bottom: @margin-md;
+  }
+
   /*
     Begin Print
   */

services/web/public/stylesheets/components/tabs.less

@@ -2,7 +2,7 @@
   // Overrides for nav.less
   .nav-tabs {
     border: 0!important;
-    margin-bottom: @margin-md;
+    margin-bottom: 0;
     margin-top: -@line-height-computed; //- adjusted for portal-name
     padding: @padding-lg 0 @padding-md;
     text-align: center;