Resolve merge conflicts (#6152)

Signed-off-by: Fanit Kolchina <[email protected]>

_layouts/default.html

@@ -100,7 +100,7 @@
                 {% if collection_value.nav_fold == true %}
                   <ul class="nav-list nav-category-list">
                     <li class="nav-list-item{% if page.collection == collection_key %} active{% endif %}">
-                      {%- if collection.size > 0 -%}
+                      {%- if collection.size > 1 -%}
                       <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
                       {%- endif -%}
                       {% assign collection_url_path = collection_key | append: "/index/" %}

_sass/custom/custom.scss

@@ -58,6 +58,13 @@ code {
 
 .nav-category {
   text-align: start;
+  display: block;
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.nav-list-expander {
+  margin-right: 0.5rem;
 }
 
 .main-content {
@@ -893,10 +900,7 @@ main {
 }
 
 .site-nav.nav-open {
-  padding-top: .5rem;
-  @include mq(md) {
-    padding-top: 2rem;
-  }
+  padding-top: 0;
 }
 
 .label {
@@ -939,13 +943,13 @@ main {
   top: 0;
   z-index: 9999999;
   background-color: $sidebar-color;
+  border-bottom: 1px solid #eeebee;
 }
 
 version-selector {
   z-index: 1;
   font-size: .9rem;
-  margin: 0.5rem 3px;
-
+  margin: 0.5rem 3px 1rem 3px;
   --normal-bg: linear-gradient(#{lighten($blue-300, 5%)}, #{darken($blue-300, 2%)});
   --hover-bg: linear-gradient(#{lighten($blue-300, 2%)}, #{darken($blue-300, 4%)});
   --link-color: #{$blue-300};
@@ -980,16 +984,18 @@ body {
   text-align: start;
   display: block;
   font-size: 0.9rem;
-  padding-right: 2rem;
-  padding-left: 2rem;
-  padding-top: 0.5rem;
-  margin-bottom: 1rem;
+  padding: 0.5rem 1rem;
+  margin-top: 1rem;
+  @include mq(md) {
+    padding: 0.5rem 2rem;
+  }
 }
 
 .site-category {
   @extend .back-link;
   padding-top: 1.5rem;
   padding-bottom: 0.5rem;
+  margin-top: 0;
   font-size: 0.8rem;
   color: $blue-dk-300;
   font-weight: 600;