From 3017b632999bc059a2246ee5a041b12d2fdf0591 Mon Sep 17 00:00:00 2001
From: Amila Welihinda <amilajack@gmail.com>
Date: Sat, 20 Apr 2019 15:55:03 -0700
Subject: [PATCH] v1.3.3 (#570)

* bump to v1.3.3

* Sticky navbar (#569)

* collapse toggler on click

* sticky navbar

* remove custom scrollbar styling to fix padding issues with container
---
 app/components/header/Header.js     | 21 +++++++++++++++------
 app/package.json                    |  2 +-
 app/styles/utilities/container.scss | 15 ---------------
 package.json                        |  2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/app/components/header/Header.js b/app/components/header/Header.js
index 716530b3..bbd75f29 100644
--- a/app/components/header/Header.js
+++ b/app/components/header/Header.js
@@ -27,6 +27,7 @@ export default class Header extends Component<Props, State> {
   props: Props;
 
   state: State = {
+    collapsed: true,
     searchQuery: ''
   };
 
@@ -51,24 +52,32 @@ export default class Header extends Component<Props, State> {
     }
   };
 
+  setCollapse = () => {
+    this.setState(prevState => ({
+      collapsed: !prevState.collapsed
+    }));
+  };
+
   render(): Node {
     const { activeMode, setActiveMode } = this.props;
-    const { searchQuery } = this.state;
+    const { collapsed, searchQuery } = this.state;
 
     return (
-      <Navbar className="navbar navbar-expand-lg navbar-dark bg-dark col-sm-12 col-md-12">
+      <Navbar
+        className="navbar navbar-expand-lg navbar-dark bg-dark col-sm-12 col-md-12"
+        sticky="top"
+      >
         <NavbarToggler
           className="navbar-toggler"
           type="button"
-          data-toggle="collapse"
-          data-target="#navbarSupportedContent"
-          aria-controls="navbarSupportedContent"
-          aria-expanded="false"
+          aria-expanded={!collapsed}
           aria-label="Toggle navigation"
+          onClick={this.setCollapse}
         />
         <Collapse
           className="collapse navbar-collapse"
           id="navbarSupportedContent"
+          isOpen={!collapsed}
         >
           <Nav className="navbar-nav mr-auto">
             <NavItem
diff --git a/app/package.json b/app/package.json
index 77dc6a1e..6f561d5a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -2,7 +2,7 @@
   "name": "PopcornTime",
   "description": "An experimental PopcornTime client",
   "homepage": "https://github.com/amilajack/popcorn-time-desktop",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "main": "./main.prod.js",
   "author": {
     "name": "Amila Welihinda <amilajack@gmail.com>",
diff --git a/app/styles/utilities/container.scss b/app/styles/utilities/container.scss
index f2cc4d18..6a91a87a 100644
--- a/app/styles/utilities/container.scss
+++ b/app/styles/utilities/container.scss
@@ -1,19 +1,4 @@
-::-webkit-scrollbar-corner {
-  background-color: transparent;
-}
-
 .row-center {
   display: flex;
   align-items: center;
 }
-
-::-webkit-scrollbar {
-  z-index: 0;
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-thumb {
-  -webkit-border-radius: 2px;
-  background: rgba(150, 150, 150, 0.33);
-}
diff --git a/package.json b/package.json
index 5be627fd..dfae4198 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "popcorn-time-desktop",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "An experimental Popcorn Time client",
   "scripts": {
     "bench-api": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 jest test/**/*.benchmark.js",