Skip to content

Commit

Permalink
v1.3.3 (#570)
Browse files Browse the repository at this point in the history
* bump to v1.3.3

* Sticky navbar (#569)

* collapse toggler on click

* sticky navbar

* remove custom scrollbar styling to fix padding issues with container
  • Loading branch information
amilajack authored Apr 20, 2019
1 parent 9593062 commit 3017b63
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 23 deletions.
21 changes: 15 additions & 6 deletions app/components/header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default class Header extends Component<Props, State> {
props: Props;

state: State = {
collapsed: true,
searchQuery: ''
};

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>",
Expand Down
15 changes: 0 additions & 15 deletions app/styles/utilities/container.scss
Original file line number Diff line number Diff line change
@@ -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);
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 3017b63

Please sign in to comment.