Merge branch 'master' of https://github.com/couchbase/docs-ui-sandbox into ui-bug-fixes

rakeshAlgo · rakeshAlgo · commit 97dac35df6cb · 2020-06-30T13:29:01.000+05:30
diff --git a/README.adoc b/README.adoc
@@ -1,6 +1,6 @@
 = Couchbase Documentation UI
 // Variables:
-:current-release: prod-56
+:current-release: prod-59
 // Settings:
 :!example-caption:
 :experimental:
diff --git a/src/css/header.css b/src/css/header.css
@@ -13,7 +13,7 @@
   flex-wrap: wrap;
   align-items: center;
   justify-content: space-between;
-  padding: 0.5rem var(--width-container-gutter);
+  padding: 0.5rem 0;
 }
 
 .navbar-toggler {
@@ -44,6 +44,10 @@
 
 .navbar.navbar-new-bottom {
   background: var(--color-brand-blue-secondary);
+}
+
+.header-bottom-row {
+  background: var(--color-brand-blue-secondary);
   display: none;
 }
 
@@ -204,7 +208,7 @@
 
   .primary-action {
     position: absolute;
-    right: 1.25rem;
+    right: 0;
     top: -137%;
   }
 
@@ -214,6 +218,10 @@
     line-height: 1;
   }
 
+  .header-bottom-row {
+    display: block;
+  }
+
   .navbar-new-bottom .nav-item:first-child {
     margin-left: 0;
   }
@@ -230,7 +238,7 @@
   }
 
   .navbar.navbar-new-top {
-    padding: 1.25rem;
+    padding: 1.25rem 0;
     line-height: 1;
   }
 }
diff --git a/src/css/nav.css b/src/css/nav.css
@@ -45,7 +45,19 @@
     height: 100%;
     /* height: var(--height-nav); */
     z-index: var(--z-index-nav);
-    border-left: 2px solid #eee;
+    /* border-left: 2px solid #eee; */
+  }
+
+  .left-sidebar-menu::before {
+    position: absolute;
+    content: '';
+    display: inline-block;
+    width: 1000%;
+    height: 100%;
+    background: var(--color-brand-gray7);
+    top: 0;
+    z-index: 1;
+    left: -1000%;
   }
 }
 
@@ -481,8 +493,6 @@ a.menu-expand-toggle {
     top: var(--height-to-body);
     margin-bottom: 1.5rem;
     /* height: var(--height-nav); */
-    border-left: 2px solid #eee;
-    border-right: 2px solid #eee;
   }
 
   .nav-control {
diff --git a/src/layouts/landing-page-tutorials.hbs b/src/layouts/landing-page-tutorials.hbs
@@ -7,10 +7,7 @@
 </head>
 <body class="landing-page">
 {{> header}}
-<div class="body container-fluid ">
-{{> tutorials-filter}}
 {{> body-landing-tutorials}}
-</div>
 {{> footer}}
 </body>
 </html>
diff --git a/src/partials/body-home.hbs b/src/partials/body-home.hbs
@@ -1,4 +1,4 @@
-<div class="body container-fluid">
+<div class="body container">
 <main class="home" data-ceiling="topbar">
 <article class="doc">
 <h1 class="page">{{{page.title}}}</h1>
diff --git a/src/partials/body-landing-core-concept.hbs b/src/partials/body-landing-core-concept.hbs
@@ -1,4 +1,4 @@
-<div class="body container-fluid">
+<div class="body container">
 {{> nav}}
 {{> toc}}
 <main class="article" data-ceiling="topbar">
diff --git a/src/partials/body-landing-sdk.hbs b/src/partials/body-landing-sdk.hbs
@@ -1,4 +1,4 @@
-<div class="body container-fluid">
+<div class="body container">
 {{> nav}}
 {{> toc}}
 <main class="article" data-ceiling="topbar">
diff --git a/src/partials/body-landing-top-level-sdk.hbs b/src/partials/body-landing-top-level-sdk.hbs
@@ -1,4 +1,4 @@
-<div class="body container-fluid">
+<div class="body container">
 <main class="article" data-ceiling="topbar">
 <article class="doc landing-page-doc">
 {{{page.contents}}}
diff --git a/src/partials/body-landing-tutorials.hbs b/src/partials/body-landing-tutorials.hbs
@@ -1,8 +1,9 @@
-
+<div class="body container ">
+{{> tutorials-filter}}
 <main class="article" data-ceiling="topbar">
 <article class="doc landing-page-doc">
-
 {{{page.contents}}}
 
 </article>
 </main>
+</div>
diff --git a/src/partials/body.hbs b/src/partials/body.hbs
@@ -1,4 +1,4 @@
-<div class="body container-fluid{{#with (or page.role page.attributes.role)}} {{{this}}}{{/with}}">
+<div class="body container{{#with (or page.role page.attributes.role)}} {{{this}}}{{/with}}">
 {{> nav}}
 {{> toc}}
 {{> main}}
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
@@ -1,65 +1,77 @@
 <header class="header fixed-top">
-  <nav class="navbar navbar-expand-md flex-nowrap justify-content-between navbar-new-top">
-    <a class="navbar-brand" href="{{#with (and site.url site.homeUrl)}}{{@root.site.url}}{{this}}{{else}}{{siteRootPath}}{{/with}}">
-      <img src="{{{uiRootPath}}}/img/couchbase-documentation-logo.svg" alt="Couchbase" />
-    </a>
-    {{! <ul class="nav navbar-nav mr-auto"></ul> }}
-    <button class="navbar-burger" data-target="topbar-menu">
-      <span></span>
-      <span></span>
-      <span></span>
-    </button>
-  </nav>
+  <div class="header-top-row">
+      <div class="container">
+          <nav class="navbar navbar-expand-md flex-nowrap justify-content-between navbar-new-top">
+
+              <a class="navbar-brand" href="{{#with (and site.url site.homeUrl)}}{{@root.site.url}}{{this}}{{else}}{{siteRootPath}}{{/with}}">
+                <img src="{{{uiRootPath}}}/img/couchbase-documentation-logo.svg" alt="Couchbase" />
+              </a>
+              {{! <ul class="nav navbar-nav mr-auto"></ul> }}
+              <button class="navbar-burger" data-target="topbar-menu">
+                <span></span>
+                <span></span>
+                <span></span>
+              </button>
+
+          </nav>
+      </div>
+  </div>
   {{! End primary header }}
   {{! Start secondary header }}
-  <nav id="topbar-menu" class="navbar navbar-new-bottom">
-    <div class="navbar-collapse collapse" id="navbar2">
-      <ul class="navbar-nav w-100 justify-content-start">
-        <li class="nav-item">
-          <a class="nav-link" href="{{relativize (resolvePageURL 'home::server.adoc')}}">
-            Server
-          </a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{relativize (resolvePageURL 'home::mobile.adoc')}}">
-            Mobile
-          </a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{relativize (resolvePageURL 'home::cloud.adoc')}}">
-            Cloud
-          </a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{relativize (resolvePageURL 'home::integrations.adoc')}}">
-            Integration
-          </a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{relativize site.components.tutorials.url}}">
-            Tutorials
-            <span class="arrow">
-              <i class="fas fa-arrow-right"></i>
-            </span>
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div class="primary-action">
-      <form class="navbar-item search">
-        <input type="text" placeholder="Search Docs" class="query" id="search-query" />
-        <button type="button" class="search-btn">
-          <i class="fas fa-search"></i>
-        </button>
-      </form>
-      <div class="parent-site">
-        <a href="couchbase.com">
-          Couchbase.com
-        </a>
-      </div>
-      <a class="btn btn-primary try-btn" href="https://www.couchbase.com/downloads">
-        Try Free
-      </a>
+  <div class="header-bottom-row">
+    <div class="container">
+        <nav id="topbar-menu" class="navbar navbar-new-bottom">
+
+              <div class="navbar-collapse collapse" id="navbar2">
+                <ul class="navbar-nav w-100 justify-content-start">
+                  <li class="nav-item">
+                    <a class="nav-link" href="{{relativize (resolvePageURL 'home::server.adoc')}}">
+                      Server
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link" href="{{relativize (resolvePageURL 'home::mobile.adoc')}}">
+                      Mobile
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link" href="{{relativize (resolvePageURL 'home::cloud.adoc')}}">
+                      Cloud
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link" href="{{relativize (resolvePageURL 'home::integrations.adoc')}}">
+                      Integration
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link" href="{{relativize site.components.tutorials.url}}">
+                      Tutorials
+                      <span class="arrow">
+                        <i class="fas fa-arrow-right"></i>
+                      </span>
+                    </a>
+                  </li>
+                </ul>
+              </div>
+              <div class="primary-action">
+                <form class="navbar-item search">
+                  <input type="text" placeholder="Search Docs" class="query" id="search-query" />
+                  <button type="button" class="search-btn">
+                    <i class="fas fa-search"></i>
+                  </button>
+                </form>
+                <div class="parent-site">
+                  <a href="https://www.couchbase.com">
+                    Couchbase.com
+                  </a>
+                </div>
+                <a class="btn btn-primary try-btn" href="https://www.couchbase.com/downloads">
+                  Try Free
+                </a>
+              </div>
+
+        </nav>
     </div>
-  </nav>
+   </div>
 </header>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`flex-wrap: wrap;`
`14`	`14`	`align-items: center;`
`15`	`15`	`justify-content: space-between;`
`16`		`- padding: 0.5rem var(--width-container-gutter);`
	`16`	`+ padding: 0.5rem 0;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`.navbar-toggler {`
`@@ -44,6 +44,10 @@`
`44`	`44`
`45`	`45`	`.navbar.navbar-new-bottom {`
`46`	`46`	`background: var(--color-brand-blue-secondary);`
	`47`	`+}`
	`48`	`+`
	`49`	`+.header-bottom-row {`
	`50`	`+ background: var(--color-brand-blue-secondary);`
`47`	`51`	`display: none;`
`48`	`52`	`}`
`49`	`53`
`@@ -204,7 +208,7 @@`
`204`	`208`
`205`	`209`	`.primary-action {`
`206`	`210`	`position: absolute;`
`207`		`- right: 1.25rem;`
	`211`	`+ right: 0;`
`208`	`212`	`top: -137%;`
`209`	`213`	`}`
`210`	`214`
`@@ -214,6 +218,10 @@`
`214`	`218`	`line-height: 1;`
`215`	`219`	`}`
`216`	`220`
	`221`	`+ .header-bottom-row {`
	`222`	`+ display: block;`
	`223`	`+ }`
	`224`	`+`
`217`	`225`	`.navbar-new-bottom .nav-item:first-child {`
`218`	`226`	`margin-left: 0;`
`219`	`227`	`}`
`@@ -230,7 +238,7 @@`
`230`	`238`	`}`
`231`	`239`
`232`	`240`	`.navbar.navbar-new-top {`
`233`		`- padding: 1.25rem;`
	`241`	`+ padding: 1.25rem 0;`
`234`	`242`	`line-height: 1;`
`235`	`243`	`}`
`236`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="body container-fluid">`
	`1`	`+<div class="body container">`
`2`	`2`	`<main class="home" data-ceiling="topbar">`
`3`	`3`	`<article class="doc">`
`4`	`4`	`<h1 class="page">{{{page.title}}}</h1>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="body container-fluid{{#with (or page.role page.attributes.role)}} {{{this}}}{{/with}}">`
	`1`	`+<div class="body container{{#with (or page.role page.attributes.role)}} {{{this}}}{{/with}}">`
`2`	`2`	`{{> nav}}`
`3`	`3`	`{{> toc}}`
`4`	`4`	`{{> main}}`