update vertical alignment;update scroll bars

SutraHsing · Jul 2, 2018 · 97eeffc · 97eeffc
1 parent caf2b91
commit 97eeffc
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 30 deletions.
diff --git a/css/components/_buttons.scss b/css/components/_buttons.scss
@@ -126,6 +126,7 @@
 		color: $cl_blue;
 		line-height: 40px;
 		padding: 0;
+		margin-top: 9px;
 		text-align: center;
 
 		&:focus {

diff --git a/css/components/_search.scss b/css/components/_search.scss
@@ -42,7 +42,7 @@ li.search-wrap {
   @include at-query($min, $screen-md) {
     display: block;
     position: fixed;
-    top: 85px;
+    top: 89px;
     width: 260px;
     background: #ffffff;
     z-index: 2;

diff --git a/css/components/_toc.scss b/css/components/_toc.scss
@@ -4,7 +4,7 @@
   display: none;
 
   @include at-query($min, 1072px) {
-    padding: 30px 0;
+    padding: 33px 0;
     min-width: 275px;
     max-width: 275px;
     display: inline-block;
@@ -24,9 +24,14 @@
 
 #toc-right {
   max-height: 90vh;
-  overflow-y: scroll;
-  padding-left: 15px;
+  padding-right: 15px;
   background: #ffffff;
+
+  &:hover, 
+  &:active, 
+  &:focus {
+    overflow-y: auto;
+  }
 }
 
 #toc,

diff --git a/css/customstyles.css b/css/customstyles.css
diff --git a/css/customstyles.css.map b/css/customstyles.css.map
diff --git a/css/customstyles.scss b/css/customstyles.scss
@@ -13,11 +13,6 @@ body {
   color: $cl_blue;
 }
 
-::-webkit-scrollbar {
-  width: 0px;
-  background: transparent;
-}
-
 p {
   @include paragraph-type;
   color: $cl_blue;

diff --git a/css/global/_variables.scss b/css/global/_variables.scss
@@ -18,6 +18,7 @@ $cl_blue_dark: #111D39;
 $cl_blue_pale: #ECF7FF;
 $cl_blue_note: #3A7DE0;
 $cl_gray: #A2A2A2;
+$cl_gray_dark: #333333;
 $cl_gray_medium: #DADADA;
 $cl_gray_light: #F3F3F3;
 $cl_gray_body: #142848;

diff --git a/css/layouts/_content.scss b/css/layouts/_content.scss
@@ -24,7 +24,7 @@
 			@include at-query($min, $screen-md) {
 				padding-top: 0;
 				min-height: 625px;
-				padding-left: 365px;
+				padding-left: 330px;
 				padding-right: 30px;
 
 				&.no-sidebar {

diff --git a/css/layouts/_sidebar.scss b/css/layouts/_sidebar.scss
@@ -6,7 +6,7 @@ body.sidenav-open {
 
     #mysidebar {
       height: 100%;
-      overflow: scroll;
+      overflow: auto;
       -webkit-overflow-scrolling: touch;
     }
   }
@@ -39,7 +39,12 @@ body.sidenav-open {
     padding: 0 30px;
     background-color: #ffffff;
     border-bottom: 1px solid $cl_gray_medium;
-    overflow-y: scroll;
+
+    &:hover, 
+    &:active, 
+    &:focus {
+      overflow-y: auto;
+    }
   }
 
   &--scrolled {
@@ -62,6 +67,7 @@ body.sidenav-open {
 .sidebar-row {
   @include at-query($min, $screen-md) {
     display: flex;
+    padding-top: 15px;
   }
 }
 
@@ -298,7 +304,7 @@ a:not([href]) {
   padding: 10px 15px 5px 15px;
 
   @include at-query($min, $screen-md) { 
-    padding: 55px 0 0 0;
+    padding: 63px 0 0 0;
     width: 260px; 
   }
 

diff --git a/js/customscripts.js b/js/customscripts.js
@@ -143,10 +143,10 @@ $(function() {
     }
 
     // handle positoning of right-hand TOC when scrolling window
-    if (_viewport_width >= 1072 && scrollTop >= 16) {
+    if (_viewport_width >= 1072 && scrollTop >= 31) {
       $tocRight.css({
         position: 'fixed',
-        top: 82,
+        top: 91,
         right: 0,
         width: '275px'
       });